Use starts_with() for C strings instead of memcmp()

Convert three cases of checking for a constant prefix using memcmp() to
starts_with().  This way there is no need for magic string length
constants and we avoid running over the end of the string should it be
shorter than the prefix.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 3e1d5c3334e50035fdbf835cfdafbb39c0bacfd0..4135980f20786ef3320e334c4001fd67fc169056 100644 (file)
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -193,7 +193,7 @@ static int verify_format(const char *format)
                at = parse_atom(sp + 2, ep);
                cp = ep + 1;
 
                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;
                        need_color_reset_at_eol = !!strcmp(used_atom[at], color_reset);
        }
        return 0;

diff --git a/fetch-pack.c b/fetch-pack.c
index eeee2bb7e08a21dfe091a30c8378da6d488228f5..b12bd4c59a1105f4d3a82bbbd5208e3f7ebae0bb 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -507,7 +507,7 @@ static void filter_refs(struct fetch_pack_args *args,
                int keep = 0;
                next = ref->next;
 
                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 {
                    check_refname_format(ref->name, 0))
                        ; /* trash */
                else {

diff --git a/remote.c b/remote.c
index eea2c8de45052e3e3a59fb150eef3f54c6086800..0f6ef36b7d1f7e76eb3a4a742f2ba0f234d20d15 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -1194,7 +1194,7 @@ static int match_explicit(struct ref *src, struct ref *dst,
        case 1:
                break;
        case 0:
        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",
                        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",