Skip to content

Commit

Permalink
Merge branch 'rs/more-starts-with'
Browse files Browse the repository at this point in the history
* rs/more-starts-with:
  Use starts_with() for C strings instead of memcmp()
  • Loading branch information
Junio C Hamano committed Jun 20, 2014
2 parents 9ba6640 + 50e19a8 commit fa82037
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion builtin/for-each-ref.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion fetch-pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion remote.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit fa82037

Please sign in to comment.