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

Timestamp:

Jul 8, 2002, 6:53:23 PM (23 years ago)

Author:

umoeller

Message:

Misc updates.

File:

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

trunk/src/helpers/xstring.c

@@ -34 +34 @@
  *         iterative appends, you can pre-allocate memory to
  *         avoid excessive reallocations.
+ *
+ *      These functions are also used internally by the
+ *      WarpIN BSString class (and related classes).
  *
  *      Usage:
@@ -139 +142 @@
 {
     memset(pxstr, 0, sizeof(XSTRING));
+
     if (ulPreAllocate)
     {
@@ -186 +190 @@
 {
     memset(pxstr, 0, sizeof(XSTRING));
+
     if (ulPreAllocate)
     {
@@ -362 +367 @@
     if (pxstr->psz)
         free(pxstr->psz);
+
     memset(pxstr, 0, sizeof(XSTRING));
 }
@@ -441 +447 @@
     // else: we have enough memory
 
-    return (pxstr->cbAllocated);
+    return pxstr->cbAllocated;
 }
 
@@ -485 +491 @@
         xstrInit(pxstr, ulPreAllocate);
 
-    return (pxstr);
+    return pxstr;
 }
 
@@ -542 +548 @@
 {
     if (!pxstr)
-        return (0);         // V0.9.9 (2001-02-14) [umoeller]
+        return 0;         // V0.9.9 (2001-02-14) [umoeller]
 
     xstrClear(pxstr);
@@ -556 +562 @@
     // else null string: cbAllocated and ulLength are 0 already
 
-    return (pxstr->ulLength);
+    return pxstr->ulLength;
 }
 
@@ -570 +576 @@
               PSZ pszNew)                   // in: heap PSZ to use
 {
-    return (xstrset2(pxstr, pszNew, 0));
+    return xstrset2(pxstr, pszNew, 0);
 }
 
@@ -621 +627 @@
 
 ULONG xstrcpy(PXSTRING pxstr,               // in/out: string
-              PCSZ pcszSource,       // in: source, can be NULL
+              PCSZ pcszSource,              // in: source, can be NULL
               ULONG ulSourceLength)         // in: length of pcszSource or 0
 {
     if (!pxstr)
-        return (0);         // V0.9.9 (2001-02-14) [umoeller]
+        return 0;         // V0.9.9 (2001-02-14) [umoeller]
 
     if (pcszSource)
@@ -647 +653 @@
                    pcszSource,
                    ulSourceLength);
-            *(pxstr->psz + ulSourceLength) = '\0';
+            pxstr->psz[ulSourceLength] = '\0';
                     // V0.9.9 (2001-02-16) [umoeller]
                     // we must do this or otherwise we require pcszSource
@@ -670 +676 @@
     pxstr->ulLength = ulSourceLength;
 
-    return (pxstr->ulLength);
+    return pxstr->ulLength;
 }
 
@@ -684 +690 @@
 {
     if (!pcstrSource)
-        return (0);
-
-    return (xstrcpy(pxstr, pcstrSource->psz, pcstrSource->ulLength));
+        return 0;
+
+    return xstrcpy(pxstr, pcstrSource->psz, pcstrSource->ulLength);
 }
 
@@ -758 +764 @@
                        ulSourceLength);
 
-                *(pxstr->psz + pxstr->ulLength + ulSourceLength) = '\0';
+                pxstr->psz[pxstr->ulLength + ulSourceLength] = '\0';
                         // V0.9.9 (2001-02-16) [umoeller]
                         // we must do this or otherwise we require pcszSource
@@ -774 +780 @@
     }
 
-    return (ulrc);
+    return ulrc;
 }
 
@@ -816 +822 @@
     if ((pxstr) && (c))
     {
-        // ULONG   ulSourceLength = 1;
         // 1) memory management
         xstrReserve(pxstr,
@@ -833 +838 @@
     } // end if ((pxstr) && (c))
 
-    return (ulrc);
+    return ulrc;
 }
 
@@ -847 +852 @@
 {
     if (!pcstrSource)
-        return (0);
-
-    return (xstrcat(pxstr,
-                    pcstrSource->psz,
-                    pcstrSource->ulLength));
+        return 0;
+
+    return xstrcat(pxstr,
+                   pcstrSource->psz,
+                   pcstrSource->ulLength);
 }
 
@@ -1023 +1028 @@
     } // end checks
 
-    return (ulrc);
+    return ulrc;
 }
 
@@ -1094 +1099 @@
     }
 
-    return (pReturn);
+    return pReturn;
 }
 
@@ -1210 +1215 @@
     } // end if ((pxstr) && (pstrSearch) && (pstrReplace))
 
-    return (ulrc);
+    return ulrc;
 }
 
@@ -1246 +1251 @@
     xstrInitSet(&xstrReplace, (PSZ)pcszReplace);
 
-    return (xstrFindReplace(pxstr, pulOfs, &xstrFind, &xstrReplace, ShiftTable, &fRepeat));
+    return xstrFindReplace(pxstr, pulOfs, &xstrFind, &xstrReplace, ShiftTable, &fRepeat);
 }
 
@@ -1325 +1330 @@
  */
 
-ULONG xstrEncode(PXSTRING pxstr,            // in/out: string to convert
+ULONG xstrEncode(PXSTRING pxstr,     // in/out: string to convert
                  PCSZ pcszEncode)    // in: characters to encode (e.g. "%,();=")
 {
@@ -1383 +1388 @@
     }
 
-    return (ulrc);
+    return ulrc;
 }
 
@@ -1464 +1469 @@
     }
 
-    return (ulrc);
+    return ulrc;
 }
 
@@ -1476 +1481 @@
 ULONG xstrDecode(PXSTRING pxstr)
 {
-    return (xstrDecode2(pxstr, '%'));
+    return xstrDecode2(pxstr, '%');
 }
 
@@ -1683 +1688 @@
     printf("New string is: \"%s\" (%d/%d/%d)\n", str.psz, str.ulLength, str.cbAllocated, str.ulDelta);
 
-    return (0);
+    return 0;
 } */