From: mhagger@alum.mit.edu Date: Mon, 12 Dec 2011 05:38:29 GMT Subject: [PATCH v2 22/51] names_conflict(): simplify implementation Message-ID: <1323668338-1764-23-git-send-email-mhagger@alum.mit.edu> In-Reply-To: <1323668338-1764-1-git-send-email-mhagger@alum.mit.edu> From: Michael Haggerty Save a bunch of lines of code and a couple of strlen() calls. Signed-off-by: Michael Haggerty --- refs.c | 17 ++++------------- 1 files changed, 4 insertions(+), 13 deletions(-) diff --git a/refs.c b/refs.c index c33e94a..12a70c1 100644 --- a/refs.c +++ b/refs.c @@ -1094,19 +1094,10 @@ static int remove_empty_directories(const char *file) */ static int names_conflict(const char *refname1, const char *refname2) { - int len1 = strlen(refname1); - int len2 = strlen(refname2); - int cmplen; - const char *lead; - - if (len1 < len2) { - cmplen = len1; - lead = refname2; - } else { - cmplen = len2; - lead = refname1; - } - return !strncmp(refname1, refname2, cmplen) && lead[cmplen] == '/'; + for (; *refname1 && *refname1 == *refname2; refname1++, refname2++) + ; + return (*refname1 == '\0' && *refname2 == '/') + || (*refname1 == '/' && *refname2 == '\0'); } /* -- 1.7.8