diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2013-11-05 22:02:36 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-11-06 13:10:33 -0800 |
| commit | 76e08227e5bc8b6e3d208da965d2421911d25ae3 (patch) | |
| tree | fffe84cc3010906389eab2e95f80988f1fff4056 | |
| parent | d2e146d8d7052b8482859e64daf2b86c019531f8 (diff) | |
| download | git-cc/remote-remove-redundant-postfixcmp.tar.gz | |
Rename suffixcmp() to has_suffix() and invert its resultcc/remote-remove-redundant-postfixcmp
Now has_suffix() returns 1 when the suffix is present and 0 otherwise.
The old name followed the pattern anything-cmp(), which suggests
a general comparison function suitable for e.g. sorting objects.
But this was not the case for suffixcmp().
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/clone.c | 2 | ||||
| -rw-r--r-- | builtin/fetch.c | 2 | ||||
| -rw-r--r-- | builtin/merge-recursive.c | 2 | ||||
| -rw-r--r-- | builtin/remote.c | 6 | ||||
| -rw-r--r-- | builtin/repack.c | 2 | ||||
| -rw-r--r-- | connected.c | 2 | ||||
| -rw-r--r-- | git-compat-util.h | 2 | ||||
| -rw-r--r-- | strbuf.c | 6 |
8 files changed, 12 insertions, 12 deletions
diff --git a/builtin/clone.c b/builtin/clone.c index 874e0fd0b6..84fb1bdeee 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -510,7 +510,7 @@ static void write_followtags(const struct ref *refs, const char *msg) for (ref = refs; ref; ref = ref->next) { if (prefixcmp(ref->name, "refs/tags/")) continue; - if (!suffixcmp(ref->name, "^{}")) + if (has_suffix(ref->name, "^{}")) continue; if (!has_sha1_file(ref->old_sha1)) continue; diff --git a/builtin/fetch.c b/builtin/fetch.c index bd7a10164f..8eb6cd0582 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -653,7 +653,7 @@ static void find_non_local_tags(struct transport *transport, * to fetch then we can mark the ref entry in the list * as one to ignore by setting util to NULL. */ - if (!suffixcmp(ref->name, "^{}")) { + if (has_suffix(ref->name, "^{}")) { if (item && !has_sha1_file(ref->old_sha1) && !will_fetch(head, ref->old_sha1) && !has_sha1_file(item->util) && diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c index 3a64f5d0bd..e7f1a39df3 100644 --- a/builtin/merge-recursive.c +++ b/builtin/merge-recursive.c @@ -29,7 +29,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix) struct commit *result; init_merge_options(&o); - if (argv[0] && !suffixcmp(argv[0], "-subtree")) + if (argv[0] && has_suffix(argv[0], "-subtree")) o.subtree_shift = ""; if (argc < 4) diff --git a/builtin/remote.c b/builtin/remote.c index 9b3a98e415..b9a1024cc4 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -269,13 +269,13 @@ static int config_read_branches(const char *key, const char *value, void *cb) enum { REMOTE, MERGE, REBASE } type; key += 7; - if (!suffixcmp(key, ".remote")) { + if (has_suffix(key, ".remote")) { name = xstrndup(key, strlen(key) - 7); type = REMOTE; - } else if (!suffixcmp(key, ".merge")) { + } else if (has_suffix(key, ".merge")) { name = xstrndup(key, strlen(key) - 6); type = MERGE; - } else if (!suffixcmp(key, ".rebase")) { + } else if (has_suffix(key, ".rebase")) { name = xstrndup(key, strlen(key) - 7); type = REBASE; } else diff --git a/builtin/repack.c b/builtin/repack.c index a0ff5c704f..9ef518d0d6 100644 --- a/builtin/repack.c +++ b/builtin/repack.c @@ -78,7 +78,7 @@ static void get_non_kept_pack_filenames(struct string_list *fname_list) return; while ((e = readdir(dir)) != NULL) { - if (suffixcmp(e->d_name, ".pack")) + if (!has_suffix(e->d_name, ".pack")) continue; len = strlen(e->d_name) - strlen(".pack"); diff --git a/connected.c b/connected.c index fae8d64c12..be9304e161 100644 --- a/connected.c +++ b/connected.c @@ -38,7 +38,7 @@ int check_everything_connected_with_transport(sha1_iterate_fn fn, if (transport && transport->smart_options && transport->smart_options->self_contained_and_connected && transport->pack_lockfile && - !suffixcmp(transport->pack_lockfile, ".keep")) { + has_suffix(transport->pack_lockfile, ".keep")) { struct strbuf idx_file = STRBUF_INIT; strbuf_addstr(&idx_file, transport->pack_lockfile); strbuf_setlen(&idx_file, idx_file.len - 5); /* ".keep" */ diff --git a/git-compat-util.h b/git-compat-util.h index 7776f126d3..0f6a31e1b0 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -351,7 +351,7 @@ extern void set_error_routine(void (*routine)(const char *err, va_list params)); extern void set_die_is_recursing_routine(int (*routine)(void)); extern int prefixcmp(const char *str, const char *prefix); -extern int suffixcmp(const char *str, const char *suffix); +extern int has_suffix(const char *str, const char *suffix); static inline const char *skip_prefix(const char *str, const char *prefix) { @@ -10,13 +10,13 @@ int prefixcmp(const char *str, const char *prefix) return (unsigned char)*prefix - (unsigned char)*str; } -int suffixcmp(const char *str, const char *suffix) +int has_suffix(const char *str, const char *suffix) { int len = strlen(str), suflen = strlen(suffix); if (len < suflen) - return -1; + return 0; else - return strcmp(str + len - suflen, suffix); + return !strcmp(str + len - suflen, suffix); } /* |