ui-shared: fix return type of cgit_self_link

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 75b97a1ec7b8f5c98701a35431871800ccfb45cb..80f4aee1e9aa213b2323855f8cb77a35598015c3 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -23,7 +23,7 @@ static char *http_date(time_t t)
                 "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
        struct tm *tm = gmtime(&t);
        return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
-                  tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,
+                  tm->tm_mday, month[tm->tm_mon], 1900 + tm->tm_year,
                   tm->tm_hour, tm->tm_min, tm->tm_sec);
 }
 
@@ -93,7 +93,7 @@ char *cgit_fileurl(const char *reponame, const char *pagename,
 char *cgit_pageurl(const char *reponame, const char *pagename,
                   const char *query)
 {
-       return cgit_fileurl(reponame,pagename,0,query);
+       return cgit_fileurl(reponame, pagename, 0, query);
 }
 
 const char *cgit_repobasename(const char *reponame)
@@ -102,21 +102,21 @@ const char *cgit_repobasename(const char *reponame)
        static char rvbuf[1024];
        int p;
        const char *rv;
-       strncpy(rvbuf,reponame,sizeof(rvbuf));
-       if(rvbuf[sizeof(rvbuf)-1])
+       strncpy(rvbuf, reponame, sizeof(rvbuf));
+       if (rvbuf[sizeof(rvbuf)-1])
                die("cgit_repobasename: truncated repository name '%s'", reponame);
        p = strlen(rvbuf)-1;
        /* strip trailing slashes */
-       while(p && rvbuf[p]=='/') rvbuf[p--]=0;
+       while (p && rvbuf[p] == '/') rvbuf[p--] = 0;
        /* strip trailing .git */
-       if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) {
+       if (p >= 3 && !strncmp(&rvbuf[p-3], ".git", 4)) {
                p -= 3; rvbuf[p--] = 0;
        }
        /* strip more trailing slashes if any */
-       while( p && rvbuf[p]=='/') rvbuf[p--]=0;
+       while ( p && rvbuf[p] == '/') rvbuf[p--] = 0;
        /* find last slash in the remaining string */
        rv = strrchr(rvbuf,'/');
-       if(rv)
+       if (rv)
                return ++rv;
        return rvbuf;
 }
@@ -437,58 +437,59 @@ void cgit_self_link(char *name, const char *title, const char *class,
                    struct cgit_context *ctx)
 {
        if (!strcmp(ctx->qry.page, "repolist"))
-               return cgit_index_link(name, title, class, ctx->qry.search, ctx->qry.sort,
-                                      ctx->qry.ofs);
+               cgit_index_link(name, title, class, ctx->qry.search, ctx->qry.sort,
+                               ctx->qry.ofs);
        else if (!strcmp(ctx->qry.page, "summary"))
-               return cgit_summary_link(name, title, class, ctx->qry.head);
+               cgit_summary_link(name, title, class, ctx->qry.head);
        else if (!strcmp(ctx->qry.page, "tag"))
-               return cgit_tag_link(name, title, class, ctx->qry.head,
-                                    ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL);
+               cgit_tag_link(name, title, class, ctx->qry.head,
+                             ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL);
        else if (!strcmp(ctx->qry.page, "tree"))
-               return cgit_tree_link(name, title, class, ctx->qry.head,
-                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-                                     ctx->qry.path);
+               cgit_tree_link(name, title, class, ctx->qry.head,
+                              ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                              ctx->qry.path);
        else if (!strcmp(ctx->qry.page, "plain"))
-               return cgit_plain_link(name, title, class, ctx->qry.head,
-                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-                                     ctx->qry.path);
+               cgit_plain_link(name, title, class, ctx->qry.head,
+                               ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                               ctx->qry.path);
        else if (!strcmp(ctx->qry.page, "log"))
-               return cgit_log_link(name, title, class, ctx->qry.head,
-                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-                                     ctx->qry.path, ctx->qry.ofs,
-                                     ctx->qry.grep, ctx->qry.search,
-                                     ctx->qry.showmsg);
+               cgit_log_link(name, title, class, ctx->qry.head,
+                             ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                             ctx->qry.path, ctx->qry.ofs,
+                             ctx->qry.grep, ctx->qry.search,
+                             ctx->qry.showmsg);
        else if (!strcmp(ctx->qry.page, "commit"))
-               return cgit_commit_link(name, title, class, ctx->qry.head,
-                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-                                     ctx->qry.path, 0);
+               cgit_commit_link(name, title, class, ctx->qry.head,
+                                ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                ctx->qry.path, 0);
        else if (!strcmp(ctx->qry.page, "patch"))
-               return cgit_patch_link(name, title, class, ctx->qry.head,
-                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-                                     ctx->qry.path);
+               cgit_patch_link(name, title, class, ctx->qry.head,
+                               ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                               ctx->qry.path);
        else if (!strcmp(ctx->qry.page, "refs"))
-               return cgit_refs_link(name, title, class, ctx->qry.head,
-                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-                                     ctx->qry.path);
+               cgit_refs_link(name, title, class, ctx->qry.head,
+                              ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                              ctx->qry.path);
        else if (!strcmp(ctx->qry.page, "snapshot"))
-               return cgit_snapshot_link(name, title, class, ctx->qry.head,
-                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-                                     ctx->qry.path);
+               cgit_snapshot_link(name, title, class, ctx->qry.head,
+                                  ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                  ctx->qry.path);
        else if (!strcmp(ctx->qry.page, "diff"))
-               return cgit_diff_link(name, title, class, ctx->qry.head,
-                                     ctx->qry.sha1, ctx->qry.sha2,
-                                     ctx->qry.path, 0);
+               cgit_diff_link(name, title, class, ctx->qry.head,
+                              ctx->qry.sha1, ctx->qry.sha2,
+                              ctx->qry.path, 0);
        else if (!strcmp(ctx->qry.page, "stats"))
-               return cgit_stats_link(name, title, class, ctx->qry.head,
-                                     ctx->qry.path);
-
-       /* Don't known how to make link for this page */
-       repolink(title, class, ctx->qry.page, ctx->qry.head, ctx->qry.path);
-       html("><!-- cgit_self_link() doesn't know how to make link for page '");
-       html_txt(ctx->qry.page);
-       html("' -->");
-       html_txt(name);
-       html("</a>");
+               cgit_stats_link(name, title, class, ctx->qry.head,
+                               ctx->qry.path);
+       else {
+               /* Don't known how to make link for this page */
+               repolink(title, class, ctx->qry.page, ctx->qry.head, ctx->qry.path);
+               html("><!-- cgit_self_link() doesn't know how to make link for page '");
+               html_txt(ctx->qry.page);
+               html("' -->");
+               html_txt(name);
+               html("</a>");
+       }
 }
 
 void cgit_object_link(struct object *obj)
@@ -499,7 +500,7 @@ void cgit_object_link(struct object *obj)
        shortrev = xstrdup(fullrev);
        shortrev[10] = '\0';
        if (obj->type == OBJ_COMMIT) {
-                cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL,
+               cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL,
                                 ctx.qry.head, fullrev, NULL, 0);
                return;
        } else if (obj->type == OBJ_TREE)
@@ -564,6 +565,7 @@ void cgit_submodule_link(const char *class, char *path, const char *rev)
        html("'>");
        html_txt(path);
        html("</a>");
+       html_txt(fmt(" @ %.7s", rev));
        if (item && tail)
                path[len - 1] = tail;
 }
@@ -575,7 +577,7 @@ void cgit_print_date(time_t secs, const char *format, int local_time)
 
        if (!secs)
                return;
-       if(local_time)
+       if (local_time)
                time = localtime(&secs);
        else
                time = gmtime(&secs);
@@ -735,7 +737,7 @@ int print_archive_ref(const char *refname, const unsigned char *sha1,
 
        if (prefixcmp(refname, "refs/archives"))
                return 0;
-       strncpy(buf, refname+14, sizeof(buf));
+       strncpy(buf, refname + 14, sizeof(buf));
        obj = parse_object(sha1);
        if (!obj)
                return 1;
@@ -967,7 +969,7 @@ void cgit_print_snapshot_links(const char *repo, const char *head,
 {
        const struct cgit_snapshot_format* f;
        char *prefix;
-       char *filename;
+       char *filename;
        unsigned char sha1[20];
 
        if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 &&