From b1db30cd2577fb59fb4490a284e0a34a0345cc02 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Sun, 3 Mar 2013 17:27:54 +0100 Subject: ui-plain.c: Use a context structure in walk_tree() Do not misuse global variables to save the context. Instead, use the context pointer which was designed to share information between a read_tree_fn and the caller. Signed-off-by: Lukas Fleischer --- ui-plain.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/ui-plain.c b/ui-plain.c index c90ae59..8ef4ec6 100644 --- a/ui-plain.c +++ b/ui-plain.c @@ -11,8 +11,10 @@ #include "html.h" #include "ui-shared.h" -int match_baselen; -int match; +struct walk_tree_context { + int match_baselen; + int match; +}; static char *get_mimetype_from_file(const char *filename, const char *ext) { @@ -166,18 +168,20 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage, void *cbdata) { - if (baselen == match_baselen) { + struct walk_tree_context *walk_tree_ctx = cbdata; + + if (baselen == walk_tree_ctx->match_baselen) { if (S_ISREG(mode)) { if (print_object(sha1, pathname)) - match = 1; + walk_tree_ctx->match = 1; } else if (S_ISDIR(mode)) { print_dir(sha1, base, baselen, pathname); - match = 2; + walk_tree_ctx->match = 2; return READ_TREE_RECURSIVE; } - } else if (baselen > match_baselen) { + } else if (baselen > walk_tree_ctx->match_baselen) { print_dir_entry(sha1, base, baselen, pathname, mode); - match = 2; + walk_tree_ctx->match = 2; } else if (S_ISDIR(mode)) { return READ_TREE_RECURSIVE; } @@ -206,6 +210,9 @@ void cgit_print_plain(struct cgit_context *ctx) .nr = 1, .items = &path_items }; + struct walk_tree_context walk_tree_ctx = { + .match = 0 + }; if (!rev) rev = ctx->qry.head; @@ -221,15 +228,15 @@ void cgit_print_plain(struct cgit_context *ctx) } if (!path_items.match) { path_items.match = ""; - match_baselen = -1; + walk_tree_ctx.match_baselen = -1; print_dir(commit->tree->object.sha1, "", 0, ""); - match = 2; + walk_tree_ctx.match = 2; } else - match_baselen = basedir_len(path_items.match); - read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, NULL); - if (!match) + walk_tree_ctx.match_baselen = basedir_len(path_items.match); + read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); + if (!walk_tree_ctx.match) html_status(404, "Not found", 0); - else if (match == 2) + else if (walk_tree_ctx.match == 2) print_dir_tail(); } -- cgit 1.4.1 y.c?id=8f97b95aee84aba6d4c8869a7a9eb98e446e9b32&follow=1'>Take event number for save incrJune McEnroe 2019-01-18Add H_SAVE_INCR function to libeditJune McEnroe 2019-01-18Update gfx-cocoa constants for new macOSJune McEnroe 2019-01-17Add Girlpool Tiny Desk ConcertJune McEnroe 2019-01-17Reunify gfx and binJune McEnroe 2019-01-17Reorganize bin and Makefile once againJune McEnroe 2019-01-17Don't use string functions in ttpreJune McEnroe 2019-01-16Fix some symbols in sans8x16June McEnroe 2019-01-15Add basic HISTFILE load and saveJune McEnroe 2019-01-15Add !! alias in cashJune McEnroe 2019-01-15Add shell and unshell targetsJune McEnroe 2019-01-15Use \$ in cash PS1 and add # to RPS1June McEnroe 2019-01-15Use flock(2) when loading and saving historyJune McEnroe 2019-01-15Add sans8x16.psfJune McEnroe 2019-01-14Add guides to psfedJune McEnroe 2019-01-14Check for NULL copy or undo buffers in psfedJune McEnroe 2019-01-14Add cash.7 READMEJune McEnroe 2019-01-14Document old=new argument of fc -sJune McEnroe 2019-01-14Allow replacing empty string with fc old=newJune McEnroe 2019-01-13Enable warnings in libeditJune McEnroe 2019-01-13Show full path in RPS1June McEnroe 2019-01-13Shorten $HOME to ~ in prompt expansionJune McEnroe 2019-01-13Document PSlitJune McEnroe 2019-01-13Document PS0June McEnroe 2019-01-13Set PS0 in cashJune McEnroe 2019-01-13Add PS0June McEnroe 2019-01-13Change default ENV from cashrc to env.shJune McEnroe 2019-01-13Use colours in cash promptsJune McEnroe 2019-01-12Set PSlit like NetBSD shJune McEnroe 2019-01-12Install gnupg2 from pkgsrc and symlink gpgJune McEnroe 2019-01-12Reference cash builtin man pages in cash.1 SEE ALSOJune McEnroe 2019-01-12Restore cash builtin man page datesJune McEnroe 2019-01-12Use local libeditJune McEnroe 2019-01-12Replace libedit MakefileJune McEnroe 2019-01-11Import /usr/src/lib/libedit from NetBSD 8.0June McEnroe 2019-01-11Add PSlit for prompt escapesJune McEnroe 2019-01-11Don't make depend automaticallyJune McEnroe