ui-tree.c: Drop the header variable

[ps-cgit] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index 4d932a0fbdcd82ba14a449e3f731931f8907542c..26f06e34377671e8c6057821ce07f308d2a4ee88 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -13,7 +13,7 @@
 
 char *curr_rev;
 char *match_path;
-int header = 0;
+static int state;
 
 static void print_text_buffer(const char *name, char *buf, unsigned long size)
 {
@@ -84,7 +84,7 @@ static void print_binary_buffer(char *buf, unsigned long size)
        html("</table>\n");
 }
 
-static void print_object(const unsigned char *sha1, char *path, const char *basename)
+static void print_object(const unsigned char *sha1, char *path, const char *basename, const char *rev)
 {
        enum object_type type;
        char *buf;
@@ -106,7 +106,7 @@ static void print_object(const unsigned char *sha1, char *path, const char *base
 
        htmlf("blob: %s (", sha1_to_hex(sha1));
        cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
-                       curr_rev, path);
+                       rev, path);
        html(")\n");
 
        if (ctx.cfg.max_blob_size && size / 1024 > ctx.cfg.max_blob_size) {
@@ -188,15 +188,11 @@ static void ls_head()
        html("<th class='right'>Size</th>");
        html("<th/>");
        html("</tr>\n");
-       header = 1;
 }
 
 static void ls_tail()
 {
-       if (!header)
-               return;
        html("</table>\n");
-       header = 0;
 }
 
 static void ls_tree(const unsigned char *sha1, char *path)
@@ -223,7 +219,6 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
                     const char *pathname, unsigned mode, int stage,
                     void *cbdata)
 {
-       static int state;
        static char buffer[PATH_MAX];
 
        if (state == 0) {
@@ -237,7 +232,7 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
                        ls_head();
                        return READ_TREE_RECURSIVE;
                } else {
-                       print_object(sha1, buffer, pathname);
+                       print_object(sha1, buffer, pathname, curr_rev);
                        return 0;
                }
        }
@@ -284,6 +279,8 @@ void cgit_print_tree(const char *rev, char *path)
        }
 
        match_path = path;
+       state = 0;
        read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, NULL);
-       ls_tail();
+       if (state == 1)
+               ls_tail();
 }