all repos — cgit @ 996f86e664ab6d00a9304a42374e9c691b78ca6b

a hyperfast web frontend for git written in c 

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>
Lukas Fleischer cgit@cryptocrack.de
Mon, 01 Apr 2013 17:11:13 +0200
commit

996f86e664ab6d00a9304a42374e9c691b78ca6b

parent

849ecd961df9454d6f849eac34e6f501395c4f01

3 files changed, 9 insertions(+), 9 deletions(-)

jump to
M ui-atom.c → ui-atom.c 
@@ -10,7 +10,7 @@ #include "cgit.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;

@@ -79,7 +79,7 @@
 
 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;
M ui-shared.c → ui-shared.c 
@@ -34,7 +34,7 @@ html_txt(msg);
 	html("</div>\n");
 }
 
-char *cgit_httpscheme()
+const char *cgit_httpscheme()
 {
 	if (ctx.env.https && !strcmp(ctx.env.https, "on"))
 		return "https://";

@@ -42,7 +42,7 @@ else
 		return "http://";
 }
 
-char *cgit_hosturl()
+const char *cgit_hosturl()
 {
 	if (ctx.env.http_host)
 		return ctx.env.http_host;

@@ -53,7 +53,7 @@ return ctx.env.server_name;
 	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);

@@ -651,7 +651,7 @@ html_include(ctx->cfg.header);
 		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");
M ui-shared.h → ui-shared.h 
@@ -1,9 +1,9 @@
 #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);