Merge branch 'maint'

* maint: xdiff: optimise for no whitespace difference when ignoring whitespace.
git-mirror · Jul 6, 2010 · 5b5275f · 5b5275f
2 parents 869d588 + b4cf0f1
commit 5b5275f
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/xdiff/xutils.c b/xdiff/xutils.c
@@ -190,8 +190,10 @@ int xdl_recmatch(const char *l1, long s1, const char *l2, long s2, long flags)
 {
 	int i1, i2;
 
+	if (s1 == s2 && !memcmp(l1, l2, s1))
+		return 1;
 	if (!(flags & XDF_WHITESPACE_FLAGS))
-		return s1 == s2 && !memcmp(l1, l2, s1);
+		return 0;
 
 	i1 = 0;
 	i2 = 0;