ui-refs.c: Remove global header variable

[ps-cgit] / ui-refs.c

diff --git a/ui-refs.c b/ui-refs.c
index 3827252f8120a8ceddd6877198e77d3aa8866876..0399e6b9ebc05f87e6f1bffc1281965d26015ad3 100644 (file)
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -7,11 +7,10 @@
  */
 
 #include "cgit.h"
+#include "ui-refs.h"
 #include "html.h"
 #include "ui-shared.h"
 
-static int header;
-
 static int cmp_age(int age1, int age2)
 {
        if (age1 != 0 && age2 != 0)
@@ -95,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)
@@ -103,6 +101,7 @@ static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
        const struct cgit_snapshot_format* f;
        char *filename;
        const char *basename;
+       int free_ref = 0;
 
        if (!ref || strlen(ref) < 2)
                return;
@@ -111,8 +110,10 @@ static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
        if (prefixcmp(ref, basename) != 0) {
                if ((ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1]))
                        ref++;
-               if (isdigit(ref[0]))
+               if (isdigit(ref[0])) {
                        ref = xstrdup(fmt("%s-%s", basename, ref));
+                       free_ref = 1;
+               }
        }
 
        for (f = cgit_snapshot_formats; f->suffix; f++) {
@@ -122,6 +123,9 @@ static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
                cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);
                html("&nbsp;&nbsp;");
        }
+
+       if (free_ref)
+               free((char *)ref);
 }
 static int print_tag(struct refinfo *ref)
 {
@@ -149,8 +153,6 @@ static int print_tag(struct refinfo *ref)
                        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>");
@@ -171,7 +173,7 @@ static int print_tag(struct refinfo *ref)
 
 static void print_refs_link(char *path)
 {
-       html("<tr class='nohover'><td colspan='4'>");
+       html("<tr class='nohover'><td colspan='5'>");
        cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path);
        html("</td></tr>");
 }
@@ -200,11 +202,13 @@ void cgit_print_branches(int maxcount)
                qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name);
        }
 
-       for(i = 0; i < maxcount; i++)
+       for (i = 0; i < maxcount; i++)
                print_branch(list.refs[i]);
 
        if (maxcount < list.count)
                print_refs_link("heads");
+
+       cgit_free_reflist_inner(&list);
 }
 
 void cgit_print_tags(int maxcount)
@@ -212,7 +216,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);
@@ -224,11 +227,13 @@ void cgit_print_tags(int maxcount)
        else if (maxcount > list.count)
                maxcount = list.count;
        print_tag_header();
-       for(i = 0; i < maxcount; i++)
+       for (i = 0; i < maxcount; i++)
                print_tag(list.refs[i]);
 
        if (maxcount < list.count)
                print_refs_link("tags");
+
+       cgit_free_reflist_inner(&list);
 }
 
 void cgit_print_refs()
@@ -242,7 +247,7 @@ void cgit_print_refs()
                cgit_print_tags(0);
        else {
                cgit_print_branches(0);
-               html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
+               html("<tr class='nohover'><td colspan='5'>&nbsp;</td></tr>");
                cgit_print_tags(0);
        }
        html("</table>");