From 5bb1cda5f73988963e7470f3cd75a380751f6d99 Mon Sep 17 00:00:00 2001 From: Rene Scharfe Date: Fri, 11 Aug 2006 14:01:45 +0200 Subject: drop length argument of has_extension As Fredrik points out the current interface of has_extension() is potentially confusing. Its parameters include both a nul-terminated string and a length-limited string. This patch drops the length argument, requiring two nul-terminated strings; all callsites are updated. I checked that all of them indeed provide nul-terminated strings. Filenames need to be nul-terminated anyway if they are to be passed to open() etc. The performance penalty of the additional strlen() is negligible compared to the system calls which inevitably surround has_extension() calls. Additionally, change has_extension() to use size_t inside instead of int, as that is the exact type strlen() returns and memcmp() expects. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano --- git-compat-util.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'git-compat-util.h') 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); } -- cgit v1.2.3