use strip_suffix instead of ends_with in simple cases

When stripping a suffix like:

if (ends_with(str, "foo"))
buf = xmemdupz(str, strlen(str) - 3);

we can instead use strip_suffix to avoid the constant 3,
which must match the literal "foo" (we sometimes use
strlen("foo") instead, but that means we are repeating
ourselves). The example above becomes:

if (strip_suffix(str, "foo", &len))
buf = xmemdupz(str, len);

This also saves a strlen(), since we calculate the string
length when detecting the suffix.

Note that in some cases we also switch from xstrndup to
xmemdupz, which saves a further strlen call.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/remote.c b/builtin/remote.c
index 9b3e368983570be72a5c4b8476f69dc39522d192..0a6f3ef04060a918c87f99ccc4c661f2e06541fd 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -265,16 +265,17 @@ static int config_read_branches(const char *key, const char *value, void *cb)
                struct string_list_item *item;
                struct branch_info *info;
                enum { REMOTE, MERGE, REBASE } type;
                struct string_list_item *item;
                struct branch_info *info;
                enum { REMOTE, MERGE, REBASE } type;

+               size_t key_len;

 
                key += 7;
 
                key += 7;

-               if (ends_with(key, ".remote")) {
-                       name = xstrndup(key, strlen(key) - 7);
+               if (strip_suffix(key, ".remote", &key_len)) {
+                       name = xmemdupz(key, key_len);

                        type = REMOTE;
                        type = REMOTE;

-               } else if (ends_with(key, ".merge")) {
-                       name = xstrndup(key, strlen(key) - 6);
+               } else if (strip_suffix(key, ".merge", &key_len)) {
+                       name = xmemdupz(key, key_len);

                        type = MERGE;
                        type = MERGE;

-               } else if (ends_with(key, ".rebase")) {
-                       name = xstrndup(key, strlen(key) - 7);
+               } else if (strip_suffix(key, ".rebase", &key_len)) {
+                       name = xmemdupz(key, key_len);

                        type = REBASE;
                } else
                        return 0;
                        type = REBASE;
                } else
                        return 0;

diff --git a/builtin/repack.c b/builtin/repack.c
index 6b0b62dcb2687e78ec433e7de1103f0c0f74a1fc..52f22ca3fb7923b16237e8430bda0e1426c8bff2 100644 (file)
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -77,16 +77,15 @@ static void get_non_kept_pack_filenames(struct string_list *fname_list)
        DIR *dir;
        struct dirent *e;
        char *fname;
        DIR *dir;
        struct dirent *e;
        char *fname;

-       size_t len;

 
        if (!(dir = opendir(packdir)))
                return;
 
        while ((e = readdir(dir)) != NULL) {
 
        if (!(dir = opendir(packdir)))
                return;
 
        while ((e = readdir(dir)) != NULL) {

-               if (!ends_with(e->d_name, ".pack"))
+               size_t len;
+               if (!strip_suffix(e->d_name, ".pack", &len))

                        continue;
 
                        continue;
 

-               len = strlen(e->d_name) - strlen(".pack");

                fname = xmemdupz(e->d_name, len);
 
                if (!file_exists(mkpath("%s/%s.keep", packdir, fname)))
                fname = xmemdupz(e->d_name, len);
 
                if (!file_exists(mkpath("%s/%s.keep", packdir, fname)))

diff --git a/connected.c b/connected.c
index be0253e21bec3617ad3a7f1b0afc7d2049efc4fd..dae9c9972eb3485bd20494efd78d09f1189667cb 100644 (file)
--- a/connected.c
+++ b/connected.c
@@ -31,6 +31,7 @@ static int check_everything_connected_real(sha1_iterate_fn fn,
        unsigned char sha1[20];
        int err = 0, ac = 0;
        struct packed_git *new_pack = NULL;
        unsigned char sha1[20];
        int err = 0, ac = 0;
        struct packed_git *new_pack = NULL;

+       size_t base_len;

 
        if (fn(cb_data, sha1))
                return err;
 
        if (fn(cb_data, sha1))
                return err;


@@ -38,10 +39,9 @@ static int check_everything_connected_real(sha1_iterate_fn fn,
        if (transport && transport->smart_options &&
            transport->smart_options->self_contained_and_connected &&
            transport->pack_lockfile &&
        if (transport && transport->smart_options &&
            transport->smart_options->self_contained_and_connected &&
            transport->pack_lockfile &&

-           ends_with(transport->pack_lockfile, ".keep")) {
+           strip_suffix(transport->pack_lockfile, ".keep", &base_len)) {

                struct strbuf idx_file = STRBUF_INIT;
                struct strbuf idx_file = STRBUF_INIT;

-               strbuf_addstr(&idx_file, transport->pack_lockfile);
-               strbuf_setlen(&idx_file, idx_file.len - 5); /* ".keep" */
+               strbuf_add(&idx_file, transport->pack_lockfile, base_len);

                strbuf_addstr(&idx_file, ".idx");
                new_pack = add_packed_git(idx_file.buf, idx_file.len, 1);
                strbuf_release(&idx_file);
                strbuf_addstr(&idx_file, ".idx");
                new_pack = add_packed_git(idx_file.buf, idx_file.len, 1);
                strbuf_release(&idx_file);

diff --git a/help.c b/help.c
index 372728fe7ed7a233c2933caa380af9c242767e65..97567c452364838ea720fc8f61d2e9ab96304613 100644 (file)
--- a/help.c
+++ b/help.c
@@ -145,7 +145,7 @@ static void list_commands_in_dir(struct cmdnames *cmds,
        len = buf.len;
 
        while ((de = readdir(dir)) != NULL) {
        len = buf.len;
 
        while ((de = readdir(dir)) != NULL) {

-               int entlen;
+               size_t entlen;

 
                if (!starts_with(de->d_name, prefix))
                        continue;
 
                if (!starts_with(de->d_name, prefix))
                        continue;


@@ -156,8 +156,7 @@ static void list_commands_in_dir(struct cmdnames *cmds,
                        continue;
 
                entlen = strlen(de->d_name) - prefix_len;
                        continue;
 
                entlen = strlen(de->d_name) - prefix_len;

-               if (ends_with(de->d_name, ".exe"))
-                       entlen -= 4;
+               strip_suffix(de->d_name, ".exe", &entlen);

 
                add_cmdname(cmds, de->d_name + prefix_len, entlen);
        }
 
                add_cmdname(cmds, de->d_name + prefix_len, entlen);
        }