aboutsummaryrefslogtreecommitdiff
path: root/ui-plain.c
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2015-02-07 14:18:28 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2015-02-08 18:11:09 +0100
commit7358f63015a27d1c22816a3c1f734c3d4beed115 (patch)
tree5cb35efdca25827a939623c13c2513302976291b /ui-plain.c
parent1a9e56607eae2df2f4522b41294d94cb09fc4e5c (diff)
downloadcgit-7358f63015a27d1c22816a3c1f734c3d4beed115.tar.gz
cgit-7358f63015a27d1c22816a3c1f734c3d4beed115.tar.bz2
cgit-7358f63015a27d1c22816a3c1f734c3d4beed115.zip
git: update for v2.3.0
* sort_string_list(): rename to string_list_sort() (upstream commit 3383e199) * update read_tree_recursive callback to pass strbuf as base (upstream commit 6a0b0b6d) Signed-off-by: Christian Hesse <mail@eworm.de>
Diffstat (limited to 'ui-plain.c')
-rw-r--r--ui-plain.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/ui-plain.c b/ui-plain.c
index 30fff89..b787bc3 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -173,23 +173,22 @@ static void print_dir_tail(void)
html(" </ul>\n</body></html>\n");
}
-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;
- if (baselen == walk_tree_ctx->match_baselen) {
+ if (base->len == walk_tree_ctx->match_baselen) {
if (S_ISREG(mode)) {
if (print_object(sha1, pathname))
walk_tree_ctx->match = 1;
} else if (S_ISDIR(mode)) {
- print_dir(sha1, base, baselen, pathname);
+ print_dir(sha1, base->buf, base->len, pathname);
walk_tree_ctx->match = 2;
return READ_TREE_RECURSIVE;
}
- } else if (baselen > walk_tree_ctx->match_baselen) {
- print_dir_entry(sha1, base, baselen, pathname, mode);
+ } else if (base->len > walk_tree_ctx->match_baselen) {
+ print_dir_entry(sha1, base->buf, base->len, pathname, mode);
walk_tree_ctx->match = 2;
} else if (S_ISDIR(mode)) {
return READ_TREE_RECURSIVE;