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

Timestamp:

Feb 4, 2002, 6:32:38 PM (24 years ago)

Author:

umoeller

Message:

Buncha fixes, and fixes for fixes.

File:

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

trunk/src/helpers/xstring.c

@@ -478 +478 @@
 PXSTRING xstrCreate(ULONG ulPreAllocate)
 {
-    PXSTRING pxstr = (PXSTRING)malloc(sizeof(XSTRING));
-    if (pxstr)
+    PXSTRING pxstr;
+    if (pxstr = (PXSTRING)malloc(sizeof(XSTRING)))
         xstrInit(pxstr, ulPreAllocate);
 
@@ -1404 +1404 @@
  *@@added V0.9.9 (2001-02-28) [umoeller]
  *@@changed V0.9.9 (2001-03-06) [lafaix]: removed memory allocation
- */
-
-ULONG xstrDecode(PXSTRING pxstr)       // in/out: string to be decoded
+ *@@changed V0.9.16 (2002-02-02) [umoeller]: added cKey
+ */
+
+ULONG xstrDecode2(PXSTRING pxstr,       // in/out: string to be decoded
+                  CHAR cKey)            // in: encoding key (normally '%')
 {
     ULONG   ulrc = 0;
@@ -1423 +1425 @@
             // pSource points to next char now
 
-            if (c == '%')
+            if (c == cKey)
             {
                 static char ach[] = "0123456789ABCDEF";
@@ -1453 +1455 @@
 
             // not encoding, or null after '%', or invalid encoding:
-            // just copy this
+            // just leave thisalone
             *pDest++ = c;
         } // while ((ch = *pSource++))
@@ -1465 +1467 @@
 
     return (ulrc);
+}
+
+/*
+ *@@ xstrDecode:
+ *      added for compatibility with exports.
+ *
+ *@@added V0.9.16 (2002-02-02) [umoeller]
+ */
+
+ULONG xstrDecode(PXSTRING pxstr)
+{
+    return (xstrDecode2(pxstr, '%'));
 }