crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Return const char * in cgit_{httpscheme, hosturl, rooturl}()

Browse Source 
The return values of these functions are essentially constant and should
never be modified.

Note that this will introduce a compiler warning when we try to free the
return value of any of these functions. However, given that all of these
currently return statically allocated strings in some cases, they need
to be refactored before this can be done anyway.

Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2013-04-01 17:11:13 +02:00 committed by Jason A. Donenfeld
parent 849ecd961d
commit 996f86e664
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui-atom.c
View File

@ -10,7 +10,7 @@
#include "html.h" #include "html.h"
#include "ui-shared.h" #include "ui-shared.h"
static void add_entry(struct commit *commit, char *host) static void add_entry(struct commit *commit, const char *host)
{ {
char delim = '&'; char delim = '&';
char *hex; char *hex;
@ -79,7 +79,7 @@ static void add_entry(struct commit *commit, char *host)
void cgit_print_atom(char *tip, char *path, int max_count) void cgit_print_atom(char *tip, char *path, int max_count)
{ {
char *host; const char *host;
const char *argv[] = {NULL, tip, NULL, NULL, NULL}; const char *argv[] = {NULL, tip, NULL, NULL, NULL};
struct commit *commit; struct commit *commit;
struct rev_info rev; struct rev_info rev;

8
ui-shared.c
View File

@ -34,7 +34,7 @@ void cgit_print_error(const char *msg)
html("</div>\n"); html("</div>\n");
} }
char *cgit_httpscheme() const char *cgit_httpscheme()
{ {
if (ctx.env.https && !strcmp(ctx.env.https, "on")) if (ctx.env.https && !strcmp(ctx.env.https, "on"))
return "https://"; return "https://";
@ -42,7 +42,7 @@ char *cgit_httpscheme()
return "http://"; return "http://";
} }
char *cgit_hosturl() const char *cgit_hosturl()
{ {
if (ctx.env.http_host) if (ctx.env.http_host)
return ctx.env.http_host; return ctx.env.http_host;
@ -53,7 +53,7 @@ char *cgit_hosturl()
return xstrdup(fmt("%s:%s", ctx.env.server_name, ctx.env.server_port)); return xstrdup(fmt("%s:%s", ctx.env.server_name, ctx.env.server_port));
} }
char *cgit_rooturl() const char *cgit_rooturl()
{ {
if (ctx.cfg.virtual_root) if (ctx.cfg.virtual_root)
return fmt("%s/", ctx.cfg.virtual_root); return fmt("%s/", ctx.cfg.virtual_root);
@ -651,7 +651,7 @@ void cgit_print_docstart(struct cgit_context *ctx)
return; return;
} }
char *host = cgit_hosturl(); const char *host = cgit_hosturl();
html(cgit_doctype); html(cgit_doctype);
html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
html("<head>\n"); html("<head>\n");

6
ui-shared.h
View File

@ -1,9 +1,9 @@
#ifndef UI_SHARED_H #ifndef UI_SHARED_H
#define UI_SHARED_H #define UI_SHARED_H
extern char *cgit_httpscheme(); extern const char *cgit_httpscheme();
extern char *cgit_hosturl(); extern const char *cgit_hosturl();
extern char *cgit_rooturl(); extern const char *cgit_rooturl();
extern char *cgit_repourl(const char *reponame); extern char *cgit_repourl(const char *reponame);
extern char *cgit_fileurl(const char *reponame, const char *pagename, extern char *cgit_fileurl(const char *reponame, const char *pagename,
const char *filename, const char *query); const char *filename, const char *query);