[PATCH 1/3] show-branch: drop head_len variable
- From
Jeff King <peff@peff.net>
- Date
- Feb 14, 2017, 17:26 UTC
- Message-ID
- <20170214172601.3bt64h35i65vz4sj@sigill.intra.peff.net>
- In-Reply-To
- <20170214172526.hzpm3d3ubd3vjnzr@sigill.intra.peff.net>
We copy the result of resolving HEAD into a buffer and keep track of its length. But we never actually use the length for anything besides the copy. Let's stop passing it around.
Signed-off-by: Jeff King <peff@peff.net> --- builtin/show-branch.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 974f3403a..e4c488b8c 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -470,7 +470,7 @@ static void snarf_refs(int head, int remotes) } } -static int rev_is_head(char *head, int headlen, char *name, +static int rev_is_head(char *head, char *name, unsigned char *head_sha1, unsigned char *sha1) { if ((!head[0]) || @@ -622,7 +622,6 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) enum rev_sort_order sort_order = REV_SORT_IN_GRAPH_ORDER; char head[128]; const char *head_p; - int head_len; struct object_id head_oid; int merge_base = 0; int independent = 0; @@ -790,11 +789,10 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) head_p = resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, head_oid.hash, NULL); if (head_p) { - head_len = strlen(head_p); + size_t head_len = strlen(head_p); memcpy(head, head_p, head_len + 1); } else { - head_len = 0; head[0] = 0; } @@ -805,7 +803,6 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) * HEAD points at. */ if (rev_is_head(head, - head_len, ref_name[i], head_oid.hash, NULL)) has_head++; @@ -866,7 +863,6 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) for (i = 0; i < num_rev; i++) { int j; int is_head = rev_is_head(head, - head_len, ref_name[i], head_oid.hash, rev[i]->object.oid.hash);
-- 2.12.0.rc1.479.g59880b11e