summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>2000-12-22 22:52:11 +0000
committerSascha Schumann <sas@php.net>2000-12-22 22:52:11 +0000
commit0b194cbca61e66dbfa8e429bfcbdcea78a736d13 (patch)
treeb1cca6d24da9ca5bcb3ad6357bf172c98dd6c54f
parentc3340584128a9c8b75e2c1aa5630911ad2dc9b9f (diff)
downloadphp-git-0b194cbca61e66dbfa8e429bfcbdcea78a736d13.tar.gz
Support multi-char arg separators.
PR: #8274
-rw-r--r--ext/standard/url_scanner_ex.c8
-rw-r--r--ext/standard/url_scanner_ex.re6
2 files changed, 7 insertions, 7 deletions
diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c
index 35b0e9e435..99e0c2f323 100644
--- a/ext/standard/url_scanner_ex.c
+++ b/ext/standard/url_scanner_ex.c
@@ -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 @@ static inline void append_modified_url(smart_str *url, smart_str *dest, smart_st
{
register const char *p, *q;
const char *bash = NULL;
- char sep = '?';
+ const char *sep = "?";
q = url->c + url->len;
@@ -103,7 +103,7 @@ static inline void append_modified_url(smart_str *url, smart_str *dest, smart_st
smart_str_append(dest, url);
return;
case '?':
- sep = *separator;
+ sep = separator;
break;
case '#':
bash = p;
@@ -122,7 +122,7 @@ static inline void append_modified_url(smart_str *url, smart_str *dest, smart_st
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);
diff --git a/ext/standard/url_scanner_ex.re b/ext/standard/url_scanner_ex.re
index f18406eb5d..3c6678538c 100644
--- a/ext/standard/url_scanner_ex.re
+++ b/ext/standard/url_scanner_ex.re
@@ -91,7 +91,7 @@ static inline void append_modified_url(smart_str *url, smart_str *dest, smart_st
{
register const char *p, *q;
const char *bash = NULL;
- char sep = '?';
+ const char *sep = "?";
q = url->c + url->len;
@@ -101,7 +101,7 @@ static inline void append_modified_url(smart_str *url, smart_str *dest, smart_st
smart_str_append(dest, url);
return;
case '?':
- sep = *separator;
+ sep = separator;
break;
case '#':
bash = p;
@@ -120,7 +120,7 @@ static inline void append_modified_url(smart_str *url, smart_str *dest, smart_st
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);