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>
This commit is contained in:

committed by
Junio C Hamano

parent
956623157f
commit
5955654823
6
commit.c
6
commit.c
@ -559,7 +559,7 @@ static void record_author_date(struct author_date_slab *author_date,
|
||||
buf;
|
||||
buf = line_end + 1) {
|
||||
line_end = strchrnul(buf, '\n');
|
||||
if (prefixcmp(buf, "author ")) {
|
||||
if (!starts_with(buf, "author ")) {
|
||||
if (!line_end[0] || line_end[1] == '\n')
|
||||
return; /* end of header */
|
||||
continue;
|
||||
@ -1106,7 +1106,7 @@ int parse_signed_commit(const unsigned char *sha1,
|
||||
next = next ? next + 1 : tail;
|
||||
if (in_signature && line[0] == ' ')
|
||||
sig = line + 1;
|
||||
else if (!prefixcmp(line, gpg_sig_header) &&
|
||||
else if (starts_with(line, gpg_sig_header) &&
|
||||
line[gpg_sig_header_len] == ' ')
|
||||
sig = line + gpg_sig_header_len + 1;
|
||||
if (sig) {
|
||||
@ -1186,7 +1186,7 @@ static void parse_gpg_output(struct signature_check *sigc)
|
||||
for (i = 0; i < ARRAY_SIZE(sigcheck_gpg_status); i++) {
|
||||
const char *found, *next;
|
||||
|
||||
if (!prefixcmp(buf, sigcheck_gpg_status[i].check + 1)) {
|
||||
if (starts_with(buf, sigcheck_gpg_status[i].check + 1)) {
|
||||
/* At the very beginning of the buffer */
|
||||
found = buf + strlen(sigcheck_gpg_status[i].check + 1);
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user