Browse Source

shorten_unambiguous_ref(): tighten up pointer arithmetic

As long as we're being pathologically stingy with mallocs, we might as
well do the math right and save 6 (!) bytes.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Michael Haggerty 11 years ago committed by Junio C Hamano
parent
commit
7902fe03f9
  1. 4
      refs.c

4
refs.c

@ -3353,8 +3353,8 @@ char *shorten_unambiguous_ref(const char *refname, int strict) @@ -3353,8 +3353,8 @@ char *shorten_unambiguous_ref(const char *refname, int strict)

/* the rule list is NULL terminated, count them first */
for (nr_rules = 0; ref_rev_parse_rules[nr_rules]; nr_rules++)
/* no +1 because strlen("%s") < strlen("%.*s") */
total_len += strlen(ref_rev_parse_rules[nr_rules]);
/* -2 for strlen("%.*s") - strlen("%s"); +1 for NUL */
total_len += strlen(ref_rev_parse_rules[nr_rules]) - 2 + 1;

scanf_fmts = xmalloc(nr_rules * sizeof(char *) + total_len);


Loading…
Cancel
Save