diff options
| author | Sascha Schumann <sas@php.net> | 2000-05-04 10:38:17 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2000-05-04 10:38:17 +0000 |
| commit | d0f3764ee2e10003d9c8ea4a1c17ff0be1303a9b (patch) | |
| tree | 10e61089a99c0d3226533f4b15693a45d82a931a /main/php_variables.c | |
| parent | b6e4841ec7bcdc1b4fd3533fd4ffeefdac095d52 (diff) | |
| download | php-git-d0f3764ee2e10003d9c8ea4a1c17ff0be1303a9b.tar.gz | |
Change reentrancy API to always use the php prefix.
Check for the declaration of reentrant functions, so that we can use
them in non-ZTS mode on all platforms.
Diffstat (limited to 'main/php_variables.c')
| -rw-r--r-- | main/php_variables.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/main/php_variables.c b/main/php_variables.c index 8f612b3456..0bb257cad8 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -192,7 +192,7 @@ SAPI_POST_HANDLER_FUNC(php_std_post_handler) ELS_FETCH(); PLS_FETCH(); - var = strtok_r(SG(request_info).post_data, "&", &strtok_buf); + var = php_strtok_r(SG(request_info).post_data, "&", &strtok_buf); while (var) { val = strchr(var, '='); @@ -203,7 +203,7 @@ SAPI_POST_HANDLER_FUNC(php_std_post_handler) php_url_decode(val, strlen(val)); php_register_variable(var, val, array_ptr ELS_CC PLS_CC); } - var = strtok_r(NULL, "&", &strtok_buf); + var = php_strtok_r(NULL, "&", &strtok_buf); } } @@ -274,11 +274,11 @@ void php_treat_data(int arg, char *str ELS_DC PLS_DC SLS_DC) } if (arg == PARSE_COOKIE) { - var = strtok_r(res, ";", &strtok_buf); + var = php_strtok_r(res, ";", &strtok_buf); } else if (arg == PARSE_POST) { - var = strtok_r(res, "&", &strtok_buf); + var = php_strtok_r(res, "&", &strtok_buf); } else { - var = strtok_r(res, PG(arg_separator), &strtok_buf); + var = php_strtok_r(res, PG(arg_separator), &strtok_buf); } while (var) { @@ -291,9 +291,9 @@ void php_treat_data(int arg, char *str ELS_DC PLS_DC SLS_DC) php_register_variable(var, val, array_ptr ELS_CC PLS_CC); } if (arg == PARSE_COOKIE) { - var = strtok_r(NULL, ";", &strtok_buf); + var = php_strtok_r(NULL, ";", &strtok_buf); } else { - var = strtok_r(NULL, PG(arg_separator), &strtok_buf); + var = php_strtok_r(NULL, PG(arg_separator), &strtok_buf); } } if (free_buffer) { |