archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- Get rid of ELS_*(), and use TSRMLS_*() instead.

Browse source 
- Move to the new ts_allocate_id() API
This patch is *bound* to break some files, as I must have had typos somewhere.
If you use any uncommon extension, please try to build it...
This commit is contained in:
Zeev Suraski 2001-07-27 10:16:41 +00:00
parent 2c254ba762
commit fe6f8712a4
70 changed files with 392 additions and 381 deletions
Download patch file Download diff file Expand all files Collapse all files

23
main/php_variables.c
View file

@ -29,12 +29,13 @@
#include "zend_globals.h"
PHPAPI void php_register_variable(char *var, char *strval, zval *track_vars_array ELS_DC PLS_DC) {
php_register_variable_safe(var, strval, strlen(strval), track_vars_array ELS_CC PLS_CC);
PHPAPI void php_register_variable(char *var, char *strval, zval *track_vars_array TSRMLS_DC PLS_DC)
{
php_register_variable_safe(var, strval, strlen(strval), track_vars_array TSRMLS_CC PLS_CC);
}
/* binary-safe version */
PHPAPI void php_register_variable_safe(char *var, char *strval, int str_len, zval *track_vars_array ELS_DC PLS_DC)
PHPAPI void php_register_variable_safe(char *var, char *strval, int str_len, zval *track_vars_array TSRMLS_DC PLS_DC)
{
zval new_entry;
@ -47,11 +48,11 @@ PHPAPI void php_register_variable_safe(char *var, char *strval, int str_len, zva
}
new_entry.type = IS_STRING;
php_register_variable_ex(var, &new_entry, track_vars_array ELS_CC PLS_CC);
php_register_variable_ex(var, &new_entry, track_vars_array TSRMLS_CC PLS_CC);
}
PHPAPI void php_register_variable_ex(char *var, zval *val, pval *track_vars_array ELS_DC PLS_DC)
PHPAPI void php_register_variable_ex(char *var, zval *val, pval *track_vars_array TSRMLS_DC PLS_DC)
{
char *p = NULL;
char *ip; /* index pointer */
@ -195,7 +196,7 @@ SAPI_POST_HANDLER_FUNC(php_std_post_handler)
char *var, *val;
char *strtok_buf = NULL;
zval *array_ptr = (zval *) arg;
ELS_FETCH();
TSRMLS_FETCH();
PLS_FETCH();
var = php_strtok_r(SG(request_info).post_data, "&", &strtok_buf);
@ -208,14 +209,14 @@ SAPI_POST_HANDLER_FUNC(php_std_post_handler)
*val++ = '\0';
php_url_decode(var, strlen(var));
val_len = php_url_decode(val, strlen(val));
php_register_variable_safe(var, val, val_len, array_ptr ELS_CC PLS_CC);
php_register_variable_safe(var, val, val_len, array_ptr TSRMLS_CC PLS_CC);
}
var = php_strtok_r(NULL, "&", &strtok_buf);
}
}
void php_treat_data(int arg, char *str, zval* destArray ELS_DC PLS_DC SLS_DC)
void php_treat_data(int arg, char *str, zval* destArray TSRMLS_DC PLS_DC SLS_DC)
{
char *res = NULL, *var, *val, *separator=NULL;
const char *c_var;
@ -297,7 +298,7 @@ void php_treat_data(int arg, char *str, zval* destArray ELS_DC PLS_DC SLS_DC)
*val++ = '\0';
php_url_decode(var, strlen(var));
val_len = php_url_decode(val, strlen(val));
php_register_variable_safe(var, val, val_len, array_ptr ELS_CC PLS_CC);
php_register_variable_safe(var, val, val_len, array_ptr TSRMLS_CC PLS_CC);
}
var = php_strtok_r(NULL, separator, &strtok_buf);
}
@ -312,7 +313,7 @@ void php_treat_data(int arg, char *str, zval* destArray ELS_DC PLS_DC SLS_DC)
}
void php_import_environment_variables(zval *array_ptr ELS_DC PLS_DC)
void php_import_environment_variables(zval *array_ptr TSRMLS_DC PLS_DC)
{
char **env, *p, *t;
@ -322,7 +323,7 @@ void php_import_environment_variables(zval *array_ptr ELS_DC PLS_DC)
continue;
}
t = estrndup(*env, p - *env);
php_register_variable(t, p+1, array_ptr ELS_CC PLS_CC);
php_register_variable(t, p+1, array_ptr TSRMLS_CC PLS_CC);
efree(t);
}
}