Changeset 161 for trunk/src/helpers/stringh.c

Timestamp:

May 2, 2002, 5:17:26 PM (23 years ago)

Author:

umoeller

Message:

Misc fixes.

File:

• trunk/src/helpers/stringh.c (modified) (3 diffs)

trunk/src/helpers/stringh.c

@@ -550 +550 @@
  *
  *      Example:
+ *
  +          PSZ pszBuf = "KEYWORD { --blah-- } next",
  +              pEnd;
@@ -555 +556 @@
  +                      '{', '}',
  +                      &pEnd)
+ *
  *      would return a new buffer containing " --blah-- ",
  *      and ppEnd would afterwards point to the space
@@ -562 +564 @@
  */
 
-PSZ strhExtract(PSZ pszBuf,     // in: search buffer
+PSZ strhExtract(PCSZ pszBuf,    // in: search buffer
                 CHAR cOpen,     // in: opening char
                 CHAR cClose,    // in: closing char
-                PSZ *ppEnd)     // out: if != NULL, receives first character after closing char
+                PCSZ *ppEnd)    // out: if != NULL, receives first character after closing char
 {
     PSZ pszReturn = NULL;
-
-    if (pszBuf)
-    {
-        PSZ pOpen;
-        if (pOpen = strchr(pszBuf, cOpen))
-        {
-            // opening char found:
-            // now go thru the whole rest of the buffer
-            PSZ     p = pOpen+1;
-            LONG    lLevel = 1;        // if this goes 0, we're done
-            while (*p)
+    PCSZ pOpen;
+    if (    (pszBuf)
+         && (pOpen = strchr(pszBuf, cOpen))
+       )
+    {
+        // opening char found:
+        // now go thru the whole rest of the buffer
+        PCSZ     p = pOpen + 1;
+        LONG    lLevel = 1;        // if this goes 0, we're done
+        while (*p)
+        {
+            if (*p == cOpen)
+                lLevel++;
+            else if (*p == cClose)
             {
-                if (*p == cOpen)
-                    lLevel++;
-                else if (*p == cClose)
+                lLevel--;
+                if (lLevel <= 0)
                 {
-                    lLevel--;
-                    if (lLevel <= 0)
-                    {
-                        // matching closing bracket found:
-                        // extract string
-                        pszReturn = strhSubstr(pOpen+1,  // after cOpen
-                                               p);          // excluding cClose
-                        if (ppEnd)
-                            *ppEnd = p+1;
-                        break;      // while (*p)
-                    }
+                    // matching closing bracket found:
+                    // extract string
+                    pszReturn = strhSubstr(pOpen + 1,   // after cOpen
+                                           p);          // excluding cClose
+                    if (ppEnd)
+                        *ppEnd = p + 1;
+                    break;      // while (*p)
                 }
-                else if (*p == '\"')
-                {
-                    // beginning of string:
-                    PSZ p2 = p+1;
-                    // find end of string
-                    while ((*p2) && (*p2 != '\"'))
-                        p2++;
-
-                    if (*p2 == '\"')
-                        // closing quote found:
-                        // search on after that
-                        p = p2;     // raised below
-                    else
-                        break;      // while (*p)
-                }
-
-                p++;
             }
+            else if (*p == '\"')
+            {
+                // beginning of string:
+                PCSZ p2 = p+1;
+                // find end of string
+                while ((*p2) && (*p2 != '\"'))
+                    p2++;
+
+                if (*p2 == '\"')
+                    // closing quote found:
+                    // search on after that
+                    p = p2;     // raised below
+                else
+                    break;      // while (*p)
+            }
+
+            p++;
         }
     }