undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shorten_unambiguous_ref(): introduce a new local variable

Browse Source 
When filling the scanf_fmts array, use a separate variable to keep
track of the offset to avoid clobbering total_len (which we will need
in the next commit).

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2014-01-08 15:43:38 +01:00 committed by Junio C Hamano
parent c90d3dbe7d
commit 84d5633f98
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
refs.c
View File

@ -3367,6 +3367,7 @@ char *shorten_unambiguous_ref(const char *refname, int strict)
/* pre generate scanf formats from ref_rev_parse_rules[] */ /* pre generate scanf formats from ref_rev_parse_rules[] */
if (!nr_rules) { if (!nr_rules) {
size_t total_len = 0; size_t total_len = 0;
size_t offset = 0;
/* the rule list is NULL terminated, count them first */ /* the rule list is NULL terminated, count them first */
for (nr_rules = 0; ref_rev_parse_rules[nr_rules]; nr_rules++) for (nr_rules = 0; ref_rev_parse_rules[nr_rules]; nr_rules++)
@ -3375,12 +3376,11 @@ char *shorten_unambiguous_ref(const char *refname, int strict)
scanf_fmts = xmalloc(nr_rules * sizeof(char *) + total_len); scanf_fmts = xmalloc(nr_rules * sizeof(char *) + total_len);
total_len = 0; offset = 0;
for (i = 0; i < nr_rules; i++) { for (i = 0; i < nr_rules; i++) {
scanf_fmts[i] = (char *)&scanf_fmts[nr_rules] scanf_fmts[i] = (char *)&scanf_fmts[nr_rules] + offset;
+ total_len;
gen_scanf_fmt(scanf_fmts[i], ref_rev_parse_rules[i]); gen_scanf_fmt(scanf_fmts[i], ref_rev_parse_rules[i]);
total_len += strlen(ref_rev_parse_rules[i]); offset += strlen(ref_rev_parse_rules[i]);
} }
} }