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

Merge branch 'rs/more-starts-with'

Browse Source 
* rs/more-starts-with:
  Use starts_with() for C strings instead of memcmp()
This commit is contained in:
Junio C Hamano 2014-06-20 13:12:13 -07:00
commit fa8203741e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/for-each-ref.c
View File

@ -193,7 +193,7 @@ static int verify_format(const char *format)
at = parse_atom(sp + 2, ep); at = parse_atom(sp + 2, ep);
cp = ep + 1; 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); need_color_reset_at_eol = !!strcmp(used_atom[at], color_reset);
} }
return 0; return 0;

2
fetch-pack.c
View File

@ -507,7 +507,7 @@ static void filter_refs(struct fetch_pack_args *args,
int keep = 0; int keep = 0;
next = ref->next; next = ref->next;
if (!memcmp(ref->name, "refs/", 5) && if (starts_with(ref->name, "refs/") &&
check_refname_format(ref->name, 0)) check_refname_format(ref->name, 0))
; /* trash */ ; /* trash */
else { else {

2
remote.c
View File

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