Changeset 1145 for pjproject/trunk/pjlib-util/src/pjlib-util/scanner.c

Timestamp:

Apr 4, 2007 10:15:27 AM (16 years ago)

Author:

bennylp

Message:

Ticket #208: Allow single quotes for attributes in XML (thanks Tory Patnoe)

File:

• pjproject/trunk/pjlib-util/src/pjlib-util/scanner.c (modified) (4 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util/scanner.c

@@ -340 +340 @@
 
 PJ_DEF(void) pj_scan_get_quote( pj_scanner *scanner,
-                                 int begin_quote, int end_quote, 
-                                 pj_str_t *out)
-{
-    register char *s = scanner->curptr;
-    
+                                int begin_quote, int end_quote, 
+                                pj_str_t *out)
+{
+    pj_scan_get_quotes(scanner, (char*)&begin_quote, (char*)&end_quote, 1, out);
+}
+
+PJ_DEF(void) pj_scan_get_quotes(pj_scanner *scanner,
+                                const char *begin_quote, const char *end_quote,
+                                int qsize, pj_str_t *out)
+{
+    register char *s = scanner->curptr;
+    int qpair = -1;
+    int i;
+
+    pj_assert(qsize > 0);
+
     /* Check and eat the begin_quote. */
-    if (*s != begin_quote) {
+    for (i = 0; i < qsize; ++i) {
+        if (*s == begin_quote[i]) {
+            qpair = i;
+            break;
+        }
+    }
+    if (qpair == -1) {
         pj_scan_syntax_err(scanner);
         return;
@@ -356 +373 @@
     do {
         /* loop until end_quote is found. */
-        while (*s && *s != '\n' && *s != end_quote) {
+        while (*s && *s != '\n' && *s != end_quote[qpair]) {
             ++s;
         }
 
         /* check that no backslash character precedes the end_quote. */
-        if (*s == end_quote) {
+        if (*s == end_quote[qpair]) {
             if (*(s-1) == '\\') {
                 if (s-2 == scanner->begin) {
@@ -390 +407 @@
 
     /* Check and eat the end quote. */
-    if (*s != end_quote) {
+    if (*s != end_quote[qpair]) {
         pj_scan_syntax_err(scanner);
         return;
@@ -404 +421 @@
     }
 }
+
 
 PJ_DEF(void) pj_scan_get_n( pj_scanner *scanner,