Changeset 147 for trunk/src/helpers/xstring.c

Timestamp:

Mar 16, 2002, 8:53:47 AM (23 years ago)

Author:

umoeller

Message:

Misc updates for Unicode.

File:

• trunk/src/helpers/xstring.c (modified) (2 diffs)

trunk/src/helpers/xstring.c

@@ -1064 +1064 @@
             do  // while p
             {
-                p = (PSZ)strhmemfind(p,         // in: haystack
-                                     pxstr->ulLength - (p - pxstr->psz),
-                                                // remaining length of haystack
-                                     pstrFind->psz,
-                                     ulFoundLen,
-                                     pShiftTable,
-                                     pfRepeatFind);
-                if (p)
+                if (p = (PSZ)strhmemfind(p,         // in: haystack
+                                         pxstr->ulLength - (p - pxstr->psz),
+                                                    // remaining length of haystack
+                                         pstrFind->psz,
+                                         ulFoundLen,
+                                         pShiftTable,
+                                         pfRepeatFind))
                 {
                     // string found:
@@ -1187 +1186 @@
             // yes:
             ULONG   ulOfs = *pulOfs;
-            PCSZ pFound
-                = (PCSZ)strhmemfind(pxstr->psz + ulOfs, // in: haystack
-                                            pxstr->ulLength - ulOfs,
-                                            pstrSearch->psz,
-                                            cSearchLen,
-                                            pShiftTable,
-                                            pfRepeatFind);
-            if (pFound)
+            PCSZ pFound;
+            if (pFound = (PCSZ)strhmemfind(pxstr->psz + ulOfs, // in: haystack
+                                           pxstr->ulLength - ulOfs,
+                                           pstrSearch->psz,
+                                           cSearchLen,
+                                           pShiftTable,
+                                           pfRepeatFind))
             {
                 ULONG ulFirstReplOfs = pFound - pxstr->psz;