From fd0a6159099729c6a926f99d8601e2f442165a93 Mon Sep 17 00:00:00 2001
From: Andrew Sidwell <andy@entai.co.uk>
Date: Sat, 9 Aug 2008 15:37:38 +0000
Subject: Fix a logic error, and make a test clearer & more efficient as per
 jmb's review.

svn path=/trunk/libparserutils/; revision=4973
---
 src/charset/aliases.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/charset')

diff --git a/src/charset/aliases.c b/src/charset/aliases.c
index ce098fb..8ca24f4 100644
--- a/src/charset/aliases.c
+++ b/src/charset/aliases.c
@@ -278,14 +278,12 @@ int aliascmp(const char *s1, const char *s2, size_t s2_len)
 		while (IS_PUNCT_OR_SPACE(*s1))
 			s1++;
 		while (IS_PUNCT_OR_SPACE(s2[s2_pos]) &&
-				s2_pos <= s2_len) {
+				s2_pos < s2_len) {
 			s2_pos++;
 		}
 
-		if (s2_pos == s2_len && !*s1)
-			return 0;
-		else if (s2_pos == s2_len || !*s1)
-			break;
+		if (s2_pos == s2_len)
+			return (*s1 != '\0') ? 1 : 0;
 
 		if (tolower(*s1) != tolower(s2[s2_pos]))
 			break;
-- 
cgit v1.2.3