]> git.cameronkatri.com Git - cgit.git/commitdiff
git.ckatri.com / cgit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 849ecd9)
Return const char * in cgit_{httpscheme, hosturl, rooturl}()
authorLukas Fleischer <cgit@cryptocrack.de>
Mon, 1 Apr 2013 15:11:13 +0000 (17:11 +0200)
committerJason A. Donenfeld <Jason@zx2c4.com>
Mon, 8 Apr 2013 13:43:17 +0000 (15:43 +0200)
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>
ui-atom.c patch | blob | history
ui-shared.c patch | blob | history
ui-shared.h patch | blob | history

diff --git a/ui-atom.c b/ui-atom.c
index 5b5525d2976701f9a27343a244dcb6c3a1b07fa0..15540889976df5521381a6d5853698a195b540f4 100644 (file)
--- a/ui-atom.c
+++ b/ui-atom.c
@@ -10,7 +10,7 @@
 #include "html.h"
 #include "ui-shared.h"
 
 #include "html.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 *hex;
 {
        char delim = '&';
        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};
        struct commit *commit;
        struct rev_info rev;
        const char *argv[] = {NULL, tip, NULL, NULL, NULL};
        struct commit *commit;
        struct rev_info rev;
diff --git a/ui-shared.c b/ui-shared.c
index d4fb3d9e869139296f5e776bee1466d63dfc5158..7a726c194f9ba29c85db3931f6d82f2eb2cd022d 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -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"))
                return "https://";
 {
        if (ctx.env.https && !strcmp(ctx.env.https, "on"))
                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)
                return ctx.env.http_host;
 {
        if (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)
                return fmt("%s/", ctx.cfg.virtual_root);
 {
        if (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("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
        html("<head>\n");
        html(cgit_doctype);
        html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
        html("<head>\n");
diff --git a/ui-shared.h b/ui-shared.h
index 87a7dac82f85d5d8f9dc391f5fe9a1ffe940c222..0666388457a363f2a4b637e2b0f64f12a01c5a44 100644 (file)
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -1,9 +1,9 @@
 #ifndef UI_SHARED_H
 #define UI_SHARED_H
 
 #ifndef UI_SHARED_H
 #define UI_SHARED_H
 
-extern char *cgit_httpscheme();
-extern char *cgit_hosturl();
-extern char *cgit_rooturl();
+extern const char *cgit_httpscheme();
+extern const char *cgit_hosturl();
+extern const char *cgit_rooturl();
 extern char *cgit_repourl(const char *reponame);
 extern char *cgit_fileurl(const char *reponame, const char *pagename,
                          const char *filename, const char *query);
 extern char *cgit_repourl(const char *reponame);
 extern char *cgit_fileurl(const char *reponame, const char *pagename,
                          const char *filename, const char *query);
A hyperfast web frontend for git repositories written in C.