Fix incorrect merge.

reviewed by: plam

diff --git a/ChangeLog b/ChangeLog
index fd4c375e369dca054bac28a5ce2630fb00be052c..9a4cf7622d6301d2a1a6ef09ef12756693061778 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-26  Dirk Mueller  <dmueller@suse.com>
+       reviewed by: plam
+       
+       * src/fcmatch.c (FcCompareValueList):
+
+       Fix incorrect merge.
+
 2005-11-25  Patrick Lam  <plam@mit.edu>
        * src/fcmatch.c (FcMatchObjectPtrsInit, FcCompareValueList):
 

diff --git a/src/fcmatch.c b/src/fcmatch.c
index 26c4124ded61626251505ee42b4874e0febe334e..74829a70b8dc84be6fde4bf7389c8202bd268291 100644 (file)
--- a/src/fcmatch.c
+++ b/src/fcmatch.c
@@ -351,10 +351,10 @@ FcCompareValueList (FcObjectPtr o,
     bestWeak = 1e99;
     j = 0;
     for (v1 = v1orig, v1_ptrU = FcValueListPtrU(v1); v1_ptrU;
-        v1 = FcValueListPtrU(v1)->next, v1_ptrU = FcValueListPtrU(v1))
+        v1 = v1_ptrU->next, v1_ptrU = FcValueListPtrU(v1))
     {
-       for (v2 = v2orig, v2_ptrU = FcValueListPtrU(v2); FcValueListPtrU(v2); 
-            v2 = FcValueListPtrU(v2)->next)
+       for (v2 = v2orig, v2_ptrU = FcValueListPtrU(v2); v2_ptrU;
+            v2 = v2_ptrU->next, v2_ptrU = FcValueListPtrU(v2))
        {
            v = (*_FcMatchers[i].compare) (&v1_ptrU->value,
                                           &v2_ptrU->value);