ui-refs.c: Refactor print_tag()

[ps-cgit] / ui-refs.c

diff --git a/ui-refs.c b/ui-refs.c
index 5bebed1e7521490c5ae8d04157e2a8b5695f6337..74064789ecdd281bd411472b20730501d1c52182 100644 (file)
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -11,8 +11,6 @@
 #include "html.h"
 #include "ui-shared.h"
 
-static int header;
-
 static int cmp_age(int age1, int age2)
 {
        if (age1 != 0 && age2 != 0)
@@ -96,7 +94,6 @@ static void print_tag_header()
             "<th class='left'>Download</th>"
             "<th class='left'>Author</th>"
             "<th class='left' colspan='2'>Age</th></tr>\n");
-       header = 1;
 }
 
 static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
@@ -130,49 +127,45 @@ static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
        if (free_ref)
                free((char *)ref);
 }
+
 static int print_tag(struct refinfo *ref)
 {
-       struct tag *tag;
-       struct taginfo *info;
+       struct tag *tag = NULL;
+       struct taginfo *info = NULL;
        char *name = (char *)ref->refname;
+       struct object *obj = ref->object;
 
-       if (ref->object->type == OBJ_TAG) {
-               tag = (struct tag *)ref->object;
+       if (obj->type == OBJ_TAG) {
+               tag = (struct tag *)obj;
+               obj = tag->tagged;
                info = ref->tag;
                if (!tag || !info)
                        return 1;
-               html("<tr><td>");
-               cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);
-               html("</td><td>");
-               if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT))
-                       print_tag_downloads(ctx.repo, name);
-               else
-                       cgit_object_link(tag->tagged);
-               html("</td><td>");
+       }
+
+       html("<tr><td>");
+       cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);
+       html("</td><td>");
+       if (ctx.repo->snapshots && (obj->type == OBJ_COMMIT))
+               print_tag_downloads(ctx.repo, name);
+       else
+               cgit_object_link(obj);
+       html("</td><td>");
+       if (info) {
                if (info->tagger)
                        html(info->tagger);
-               html("</td><td colspan='2'>");
+       } else if (ref->object->type == OBJ_COMMIT) {
+               html(ref->commit->author);
+       }
+       html("</td><td colspan='2'>");
+       if (info) {
                if (info->tagger_date > 0)
                        cgit_print_age(info->tagger_date, -1, NULL);
-               html("</td></tr>\n");
-       } else {
-               if (!header)
-                       print_tag_header();
-               html("<tr><td>");
-               cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);
-               html("</td><td>");
-               if (ctx.repo->snapshots && (ref->object->type == OBJ_COMMIT))
-                       print_tag_downloads(ctx.repo, name);
-               else
-                       cgit_object_link(ref->object);
-               html("</td><td>");
-               if (ref->object->type == OBJ_COMMIT)
-                       html(ref->commit->author);
-               html("</td><td colspan='2'>");
-               if (ref->object->type == OBJ_COMMIT)
-                       cgit_print_age(ref->commit->commit->date, -1, NULL);
-               html("</td></tr>\n");
+       } else if (ref->object->type == OBJ_COMMIT) {
+               cgit_print_age(ref->commit->commit->date, -1, NULL);
        }
+       html("</td></tr>\n");
+
        return 0;
 }
 
@@ -221,7 +214,6 @@ void cgit_print_tags(int maxcount)
        struct reflist list;
        int i;
 
-       header = 0;
        list.refs = NULL;
        list.alloc = list.count = 0;
        for_each_tag_ref(cgit_refs_cb, &list);