diff options
| -rw-r--r-- | builtin-help.c | 2 | ||||
| -rw-r--r-- | git-compat-util.h | 5 | ||||
| -rw-r--r-- | http-fetch.c | 2 | ||||
| -rw-r--r-- | index-pack.c | 2 | ||||
| -rw-r--r-- | local-fetch.c | 2 | ||||
| -rw-r--r-- | refs.c | 2 | ||||
| -rw-r--r-- | sha1_file.c | 2 | ||||
| -rw-r--r-- | verify-pack.c | 4 |
8 files changed, 11 insertions, 10 deletions
diff --git a/builtin-help.c b/builtin-help.c index 7a7f7759e5..6484cb9df2 100644 --- a/builtin-help.c +++ b/builtin-help.c @@ -140,7 +140,7 @@ static void list_commands(const char *exec_path, const char *pattern) continue; entlen = strlen(de->d_name); - if (has_extension(de->d_name, entlen, ".exe")) + if (has_extension(de->d_name, ".exe")) entlen -= 4; if (longest < entlen) diff --git a/git-compat-util.h b/git-compat-util.h index dd92093652..b2e18954c0 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -139,9 +139,10 @@ static inline ssize_t xwrite(int fd, const void *buf, size_t len) } } -static inline int has_extension(const char *filename, int len, const char *ext) +static inline int has_extension(const char *filename, const char *ext) { - int extlen = strlen(ext); + size_t len = strlen(filename); + size_t extlen = strlen(ext); return len > extlen && !memcmp(filename + len - extlen, ext, extlen); } diff --git a/http-fetch.c b/http-fetch.c index 6ea39f0589..de5fc44e66 100644 --- a/http-fetch.c +++ b/http-fetch.c @@ -870,7 +870,7 @@ static void process_ls_pack(struct remote_ls_ctx *ls) if (strlen(ls->dentry_name) == 63 && !strncmp(ls->dentry_name, "objects/pack/pack-", 18) && - has_extension(ls->dentry_name, 63, ".pack")) { + has_extension(ls->dentry_name, ".pack")) { get_sha1_hex(ls->dentry_name + 18, sha1); setup_index(ls->repo, sha1); } diff --git a/index-pack.c b/index-pack.c index a91e39ecd6..b20659c259 100644 --- a/index-pack.c +++ b/index-pack.c @@ -447,7 +447,7 @@ int main(int argc, char **argv) usage(index_pack_usage); if (!index_name) { int len = strlen(pack_name); - if (!has_extension(pack_name, len, ".pack")) + if (!has_extension(pack_name, ".pack")) die("packfile name '%s' does not end with '.pack'", pack_name); index_name_buf = xmalloc(len); diff --git a/local-fetch.c b/local-fetch.c index b6ec170c01..7d01845d39 100644 --- a/local-fetch.c +++ b/local-fetch.c @@ -44,7 +44,7 @@ static int setup_indices(void) while ((de = readdir(dir)) != NULL) { int namelen = strlen(de->d_name); if (namelen != 50 || - !has_extension(de->d_name, namelen, ".pack")) + !has_extension(de->d_name, ".pack")) continue; get_sha1_hex(de->d_name + 5, sha1); setup_index(sha1); @@ -147,7 +147,7 @@ static int do_for_each_ref(const char *base, int (*fn)(const char *path, const u namelen = strlen(de->d_name); if (namelen > 255) continue; - if (has_extension(de->d_name, namelen, ".lock")) + if (has_extension(de->d_name, ".lock")) continue; memcpy(path + baselen, de->d_name, namelen+1); if (stat(git_path("%s", path), &st) < 0) diff --git a/sha1_file.c b/sha1_file.c index a1bb01ca35..3db956dd5c 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -590,7 +590,7 @@ static void prepare_packed_git_one(char *objdir, int local) int namelen = strlen(de->d_name); struct packed_git *p; - if (!has_extension(de->d_name, namelen, ".idx")) + if (!has_extension(de->d_name, ".idx")) continue; /* we have .idx. Is it a file we can map? */ diff --git a/verify-pack.c b/verify-pack.c index f440a39678..357970da39 100644 --- a/verify-pack.c +++ b/verify-pack.c @@ -16,10 +16,10 @@ static int verify_one_pack(const char *path, int verbose) * In addition to "foo.idx" we accept "foo.pack" and "foo"; * normalize these forms to "foo.idx" for add_packed_git(). */ - if (has_extension(arg, len, ".pack")) { + if (has_extension(arg, ".pack")) { strcpy(arg + len - 5, ".idx"); len--; - } else if (!has_extension(arg, len, ".idx")) { + } else if (!has_extension(arg, ".idx")) { if (len + 4 >= PATH_MAX) return error("name too long: %s.idx", arg); strcpy(arg + len, ".idx"); |