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

Timestamp:

Sep 11, 2006, 1:09:47 AM (19 years ago)

Author:

pr

Message:

Allow EOL to terminate non-quoted attributes

File:

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

trunk/src/helpers/stringh.c

@@ -1447 +1447 @@
  *
  *@@added V0.9.0 [umoeller]
+ *@@changed V1.0.13 (2006-09-10) [pr]: improved parsing
  */
 
@@ -1463 +1464 @@
         // determine end character to search for: a space
         CHAR cEnd = ' ';
-        if (*pParam == '\"')
-        {
-            // or, if the data is enclosed in quotes, a quote
-            cEnd = '\"';
-            pParam++;
-        }
-
         // V1.0.3 (2004-11-10) [pr]: @@fixes 461
-        if (*pParam == '\'')
-        {
-            // or, if the data is enclosed in single quotes, a single quote
-            cEnd = '\'';
+        // V1.0.13 (2006-09-10) [pr]: optimized
+        if ((*pParam == '\"') || (*pParam == '\''))
+        {
+            // or, if the data is enclosed in quotes, a quote or single quote
+            cEnd = *pParam;
             pParam++;
         }
@@ -1486 +1481 @@
         while (*pParam)
         {
-            if (*pParam == cEnd)
+            // V1.0.13 (2006-09-10) [pr]: line end terminates non-quoted attribute
+            if (   (   (cEnd == ' ')
+                    && ((*pParam == ' ') || (*pParam == '\r') || (*pParam == '\n')))
+                || (*pParam == cEnd)
+               )
                 // end character found
                 break;