From: cgit at cryptocrack.de (Lukas Fleischer)
Subject: [PATCH v2] ui-plain.c: Use a context structure in walk_tree()
Date: Sun, 3 Mar 2013 22:12:12 +0100 [thread overview]
Message-ID: <1362345132-8362-1-git-send-email-cgit@cryptocrack.de> (raw)
In-Reply-To: <1362330407-16034-4-git-send-email-cgit@cryptocrack.de>
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 <cgit at cryptocrack.de>
---
ui-plain.c | 33 ++++++++++++++++++++-------------
1 file changed, 20 insertions(+), 13 deletions(-)
diff --git a/ui-plain.c b/ui-plain.c
index 684d5ea..dfa77fa 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;
}
@@ -199,6 +203,9 @@ void cgit_print_plain(struct cgit_context *ctx)
unsigned char sha1[20];
struct commit *commit;
const char *paths[] = {ctx->qry.path, NULL};
+ struct walk_tree_context walk_tree_ctx = {
+ .match = 0
+ };
if (!rev)
rev = ctx->qry.head;
@@ -214,15 +221,15 @@ void cgit_print_plain(struct cgit_context *ctx)
}
if (!paths[0]) {
paths[0] = "";
- 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(paths[0]);
- read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
- if (!match)
+ walk_tree_ctx.match_baselen = basedir_len(paths[0]);
+ 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();
}
--
1.8.2.rc0.247.g811e0c0
next prev parent reply other threads:[~2013-03-03 21:12 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-03 17:06 [PATCH 0/7] Use context structures in walk_tree() functions cgit
2013-03-03 17:06 ` [PATCH 1/7] ui-blob.c: Use a context structure in walk_tree() cgit
2013-03-03 19:56 ` mailings
2013-03-03 20:25 ` john
2013-03-03 20:33 ` mailings
2013-03-03 20:39 ` cgit
2013-03-03 20:41 ` john
2013-03-03 21:21 ` mailings
2013-03-03 23:49 ` Jason
2013-03-03 17:06 ` [PATCH 2/7] ui-plain.c: Do not access match variable in print_*() cgit
2013-03-03 17:06 ` [PATCH 3/7] ui-plain.c: Use a context structure in walk_tree() cgit
2013-03-03 20:04 ` mailings
2013-03-03 21:02 ` cgit
2013-03-03 21:12 ` cgit [this message]
2013-03-03 17:06 ` [PATCH 4/7] ui-tree.c: Pass current revision to print_object() cgit
2013-03-03 17:06 ` [PATCH 5/7] ui-tree.c: Declare the state variable globally cgit
2013-03-03 20:08 ` mailings
2013-03-03 20:28 ` john
2013-03-03 20:42 ` cgit
2013-03-03 23:47 ` Jason
2013-03-03 23:54 ` cgit
2013-03-03 17:06 ` [PATCH 6/7] ui-tree.c: Drop the header variable cgit
2013-03-03 17:06 ` [PATCH 7/7] ui-tree.c: Use a context structure in walk_tree() cgit
2013-03-03 20:13 ` mailings
2013-03-03 20:43 ` cgit
2013-03-03 21:23 ` [PATCH 0/7] Use context structures in walk_tree() functions mailings
2013-03-04 5:06 ` Jason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1362345132-8362-1-git-send-email-cgit@cryptocrack.de \
--to=cgit@lists.zx2c4.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).