clone: use cgit_print_error_page() instead of html_status()

[ps-cgit] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index e4c3d2263cb3b85e84066ed4f0bfb6640bdcbe0a..2dbe89ea4faef6b3ac35b9fa6d8aa9d30678f328 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -6,7 +6,6 @@
  *   (see COPYING for full license text)
  */
 
-#include <ctype.h>
 #include "cgit.h"
 #include "ui-tree.h"
 #include "html.h"
@@ -121,9 +120,8 @@ static void print_object(const unsigned char *sha1, char *path, const char *base
 }
 
 
-static int ls_item(const unsigned char *sha1, const char *base, int baselen,
-                  const char *pathname, unsigned int mode, int stage,
-                  void *cbdata)
+static int ls_item(const unsigned char *sha1, struct strbuf *base,
+               const char *pathname, unsigned mode, int stage, void *cbdata)
 {
        struct walk_tree_context *walk_tree_ctx = cbdata;
        char *name;
@@ -167,7 +165,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
        html("<td>");
        cgit_log_link("log", NULL, "button", ctx.qry.head,
                      walk_tree_ctx->curr_rev, fullpath.buf, 0, NULL, NULL,
-                     ctx.qry.showmsg);
+                     ctx.qry.showmsg, 0);
        if (ctx.repo->max_stats)
                cgit_stats_link("stats", NULL, "button", ctx.qry.head,
                                fullpath.buf);
@@ -181,7 +179,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
        return 0;
 }
 
-static void ls_head()
+static void ls_head(void)
 {
        html("<table summary='tree listing' class='list'>\n");
        html("<tr class='nohover'>");
@@ -192,7 +190,7 @@ static void ls_head()
        html("</tr>\n");
 }
 
-static void ls_tail()
+static void ls_tail(void)
 {
        html("</table>\n");
 }
@@ -216,16 +214,15 @@ static void ls_tree(const unsigned char *sha1, char *path, struct walk_tree_cont
 }
 
 
-static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
-                    const char *pathname, unsigned mode, int stage,
-                    void *cbdata)
+static int walk_tree(const unsigned char *sha1, struct strbuf *base,
+               const char *pathname, unsigned mode, int stage, void *cbdata)
 {
        struct walk_tree_context *walk_tree_ctx = cbdata;
        static char buffer[PATH_MAX];
 
        if (walk_tree_ctx->state == 0) {
-               memcpy(buffer, base, baselen);
-               strcpy(buffer + baselen, pathname);
+               memcpy(buffer, base->buf, base->len);
+               strcpy(buffer + base->len, pathname);
                if (strcmp(walk_tree_ctx->match_path, buffer))
                        return READ_TREE_RECURSIVE;
 
@@ -238,11 +235,10 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
                        return 0;
                }
        }
-       ls_item(sha1, base, baselen, pathname, mode, stage, walk_tree_ctx);
+       ls_item(sha1, base, pathname, mode, stage, walk_tree_ctx);
        return 0;
 }
 
-
 /*
  * Show a tree or a blob
  *   rev:  the commit pointing at the root tree object