cvs: php4 /ext/standard url_scanner_ex.c url_scanner_ex.re

sas Fri Dec 22 14:52:12 2000 EDT Modified files: /php4/ext/standard url_scanner_ex.c url_scanner_ex.re Log: Support multi-char arg separators. PR: #8274 Index: php4/ext/standard/url_scanner_ex.c diff -u php4/ext/standard/url_scanner_ex.c:1.25 php4/ext/standard/url_scanner_ex.c:1.26 --- php4/ext/standard/url_scanner_ex.c:1.25 Tue Dec 5 03:05:24 2000 +++ php4/ext/standard/url_scanner_ex.c Fri Dec 22 14:52:11 2000 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.5 on Tue Dec 5 11:55:45 2000 */ +/* Generated by re2c 0.5 on Fri Dec 22 23:45:29 2000 */ #line 1 "/home/sas/src/php4/ext/standard/url_scanner_ex.re" /* +----------------------------------------------------------------------+ @@ -93,7 +93,7 @@ { register const char *p, *q; const char *bash = NULL; - char sep = '?'; + const char *sep = "?"; q = url->c + url->len; @@ -103,7 +103,7 @@ smart_str_append(dest, url); return; case '?': - sep = *separator; + sep = separator; break; case '#': bash = p; @@ -122,7 +122,7 @@ else smart_str_append(dest, url); - smart_str_appendc(dest, sep); + smart_str_appends(dest, sep); smart_str_append(dest, name); smart_str_appendc(dest, '='); smart_str_append(dest, val); Index: php4/ext/standard/url_scanner_ex.re diff -u php4/ext/standard/url_scanner_ex.re:1.26 php4/ext/standard/url_scanner_ex.re:1.27 --- php4/ext/standard/url_scanner_ex.re:1.26 Tue Dec 5 03:05:24 2000 +++ php4/ext/standard/url_scanner_ex.re Fri Dec 22 14:52:11 2000 @@ -91,7 +91,7 @@ { register const char *p, *q; const char *bash = NULL; - char sep = '?'; + const char *sep = "?"; q = url->c + url->len; @@ -101,7 +101,7 @@ smart_str_append(dest, url); return; case '?': - sep = *separator; + sep = separator; break; case '#': bash = p; @@ -120,7 +120,7 @@ else smart_str_append(dest, url); - smart_str_appendc(dest, sep); + smart_str_appends(dest, sep); smart_str_append(dest, name); smart_str_appendc(dest, '='); smart_str_append(dest, val);