From 2975c770ca609ea5afc80631c4ac9087c527b6fd Mon Sep 17 00:00:00 2001 From: Jeff King Date: Mon, 30 Jun 2014 12:58:25 -0400 Subject: replace has_extension with ends_with These two are almost the same function, with the exception that has_extension only matches if there is content before the suffix. So ends_with(".exe", ".exe") is true, but has_extension would not be. This distinction does not matter to any of the callers, though, and we can just replace uses of has_extension with ends_with. We prefer the "ends_with" name because it is more generic, and there is nothing about the function that requires it to be used for file extensions. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- sha1_file.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sha1_file.c') diff --git a/sha1_file.c b/sha1_file.c index 394fa4509e..93b794f58e 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1204,7 +1204,7 @@ static void prepare_packed_git_one(char *objdir, int local) strbuf_setlen(&path, dirnamelen); strbuf_addstr(&path, de->d_name); - if (has_extension(de->d_name, ".idx")) { + if (ends_with(de->d_name, ".idx")) { /* Don't reopen a pack we already have. */ for (p = packed_git; p; p = p->next) { if (!memcmp(path.buf, p->pack_name, path.len - 4)) @@ -1222,10 +1222,10 @@ static void prepare_packed_git_one(char *objdir, int local) if (!report_garbage) continue; - if (has_extension(de->d_name, ".idx") || - has_extension(de->d_name, ".pack") || - has_extension(de->d_name, ".bitmap") || - has_extension(de->d_name, ".keep")) + if (ends_with(de->d_name, ".idx") || + ends_with(de->d_name, ".pack") || + ends_with(de->d_name, ".bitmap") || + ends_with(de->d_name, ".keep")) string_list_append(&garbage, path.buf); else report_garbage("garbage found", path.buf); -- cgit v1.2.1