Browse Source

Merge branch 'rs/more-starts-with'

* rs/more-starts-with:
  Use starts_with() for C strings instead of memcmp()
maint
Junio C Hamano 11 years ago
parent
commit
fa8203741e
  1. 2
      builtin/for-each-ref.c
  2. 2
      fetch-pack.c
  3. 2
      remote.c

2
builtin/for-each-ref.c

@ -193,7 +193,7 @@ static int verify_format(const char *format) @@ -193,7 +193,7 @@ static int verify_format(const char *format)
at = parse_atom(sp + 2, ep);
cp = ep + 1;

if (!memcmp(used_atom[at], "color:", 6))
if (starts_with(used_atom[at], "color:"))
need_color_reset_at_eol = !!strcmp(used_atom[at], color_reset);
}
return 0;

2
fetch-pack.c

@ -507,7 +507,7 @@ static void filter_refs(struct fetch_pack_args *args, @@ -507,7 +507,7 @@ static void filter_refs(struct fetch_pack_args *args,
int keep = 0;
next = ref->next;

if (!memcmp(ref->name, "refs/", 5) &&
if (starts_with(ref->name, "refs/") &&
check_refname_format(ref->name, 0))
; /* trash */
else {

2
remote.c

@ -1194,7 +1194,7 @@ static int match_explicit(struct ref *src, struct ref *dst, @@ -1194,7 +1194,7 @@ static int match_explicit(struct ref *src, struct ref *dst,
case 1:
break;
case 0:
if (!memcmp(dst_value, "refs/", 5))
if (starts_with(dst_value, "refs/"))
matched_dst = make_linked_ref(dst_value, dst_tail);
else if (is_null_sha1(matched_src->new_sha1))
error("unable to delete '%s': remote ref does not exist",

Loading…
Cancel
Save