diff options
| author | Nikita Popov <nikic@php.net> | 2014-09-21 20:28:44 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-09-21 20:49:39 +0200 |
| commit | 2a7de9fdbba28152fadcdddc2b731d319405e106 (patch) | |
| tree | 54e6063066fe7a06e31b7a2010f65d80f3e9b949 /ext/standard/url_scanner_ex.c | |
| parent | e0df8cc8100f31534718e69cc41981e6c7490b20 (diff) | |
| download | php-git-2a7de9fdbba28152fadcdddc2b731d319405e106.tar.gz | |
Rename smart_str_append to smart_str_append_smart_str
It's used only rarely and I'm running out of append names...
Diffstat (limited to 'ext/standard/url_scanner_ex.c')
| -rw-r--r-- | ext/standard/url_scanner_ex.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c index 71658ec271..b42b212ac6 100644 --- a/ext/standard/url_scanner_ex.c +++ b/ext/standard/url_scanner_ex.c @@ -166,7 +166,7 @@ scan: if (yych >= ';') goto yy4; ++YYCURSOR; #line 125 "ext/standard/url_scanner_ex.re" - { smart_str_append(dest, url); return; } + { smart_str_append_smart_str(dest, url); return; } #line 171 "ext/standard/url_scanner_ex.c" yy4: ++YYCURSOR; @@ -195,17 +195,17 @@ done: /* Don't modify URLs of the format "#mark" */ if (bash && bash - url->s->val == 0) { - smart_str_append(dest, url); + smart_str_append_smart_str(dest, url); return; } if (bash) smart_str_appendl(dest, url->s->val, bash - url->s->val); else - smart_str_append(dest, url); + smart_str_append_smart_str(dest, url); smart_str_appends(dest, sep); - smart_str_append(dest, url_app); + smart_str_append_smart_str(dest, url_app); if (bash) smart_str_appendl(dest, bash, q - bash); @@ -230,7 +230,7 @@ static inline void tag_arg(url_adapt_state_ex_t *ctx, char quotes, char type TSR if (f) { append_modified_url(&ctx->val, &ctx->result, &ctx->url_app, PG(arg_separator).output); } else { - smart_str_append(&ctx->result, &ctx->val); + smart_str_append_smart_str(&ctx->result, &ctx->val); } if (quotes) smart_str_appendc(&ctx->result, type); @@ -304,7 +304,7 @@ static void handle_form(STD_PARA) } if (doit) - smart_str_append(&ctx->result, &ctx->form_app); + smart_str_append_smart_str(&ctx->result, &ctx->form_app); } } @@ -1048,12 +1048,12 @@ PHPAPI int php_url_scanner_add_var(char *name, int name_len, char *value, int va smart_str_appendl(&BG(url_adapt_state_ex).url_app, name, name_len); smart_str_appendc(&BG(url_adapt_state_ex).url_app, '='); - smart_str_append(&BG(url_adapt_state_ex).url_app, &val); + smart_str_append_smart_str(&BG(url_adapt_state_ex).url_app, &val); smart_str_appends(&BG(url_adapt_state_ex).form_app, "<input type=\"hidden\" name=\""); smart_str_appendl(&BG(url_adapt_state_ex).form_app, name, name_len); smart_str_appends(&BG(url_adapt_state_ex).form_app, "\" value=\""); - smart_str_append(&BG(url_adapt_state_ex).form_app, &val); + smart_str_append_smart_str(&BG(url_adapt_state_ex).form_app, &val); smart_str_appends(&BG(url_adapt_state_ex).form_app, "\" />"); if (urlencode) { |