diff options
author | Christian Couder <chriscool@tuxfamily.org> | 2013-12-01 00:55:40 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-12-06 02:13:21 +0400 |
commit | 59556548230e617b837343c2c07e357e688e2ca4 (patch) | |
tree | 5e66894c3d666f0fdc39aaf79de554dfeb7d0e36 /builtin/name-rev.c | |
parent | 956623157f828b2b4fd91a9bc5e78ba8e42437d9 (diff) |
replace {pre,suf}fixcmp() with {starts,ends}_with()
Leaving only the function definitions and declarations so that any
new topic in flight can still make use of the old functions, replace
existing uses of the prefixcmp() and suffixcmp() with new API
functions.
The change can be recreated by mechanically applying this:
$ git grep -l -e prefixcmp -e suffixcmp -- \*.c |
grep -v strbuf\\.c |
xargs perl -pi -e '
s|!prefixcmp\(|starts_with\(|g;
s|prefixcmp\(|!starts_with\(|g;
s|!suffixcmp\(|ends_with\(|g;
s|suffixcmp\(|!ends_with\(|g;
'
on the result of preparatory changes in this series.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/name-rev.c')
-rw-r--r-- | builtin/name-rev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/name-rev.c b/builtin/name-rev.c index 20fcf8c696..990390156c 100644 --- a/builtin/name-rev.c +++ b/builtin/name-rev.c @@ -101,9 +101,9 @@ static const char *name_ref_abbrev(const char *refname, int shorten_unambiguous) { if (shorten_unambiguous) refname = shorten_unambiguous_ref(refname, 0); - else if (!prefixcmp(refname, "refs/heads/")) + else if (starts_with(refname, "refs/heads/")) refname = refname + 11; - else if (!prefixcmp(refname, "refs/")) + else if (starts_with(refname, "refs/")) refname = refname + 5; return refname; } @@ -149,7 +149,7 @@ static int name_ref(const char *path, const unsigned char *sha1, int flags, void int can_abbreviate_output = data->tags_only && data->name_only; int deref = 0; - if (data->tags_only && prefixcmp(path, "refs/tags/")) + if (data->tags_only && !starts_with(path, "refs/tags/")) return 0; if (data->ref_filter) { |