]> granicus.if.org Git - cgit/commitdiff
projects / cgit / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 35df710)
ui-shared: fix decl-after-statement warnings
authorJohn Keeping <john@keeping.me.uk>
Sun, 7 Aug 2016 15:13:30 +0000 (16:13 +0100)
committerJohn Keeping <john@keeping.me.uk>
Sat, 1 Oct 2016 10:43:45 +0000 (11:43 +0100)
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>
ui-shared.c patch | blob | history

diff --git a/ui-shared.c b/ui-shared.c
index e39d004e5d74019a26a642d5e04443936fe6769b..3fa36d6742138ec33e278e7ebb8be857bcfd7684 100644 (file)
--- 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");
Unnamed repository; edit this file 'description' to name the repository.