From: Hongbo Zhao <hongbo.zhao@gmail.com>
Date: Thu, 13 Dec 2007 05:47:33 +0000 (-0800)
Subject: Not_contain should use strstr, not strcmp on strings. (bug 13632)
X-Git-Tag: 2.5.91~11
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=0f7870887adff6db3cffda5485418143f2bfa1f6;p=fontconfig.git

Not_contain should use strstr, not strcmp on strings. (bug 13632)

For Version 2.5.0, (same for previous version 2.4.2), in source file fccfg.c,
on line 700,

Original:
      ret = FcStrCmpIgnoreCase (left.u.s, right.u.s) == 0;

Should change to:
      ret = FcStrStrIgnoreCase (left.u.s, right.u.s) == 0;

I think this is just a mistake when copy-n-paste similar codes in the same
function. Apparently, return for "Not_contain" should be just the inverse of
"Contain", not the same as "Equal".
---

diff --git a/src/fccfg.c b/src/fccfg.c
index c73dc2a..ed620a0 100644
--- a/src/fccfg.c
+++ b/src/fccfg.c
@@ -697,7 +697,7 @@ FcConfigCompareValue (const FcValue	*left_o,
 		ret = FcStrCmpIgnoreCase (left.u.s, right.u.s) != 0;
 		break;
 	    case FcOpNotContains:
-		ret = FcStrCmpIgnoreCase (left.u.s, right.u.s) == 0;
+		ret = FcStrStrIgnoreCase (left.u.s, right.u.s) == 0;
 		break;
 	    default:
 		break;