[PATCH 09/10] ref-filter: drop unused "obj" parameters
- From
Jeff King <peff@peff.net>
- Date
- Feb 14, 2019, 05:50 UTC
- Message-ID
- <20190214055058.GI20578@sigill.intra.peff.net>
- In-Reply-To
- <20190214054736.GA20091@sigill.intra.peff.net>
The grab_person() and grab_sub_body_contents() functions take both an object struct and a buf/sz pair of the object bytes. However, they use only the latter, since "struct object" does not contain the parsed ident (nor the whole commit message, of course).
Let's get rid of these misleading "struct object" parameters. It's possible we may want them in the future (e.g., to generate error messages that mention the object id), but since these are static functions, we can easily add them back in later (and if we do want that information, it's likely we'd pass it through a more generalized "parsing context" struct anyway).
Signed-off-by: Jeff King <peff@peff.net> --- ref-filter.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c index c9333b3181..9ba18b220c 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -1064,7 +1064,7 @@ static void grab_date(const char *buf, struct atom_value *v, const char *atomnam } /* See grab_values */ -static void grab_person(const char *who, struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz) +static void grab_person(const char *who, struct atom_value *val, int deref, void *buf, unsigned long sz) { int i; int wholen = strlen(who); @@ -1192,7 +1192,7 @@ static void append_lines(struct strbuf *out, const char *buf, unsigned long size } /* See grab_values */ -static void grab_sub_body_contents(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz) +static void grab_sub_body_contents(struct atom_value *val, int deref, void *buf, unsigned long sz) { int i; const char *subpos = NULL, *bodypos = NULL, *sigpos = NULL; @@ -1270,14 +1270,14 @@ static void grab_values(struct atom_value *val, int deref, struct object *obj, v switch (obj->type) { case OBJ_TAG: grab_tag_values(val, deref, obj); - grab_sub_body_contents(val, deref, obj, buf, sz); - grab_person("tagger", val, deref, obj, buf, sz); + grab_sub_body_contents(val, deref, buf, sz); + grab_person("tagger", val, deref, buf, sz); break; case OBJ_COMMIT: grab_commit_values(val, deref, obj); - grab_sub_body_contents(val, deref, obj, buf, sz); - grab_person("author", val, deref, obj, buf, sz); - grab_person("committer", val, deref, obj, buf, sz); + grab_sub_body_contents(val, deref, buf, sz); + grab_person("author", val, deref, buf, sz); + grab_person("committer", val, deref, buf, sz); break; case OBJ_TREE: /* grab_tree_values(val, deref, obj, buf, sz); */
-- 2.21.0.rc1.567.g648f076c3f