ui-shared: fix decl-after-statement warnings

git.git's coding style avoids decl-after-statement and we generally try to follow it but a few warnings have crept in recently. Fix the ones in ui-shared.c Signed-off-by: John Keeping <john@keeping.me.uk>
author: John Keeping <john@keeping.me.uk> 2016-08-07 16:13:30 +0100
committer: John Keeping <john@keeping.me.uk> 2016-10-01 11:43:45 +0100
commit: bead27b730526e4501ebaeb3b7c1116cd09f7b93 (patch)
tree: f8c19108c0852ee534a680d4083e4de2adebc057
parent: configfile: fix EOF handling (diff)
download: cgit-magenta-bead27b730526e4501ebaeb3b7c1116cd09f7b93.tar.xz
1 files changed, 7 insertions, 5 deletions
diff --git a/ui-shared.c b/ui-shared.c
index e39d004..3fa36d6 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -66,10 +66,11 @@ char *cgit_hosturl(void)
 
 char *cgit_currenturl(void)
 {
-	if (!ctx.qry.url)
-		return xstrdup(cgit_rooturl());
 	const char *root = cgit_rooturl();
 	size_t len = strlen(root);
+
+	if (!ctx.qry.url)
+		return xstrdup(root);
 	if (len && root[len - 1] == '/')
 		return fmtalloc("%s%s", root, ctx.qry.url);
 	return fmtalloc("%s/%s", root, ctx.qry.url);
@@ -349,6 +350,8 @@ void cgit_log_link(const char *name, const char *title, const char *class,
 void cgit_commit_link(char *name, const char *title, const char *class,
 		      const char *head, const char *rev, const char *path)
 {
+	char *delim;
+
 	if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
 		name[ctx.cfg.max_msg_len] = '\0';
 		name[ctx.cfg.max_msg_len - 1] = '.';
@@ -356,8 +359,6 @@ void cgit_commit_link(char *name, const char *title, const char *class,
 		name[ctx.cfg.max_msg_len - 3] = '.';
 	}
 
-	char *delim;
-
 	delim = repolink(title, class, "commit", head, path);
 	if (rev && ctx.qry.head && strcmp(rev, ctx.qry.head)) {
 		html(delim);
@@ -714,13 +715,14 @@ static void print_rel_vcs_link(const char *url)
 
 void cgit_print_docstart(void)
 {
+	char *host = cgit_hosturl();
+
 	if (ctx.cfg.embedded) {
 		if (ctx.cfg.header)
 			html_include(ctx.cfg.header);
 		return;
 	}
 
-	char *host = cgit_hosturl();
 	html(cgit_doctype);
 	html("<html lang='en'>\n");
 	html("<head>\n");
author	John Keeping <john@keeping.me.uk>	2016-08-07 16:13:30 +0100
committer	John Keeping <john@keeping.me.uk>	2016-10-01 11:43:45 +0100
commit	bead27b730526e4501ebaeb3b7c1116cd09f7b93 (patch)
tree	f8c19108c0852ee534a680d4083e4de2adebc057
parent	configfile: fix EOF handling (diff)
download	cgit-magenta-bead27b730526e4501ebaeb3b7c1116cd09f7b93.tar.xz