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

Timestamp:

Jan 19, 2002, 11:50:39 AM (24 years ago)

Author:

umoeller

Message:

Misc changes.

File:

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

trunk/src/helpers/xstring.c

@@ -129 +129 @@
 void XWPENTRY xstrInitDebug(PXSTRING pxstr,
                             ULONG ulPreAllocate,
-                            const char *file,
+                            PCSZ file,
                             unsigned long line,
-                            const char *function)
+                            PCSZ function)
 {
     memset(pxstr, 0, sizeof(XSTRING));
@@ -194 +194 @@
 
 /*
- *@@ xstrInitSet:
+ *@@ xstrInitSet2:
  *      this can be used instead of xstrInit if you
  *      have a free()'able string you want to initialize
@@ -212 +212 @@
  +          xstrInitSet(&str, strdup("blah"));
  *
- *@@added V0.9.6 (2000-11-01) [umoeller]
- *@@changed V0.9.9 (2001-03-09) [umoeller]: added ulDelta
- */
-
-void xstrInitSet(PXSTRING pxstr,
-                 PSZ pszNew)
+ *@@added V0.9.16 (2002-01-13) [umoeller]
+ */
+
+void xstrInitSet2(PXSTRING pxstr,
+                  PSZ pszNew,
+                  ULONG ulNewLength)
 {
     if (!pszNew)
@@ -223 +223 @@
     else
     {
+        if (!ulNewLength)
+            ulNewLength = strlen(pszNew);
         pxstr->psz = pszNew;
-        pxstr->ulLength = strlen(pszNew);
-        pxstr->cbAllocated = pxstr->ulLength + 1;
-        pxstr->ulDelta = pxstr->ulLength  * 10 / 100;
-    }
+        pxstr->ulLength = ulNewLength;
+        pxstr->cbAllocated = ulNewLength + 1;
+        pxstr->ulDelta = ulNewLength * 10 / 100;
+    }
+}
+
+/*
+ *@@ xstrInitSet:
+ *      shortcut to xstrInitSet2 to retain compatibility.
+ *
+ *@@added V0.9.6 (2000-11-01) [umoeller]
+ *@@changed V0.9.9 (2001-03-09) [umoeller]: added ulDelta
+ */
+
+void xstrInitSet(PXSTRING pxstr,
+                 PSZ pszNew)
+{
+    xstrInitSet2(pxstr, pszNew, 0);
 }
 
@@ -239 +255 @@
 
 void XWPENTRY xstrInitCopyDebug(PXSTRING pxstr,
-                                const char *pcszSource,
+                                PCSZ pcszSource,
                                 ULONG ulExtraAllocate,
-                                const char *file,
+                                PCSZ file,
                                 unsigned long line,
-                                const char *function)
+                                PCSZ function)
 {
     if (pxstr)
@@ -301 +317 @@
 
 void xstrInitCopy(PXSTRING pxstr,
-                  const char *pcszSource,
+                  PCSZ pcszSource,
                   ULONG ulExtraAllocate)          // in: if > 0, extra memory to allocate
 {
@@ -497 +513 @@
 
 /*
- *@@ xstrset:
+ *@@ xstrset2:
  *      sets the specified XSTRING to a new string
  *      without copying it.
@@ -511 +527 @@
  *      is true if pszNew comes from strdup().
  *
- *@@added V0.9.6 (2000-11-01) [umoeller]
- *@@changed V0.9.9 (2001-02-14) [umoeller]: fixed NULL target crash
- */
-
-ULONG xstrset(PXSTRING pxstr,               // in/out: string
-              PSZ pszNew)                   // in: heap PSZ to use
+ *      With this function, you can pass in the
+ *      length of the string in ulNewLength.
+ *      Otherwise use xstrset.
+ *
+ *@@added V0.9.16 (2002-01-13) [umoeller]
+ */
+
+ULONG xstrset2(PXSTRING pxstr,              // in/out: string
+               PSZ pszNew,                  // in: heap PSZ to use
+               ULONG ulNewLength)           // in: length of string or 0 to run strlen here
 {
     if (!pxstr)
@@ -525 +545 @@
     if (pszNew)
     {
-        pxstr->ulLength = strlen(pszNew);
-        pxstr->cbAllocated = pxstr->ulLength + 1;
-
-        pxstr->ulDelta = pxstr->cbAllocated * 10 / 100;
+        if (!ulNewLength)
+            ulNewLength = strlen(pszNew);
+        pxstr->ulLength = ulNewLength;
+        pxstr->cbAllocated = ulNewLength + 1;
+
+        pxstr->ulDelta = ulNewLength * 10 / 100;
     }
     // else null string: cbAllocated and ulLength are 0 already
 
     return (pxstr->ulLength);
+}
+
+/*
+ *@@ xstrset:
+ *      shortcut for xstrset2 for retaining compatibility.
+ *
+ *@@added V0.9.6 (2000-11-01) [umoeller]
+ *@@changed V0.9.9 (2001-02-14) [umoeller]: fixed NULL target crash
+ */
+
+ULONG xstrset(PXSTRING pxstr,               // in/out: string
+              PSZ pszNew)                   // in: heap PSZ to use
+{
+    return (xstrset2(pxstr, pszNew, 0));
 }
 
@@ -583 +619 @@
 
 ULONG xstrcpy(PXSTRING pxstr,               // in/out: string
-              const char *pcszSource,       // in: source, can be NULL
+              PCSZ pcszSource,       // in: source, can be NULL
               ULONG ulSourceLength)         // in: length of pcszSource or 0
 {
@@ -694 +730 @@
 
 ULONG xstrcat(PXSTRING pxstr,               // in/out: string
-              const char *pcszSource,       // in: source, can be NULL
+              PCSZ pcszSource,       // in: source, can be NULL
               ULONG ulSourceLength)         // in: length of pcszSource or 0
 {
@@ -863 +899 @@
               ULONG ulFirstReplOfs,             // in: ofs of first char to replace
               ULONG cReplLen,                   // in: no. of chars to replace
-              const char *pcszReplaceWith,      // in: string to replace chars with
+              PCSZ pcszReplaceWith,      // in: string to replace chars with
               ULONG cReplaceWithLen)            // in: length of replacement string
                                                 // (this MUST be specified; if 0, chars are removed only)
@@ -1014 +1050 @@
                  size_t *pShiftTable,         // in: shift table (see strhmemfind)
                  PBOOL pfRepeatFind,          // in: repeat find? (see strhmemfind)
-                 const char *pcszBeginChars,  // suggestion: "\x0d\x0a ()/\\-,."
-                 const char *pcszEndChars)    // suggestion: "\x0d\x0a ()/\\-,.:;"
+                 PCSZ pcszBeginChars,  // suggestion: "\x0d\x0a ()/\\-,."
+                 PCSZ pcszEndChars)    // suggestion: "\x0d\x0a ()/\\-,.:;"
 {
     PSZ     pReturn = 0;
@@ -1025 +1061 @@
         if ((pxstr->ulLength) && (ulFoundLen))
         {
-            const char *p = pxstr->psz + ulOfs;
+            PCSZ p = pxstr->psz + ulOfs;
 
             do  // while p
@@ -1152 +1188 @@
             // yes:
             ULONG   ulOfs = *pulOfs;
-            const char *pFound
-                = (const char *)strhmemfind(pxstr->psz + ulOfs, // in: haystack
+            PCSZ pFound
+                = (PCSZ)strhmemfind(pxstr->psz + ulOfs, // in: haystack
                                             pxstr->ulLength - ulOfs,
                                             pstrSearch->psz,
@@ -1199 +1235 @@
                        PULONG pulOfs,               // in: where to begin search (0 = start);
                                                     // out: ofs of first char after replacement string
-                       const char *pcszSearch,      // in: search string; cannot be NULL
-                       const char *pcszReplace)     // in: replacement string; cannot be NULL
+                       PCSZ pcszSearch,      // in: search string; cannot be NULL
+                       PCSZ pcszReplace)     // in: replacement string; cannot be NULL
 {
     XSTRING xstrFind,
@@ -1292 +1328 @@
 
 ULONG xstrEncode(PXSTRING pxstr,            // in/out: string to convert
-                 const char *pcszEncode)    // in: characters to encode (e.g. "%,();=")
+                 PCSZ pcszEncode)    // in: characters to encode (e.g. "%,();=")
 {
     ULONG ulrc = 0,