From: mhagger@alum.mit.edu Date: Tue, 10 Apr 2012 05:30:19 GMT Subject: [PATCH 07/15] names_conflict(): simplify implementation Message-ID: <1334035827-20331-8-git-send-email-mhagger@alum.mit.edu> In-Reply-To: <1334035827-20331-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 file changed, 4 insertions(+), 13 deletions(-) diff --git a/refs.c b/refs.c index cdb66d9..d4f58b8 100644 --- a/refs.c +++ b/refs.c @@ -342,19 +342,10 @@ static int do_for_each_ref_in_arrays(struct ref_array *array1, */ 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.10