diff options
| author | Lukas Fleischer | 2013-04-01 17:11:13 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld | 2013-04-08 15:43:17 +0200 |
| commit | 996f86e664ab6d00a9304a42374e9c691b78ca6b (patch) | |
| tree | 1f2358c286eedfb86c89ea812b0bcd45c71cd1d9 /ui-shared.c | |
| parent | Update git to v1.8.2.1 (diff) | |
| download | cgit-996f86e664ab6d00a9304a42374e9c691b78ca6b.tar.gz cgit-996f86e664ab6d00a9304a42374e9c691b78ca6b.zip | |
Return const char * in cgit_{httpscheme, hosturl, rooturl}()
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>
Diffstat (limited to 'ui-shared.c')
| -rw-r--r-- | ui-shared.c | 8 |
1 files changed, 4 insertions, 4 deletions
| diff --git a/ui-shared.c b/ui-shared.c index d4fb3d9..7a726c1 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
| @@ -34,7 +34,7 @@ void cgit_print_error(const char *msg) | |||
| 34 | html("</div>\n"); | 34 | html("</div>\n"); |
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | char *cgit_httpscheme() | 37 | const char *cgit_httpscheme() |
| 38 | { | 38 | { |
| 39 | if (ctx.env.https && !strcmp(ctx.env.https, "on")) | 39 | if (ctx.env.https && !strcmp(ctx.env.https, "on")) |
| 40 | return "https://"; | 40 | return "https://"; |
| @@ -42,7 +42,7 @@ char *cgit_httpscheme() | |||
| 42 | return "http://"; | 42 | return "http://"; |
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | char *cgit_hosturl() | 45 | const char *cgit_hosturl() |
| 46 | { | 46 | { |
| 47 | if (ctx.env.http_host) | 47 | if (ctx.env.http_host) |
| 48 | return ctx.env.http_host; | 48 | return ctx.env.http_host; |
| @@ -53,7 +53,7 @@ char *cgit_hosturl() | |||
| 53 | return xstrdup(fmt("%s:%s", ctx.env.server_name, ctx.env.server_port)); | 53 | return xstrdup(fmt("%s:%s", ctx.env.server_name, ctx.env.server_port)); |
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | char *cgit_rooturl() | 56 | const char *cgit_rooturl() |
| 57 | { | 57 | { |
| 58 | if (ctx.cfg.virtual_root) | 58 | if (ctx.cfg.virtual_root) |
| 59 | return fmt("%s/", ctx.cfg.virtual_root); | 59 | return fmt("%s/", ctx.cfg.virtual_root); |
| @@ -651,7 +651,7 @@ void cgit_print_docstart(struct cgit_context *ctx) | |||
| 651 | return; | 651 | return; |
| 652 | } | 652 | } |
| 653 | 653 | ||
| 654 | char *host = cgit_hosturl(); | 654 | const char *host = cgit_hosturl(); |
| 655 | html(cgit_doctype); | 655 | html(cgit_doctype); |
| 656 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); | 656 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
| 657 | html("<head>\n"); | 657 | html("<head>\n"); |