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

Timestamp:

Feb 2, 2003, 9:22:17 PM (23 years ago)

Author:

umoeller

Message:

Sources as of 1.0.1.

File:

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

trunk/src/helpers/xstring.c

@@ -1113 +1113 @@
  *      especially with large string bufffers.
  *
- *      None of the pointers can be NULL, but if pstrReplace
- *      is empty, this effectively erases pstrSearch in pxstr.
+ *      pxstr and pstrReplace may not be NULL, but if
+ *      pstrReplace is null or empty, this effectively
+ *      erases pstrSearch in pxstr.
  *
  *      Returns the length of the new string (exclusing the
@@ -1169 +1170 @@
  *@@changed V0.9.6 (2000-11-12) [umoeller]: now using strhmemfind
  *@@changed V0.9.7 (2001-01-15) [umoeller]: renamed from xstrrpl; extracted new xstrrpl
+ *@@changed V1.0.1 (2003-02-02) [umoeller]: now allowing for NULL pstrReplace
  */
 
@@ -1175 +1177 @@
                                                     // out: ofs of first char after replacement string
                       const XSTRING *pstrSearch,    // in: search string; cannot be NULL
-                      const XSTRING *pstrReplace,   // in: replacement string; cannot be NULL
+                      const XSTRING *pstrReplace,   // in: replacement string or NULL
                       size_t *pShiftTable,          // in: shift table (see strhmemfind)
                       PBOOL pfRepeatFind)           // in: repeat find? (see strhmemfind)
@@ -1181 +1183 @@
     ULONG    ulrc = 0;      // default: not found
 
-    if ((pxstr) && (pstrSearch) && (pstrReplace))
+    if ((pxstr) && (pstrSearch))
     {
         ULONG   cSearchLen = pstrSearch->ulLength;
@@ -1201 +1203 @@
             {
                 ULONG ulFirstReplOfs = pFound - pxstr->psz;
+                ULONG   lenRepl = pstrReplace ? (pstrReplace->ulLength) : 0;
                 // found in buffer from ofs:
                 // replace pFound with pstrReplace
@@ -1206 +1209 @@
                                ulFirstReplOfs,              // where to start
                                cSearchLen,                  // chars to replace
-                               pstrReplace->psz,
-                               pstrReplace->ulLength);      // adjusted V0.9.11 (2001-04-22) [umoeller]
+                               pstrReplace ? (pstrReplace->psz) : NULL,
+                               lenRepl);      // adjusted V0.9.11 (2001-04-22) [umoeller]
 
                 // return new length
-                *pulOfs = ulFirstReplOfs + pstrReplace->ulLength;
+                *pulOfs = ulFirstReplOfs + lenRepl;
             } // end if (pFound)
         } // end if (    (*pulOfs < pxstr->ulLength) ...