- Nuke php3 legacy

diff --git a/ext/ereg/ereg.c b/ext/ereg/ereg.c
index 0b87b184165ffb91b8da0d8d344f496bb9562a9c..d5c25ded1c21e1210ce488583617a7536a1a8a17 100644 (file)
--- a/ext/ereg/ereg.c
+++ b/ext/ereg/ereg.c
@@ -184,7 +184,7 @@ static void php_reg_eprint(int err, regex_t *re) {
  */
 static void php_ereg(INTERNAL_FUNCTION_PARAMETERS, int icase)
 {
-       pval **regex,                   /* Regular expression */
+       zval **regex,                   /* Regular expression */
                **findin,               /* String to apply expression to */
                **array = NULL;         /* Optional register array */
        regex_t re;
@@ -442,7 +442,7 @@ PHPAPI char *php_reg_replace(const char *pattern, const char *replace, const cha
  */
 static void php_ereg_replace(INTERNAL_FUNCTION_PARAMETERS, int icase)
 {
-       pval **arg_pattern,
+       zval **arg_pattern,
                **arg_replace,
                **arg_string;
        char *pattern;

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 02ea08c006ce9610da41d01dd631889b89f1056f..40b8d13574d428f50ff5805ee2d84ed1c6df31a9 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -361,15 +361,15 @@ static int array_data_compare(const void *a, const void *b TSRMLS_DC)
 {
        Bucket *f;
        Bucket *s;
-       pval result;
-       pval *first;
-       pval *second;
+       zval result;
+       zval *first;
+       zval *second;
  
        f = *((Bucket **) a);
        s = *((Bucket **) b);
  
-       first = *((pval **) f->pData);
-       second = *((pval **) s->pData);
+       first = *((zval **) f->pData);
+       second = *((zval **) s->pData);
 
        if (ARRAYG(compare_func)(&result, first, second TSRMLS_CC) == FAILURE) {
                return 0;
@@ -411,8 +411,8 @@ static int array_natural_general_compare(const void *a, const void *b, int fold_
        f = *((Bucket **) a);
        s = *((Bucket **) b);
  
-       fval = *((pval **) f->pData);
-       sval = *((pval **) s->pData);
+       fval = *((zval **) f->pData);
+       sval = *((zval **) s->pData);
        first = *fval;
        second = *sval;
        if (Z_TYPE_P(fval) != IS_STRING) {
@@ -717,9 +717,9 @@ static int array_user_key_compare(const void *a, const void *b TSRMLS_DC)
 {
        Bucket *f;
        Bucket *s;
-       pval key1, key2;
-       pval *args[2];
-       pval retval;
+       zval key1, key2;
+       zval *args[2];
+       zval retval;
        int status;
 
        args[0] = &key1;
@@ -808,7 +808,7 @@ PHP_FUNCTION(uksort)
    Advances array argument's internal pointer to the last element and return it */
 PHP_FUNCTION(end)
 {
-       pval **array, **entry;
+       zval **array, **entry;
        HashTable *target_hash;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
@@ -835,7 +835,7 @@ PHP_FUNCTION(end)
    Move array argument's internal pointer to the previous element and return it */
 PHP_FUNCTION(prev)
 {
-       pval **array, **entry;
+       zval **array, **entry;
        HashTable *target_hash;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
@@ -862,7 +862,7 @@ PHP_FUNCTION(prev)
    Move array argument's internal pointer to the next element and return it */
 PHP_FUNCTION(next)
 {
-       pval **array, **entry;
+       zval **array, **entry;
        HashTable *target_hash;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
@@ -889,7 +889,7 @@ PHP_FUNCTION(next)
    Set array argument's internal pointer to the first element and return it */ 
 PHP_FUNCTION(reset)
 {
-       pval **array, **entry;
+       zval **array, **entry;
        HashTable *target_hash;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
@@ -916,7 +916,7 @@ PHP_FUNCTION(reset)
    Return the element currently pointed to by the internal array pointer */
 PHP_FUNCTION(current)
 {
-       pval **array, **entry;
+       zval **array, **entry;
        HashTable *target_hash;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
@@ -938,7 +938,7 @@ PHP_FUNCTION(current)
    Return the key of the element currently pointed to by the internal array pointer */
 PHP_FUNCTION(key)
 {
-       pval **array;
+       zval **array;
        char *string_key;
        uint string_length;
        ulong num_key;
@@ -976,7 +976,7 @@ PHP_FUNCTION(key)
 PHP_FUNCTION(min)
 {
        int argc=ZEND_NUM_ARGS();
-       pval **result;
+       zval **result;
 
        if (argc<=0) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Atleast one value should be passed");
@@ -984,7 +984,7 @@ PHP_FUNCTION(min)
        }
        set_compare_func(SORT_REGULAR TSRMLS_CC);
        if (argc == 1) {
-               pval **arr;
+               zval **arr;
 
                if (zend_get_parameters_ex(1, &arr) == FAILURE || Z_TYPE_PP(arr) != IS_ARRAY) {
                        WRONG_PARAM_COUNT;
@@ -996,8 +996,8 @@ PHP_FUNCTION(min)
                        RETURN_FALSE;
                }
        } else {
-               pval ***args = (pval ***) safe_emalloc(sizeof(pval **), ZEND_NUM_ARGS(), 0);
-               pval **min, result;
+               zval ***args = (zval ***) safe_emalloc(sizeof(zval **), ZEND_NUM_ARGS(), 0);
+               zval **min, result;
                int i;
 
                if (zend_get_parameters_array_ex(ZEND_NUM_ARGS(), args)==FAILURE) {
@@ -1026,7 +1026,7 @@ PHP_FUNCTION(min)
 PHP_FUNCTION(max)
 {
        int argc=ZEND_NUM_ARGS();
-       pval **result;
+       zval **result;
 
        if (argc<=0) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Atleast one value should be passed");
@@ -1034,7 +1034,7 @@ PHP_FUNCTION(max)
        }
        set_compare_func(SORT_REGULAR TSRMLS_CC);
        if (argc == 1) {
-               pval **arr;
+               zval **arr;
 
                if (zend_get_parameters_ex(1, &arr) == FAILURE || Z_TYPE_PP(arr) != IS_ARRAY) {
                        WRONG_PARAM_COUNT;
@@ -1046,8 +1046,8 @@ PHP_FUNCTION(max)
                        RETURN_FALSE;
                }
        } else {
-               pval ***args = (pval ***) safe_emalloc(sizeof(pval **), ZEND_NUM_ARGS(), 0);
-               pval **max, result;
+               zval ***args = (zval ***) safe_emalloc(sizeof(zval **), ZEND_NUM_ARGS(), 0);
+               zval **max, result;
                int i;
 
                if (zend_get_parameters_array_ex(ZEND_NUM_ARGS(), args) == FAILURE) {

diff --git a/ext/standard/assert.c b/ext/standard/assert.c
index 1ba0db3ad31e19defa949b52be52b6bb6668e8c1..93374f18aaef810355b5ae9f6d2621dc1ba9d66f 100644 (file)
--- a/ext/standard/assert.c
+++ b/ext/standard/assert.c
@@ -234,7 +234,7 @@ PHP_FUNCTION(assert)
 
 PHP_FUNCTION(assert_options)
 {
-       pval **what, **value;
+       zval **what, **value;
        int oldint;
        int ac = ZEND_NUM_ARGS();
        

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 7407c2e5c16de175fb276bbc92ee5f5326cd3a88..914d339826751a6ca0ad1c7283b8b04c6a905e6e 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -165,7 +165,7 @@ static void user_tick_function_dtor(user_tick_function_entry *tick_function_entr
 
 #undef sprintf
 
-function_entry basic_functions[] = {
+zend_function_entry basic_functions[] = {
        PHP_FE(constant,                                                                                                                NULL)
        PHP_FE(bin2hex,                                                                                                                 NULL)
        PHP_FE(sleep,                                                                                                                   NULL)
@@ -1438,7 +1438,7 @@ PHP_FUNCTION(getenv)
    Set the value of an environment variable */
 PHP_FUNCTION(putenv)
 {
-       pval **str;
+       zval **str;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &str) == FAILURE) {
                WRONG_PARAM_COUNT;
@@ -1734,7 +1734,7 @@ PHP_FUNCTION(flush)
    Delay for a given number of seconds */
 PHP_FUNCTION(sleep)
 {
-       pval **num;
+       zval **num;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &num) == FAILURE) {
                WRONG_PARAM_COUNT;
@@ -1755,7 +1755,7 @@ PHP_FUNCTION(sleep)
 PHP_FUNCTION(usleep)
 {
 #if HAVE_USLEEP
-       pval **num;
+       zval **num;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &num) == FAILURE) {
                WRONG_PARAM_COUNT;
@@ -1854,7 +1854,7 @@ PHP_FUNCTION(get_current_user)
    Get the value of a PHP configuration option */
 PHP_FUNCTION(get_cfg_var)
 {
-       pval **varname;
+       zval **varname;
        char *value;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &varname) == FAILURE) {
@@ -1874,7 +1874,7 @@ PHP_FUNCTION(get_cfg_var)
    Set the current active configuration setting of magic_quotes_runtime and return previous */
 PHP_FUNCTION(set_magic_quotes_runtime)
 {
-       pval **new_setting;
+       zval **new_setting;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &new_setting) == FAILURE) {
                RETURN_FALSE;
@@ -1920,7 +1920,7 @@ error options:
    Send an error message somewhere */
 PHP_FUNCTION(error_log)
 {
-       pval **string, **erropt = NULL, **option = NULL, **emailhead = NULL;
+       zval **string, **erropt = NULL, **option = NULL, **emailhead = NULL;
        int opt_err = 0;
        char *message, *opt = NULL, *headers = NULL;
 
@@ -2541,7 +2541,7 @@ PHP_FUNCTION(highlight_string)
    Get a configuration option */
 PHP_FUNCTION(ini_get)
 {
-       pval **varname;
+       zval **varname;
        char *str;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &varname) == FAILURE) {
@@ -2639,7 +2639,7 @@ static int php_ini_check_path(char *option_name, int option_len, char *new_optio
    Set a configuration option, returns false on error and the old value of the configuration option on success */
 PHP_FUNCTION(ini_set)
 {
-       pval **varname, **new_value;
+       zval **varname, **new_value;
        char *old_value;
 
        if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &varname, &new_value) == FAILURE) {
@@ -2702,7 +2702,7 @@ PHP_FUNCTION(ini_set)
    Restore the value of a configuration option specified by varname */
 PHP_FUNCTION(ini_restore)
 {
-       pval **varname;
+       zval **varname;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &varname) == FAILURE) {
                WRONG_PARAM_COUNT;
@@ -2719,7 +2719,7 @@ PHP_FUNCTION(ini_restore)
 
 PHP_FUNCTION(set_include_path)
 {
-       pval **new_value;
+       zval **new_value;
        char *old_value;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &new_value) == FAILURE) {
@@ -2824,7 +2824,7 @@ PHP_FUNCTION(connection_status)
    Set whether we want to ignore a user abort event or not */
 PHP_FUNCTION(ignore_user_abort)
 {
-       pval **arg;
+       zval **arg;
        int old_setting;
 
        old_setting = PG(ignore_user_abort);
@@ -2854,7 +2854,7 @@ PHP_FUNCTION(ignore_user_abort)
    Returns port associated with service. Protocol must be "tcp" or "udp" */
 PHP_FUNCTION(getservbyname)
 {
-       pval **name, **proto;
+       zval **name, **proto;
        struct servent *serv;
 
        if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &name, &proto) == FAILURE) {
@@ -2879,7 +2879,7 @@ PHP_FUNCTION(getservbyname)
    Returns service name associated with port. Protocol must be "tcp" or "udp" */
 PHP_FUNCTION(getservbyport)
 {
-       pval **port, **proto;
+       zval **port, **proto;
        struct servent *serv;
 
        if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &port, &proto) == FAILURE) {
@@ -2904,7 +2904,7 @@ PHP_FUNCTION(getservbyport)
    Returns protocol number associated with name as per /etc/protocols */
 PHP_FUNCTION(getprotobyname)
 {
-       pval **name;
+       zval **name;
        struct protoent *ent;
 
        if (ZEND_NUM_ARGS() != 1
@@ -2932,7 +2932,7 @@ PHP_FUNCTION(getprotobyname)
    Returns protocol name associated with protocol number proto */
 PHP_FUNCTION(getprotobynumber)
 {
-       pval **proto;
+       zval **proto;
        struct protoent *ent;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &proto) == FAILURE) {

diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
index 229f4165b37b5a6d380f4b0d3ce7fbb3db072337..68c3e65116a560cc630761df7ace0c9f33d7564c 100644 (file)
--- a/ext/standard/browscap.c
+++ b/ext/standard/browscap.c
@@ -33,17 +33,17 @@ static zval *current_section;
 
 /* OBJECTS_FIXME: This whole extension needs going through. The use of objects looks pretty broken here */
 
-static void browscap_entry_dtor(zval **pvalue)
+static void browscap_entry_dtor(zval **zvalue)
 {
-       if (Z_TYPE_PP(pvalue) == IS_ARRAY) {
-               zend_hash_destroy(Z_ARRVAL_PP(pvalue));
-               free(Z_ARRVAL_PP(pvalue));
-       } else if (Z_TYPE_PP(pvalue) == IS_STRING) {
-               if (Z_STRVAL_PP(pvalue)) {
-                       free(Z_STRVAL_PP(pvalue));
+       if (Z_TYPE_PP(zvalue) == IS_ARRAY) {
+               zend_hash_destroy(Z_ARRVAL_PP(zvalue));
+               free(Z_ARRVAL_PP(zvalue));
+       } else if (Z_TYPE_PP(zvalue) == IS_STRING) {
+               if (Z_STRVAL_PP(zvalue)) {
+                       free(Z_STRVAL_PP(zvalue));
                }
        }
-       free(*pvalue);
+       free(*zvalue);
 }
 
 /* {{{ convert_browscap_pattern

diff --git a/ext/standard/cyr_convert.c b/ext/standard/cyr_convert.c
index c65563737fa86023cd8da016acc47d95950f57ca..8d284ae4a698a0c6c262554fd068b5318d34183e 100644 (file)
--- a/ext/standard/cyr_convert.c
+++ b/ext/standard/cyr_convert.c
@@ -271,7 +271,7 @@ static char * php_convert_cyr_string(unsigned char *str, int length, char from,
    Convert from one Cyrillic character set to another */
 PHP_FUNCTION(convert_cyr_string)
 {
-    pval **str_arg, **fr_cs, **to_cs;
+    zval **str_arg, **fr_cs, **to_cs;
        unsigned char *str;
 
     if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3,&str_arg,&fr_cs, &to_cs)==FAILURE)

diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index f250f82e2e69e8ef676685c26d38a98768d685cc..cdd86775c961d139663e92c4e444c07e7d50fa00 100644 (file)
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -231,7 +231,7 @@ PHP_FUNCTION(getdir)
    Close directory connection identified by the dir_handle */
 PHP_FUNCTION(closedir)
 {
-       pval **id, **tmp, *myself;
+       zval **id, **tmp, *myself;
        php_stream *dirp;
 
        FETCH_DIRP();
@@ -329,7 +329,7 @@ PHP_FUNCTION(getcwd)
    Rewind dir_handle back to the start */
 PHP_FUNCTION(rewinddir)
 {
-       pval **id, **tmp, *myself;
+       zval **id, **tmp, *myself;
        php_stream *dirp;
        
        FETCH_DIRP();
@@ -342,7 +342,7 @@ PHP_FUNCTION(rewinddir)
    Read directory entry from dir_handle */
 PHP_NAMED_FUNCTION(php_if_readdir)
 {
-       pval **id, **tmp, *myself;
+       zval **id, **tmp, *myself;
        php_stream *dirp;
        php_stream_dirent entry;
 

diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index a7bea6c766cb76feb6350fe5e8375824c8059c6e..448bc799138b8cd3c500a3f4a19a22f44eeed8fc 100644 (file)
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -57,7 +57,7 @@
  * If type==3, output will be printed binary, no lines will be saved or returned (passthru)
  *
  */
-int php_exec(int type, char *cmd, pval *array, pval *return_value TSRMLS_DC)
+int php_exec(int type, char *cmd, zval *array, zval *return_value TSRMLS_DC)
 {
        FILE *fp;
        char *buf, *tmp=NULL;
@@ -372,7 +372,7 @@ char *php_escape_shell_arg(char *str) {
    Escape shell metacharacters */
 PHP_FUNCTION(escapeshellcmd)
 {
-       pval **arg1;
+       zval **arg1;
        char *cmd = NULL;
 
        if (zend_get_parameters_ex(1, &arg1) == FAILURE) {
@@ -392,7 +392,7 @@ PHP_FUNCTION(escapeshellcmd)
    Quote and escape an argument for use in a shell command */
 PHP_FUNCTION(escapeshellarg)
 {
-       pval **arg1;
+       zval **arg1;
        char *cmd = NULL;
 
        if (zend_get_parameters_ex(1, &arg1) == FAILURE) {
@@ -414,7 +414,7 @@ PHP_FUNCTION(shell_exec)
 {
        FILE *in;
        size_t total_readbytes;
-       pval **cmd;
+       zval **cmd;
        char *ret;
        php_stream *stream;
 

diff --git a/ext/standard/exec.h b/ext/standard/exec.h
index d8c4b198c5acadec190cecc63106be8083864f13..9e1f05b9b3ad2adefece206e6f1c7ea7a24f1af5 100644 (file)
--- a/ext/standard/exec.h
+++ b/ext/standard/exec.h
@@ -36,6 +36,6 @@ PHP_MINIT_FUNCTION(proc_open);
 
 PHPAPI char *php_escape_shell_cmd(char *);
 PHPAPI char *php_escape_shell_arg(char *);
-int php_exec(int type, char *cmd, pval *array, pval *return_value TSRMLS_DC);
+int php_exec(int type, char *cmd, zval *array, zval *return_value TSRMLS_DC);
 
 #endif /* EXEC_H */

diff --git a/ext/standard/file.c b/ext/standard/file.c
index 7c08fe619d81ad67aeccf8f5f8113b9424422e06..ab5b862fddc5bde57701d46a7fb9607b1db0132e 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -823,7 +823,7 @@ parse_eol:
    Create a unique filename in a directory */
 PHP_FUNCTION(tempnam)
 {
-       pval **arg1, **arg2;
+       zval **arg1, **arg2;
        char *d;
        char *opened_path;
        char p[64];
@@ -1501,7 +1501,7 @@ PHP_FUNCTION(readfile)
    Return or change the umask */
 PHP_FUNCTION(umask)
 {
-       pval **arg1;
+       zval **arg1;
        int oldumask;
        int arg_count = ZEND_NUM_ARGS();
 

diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index b880b7643ab8de5221f5591b242dafcc25cff5a3..fd1adc26b7a4d7202c8438b5238314ba062ae126 100644 (file)
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -118,7 +118,7 @@ PHP_RSHUTDOWN_FUNCTION(filestat)
    Get total disk space for filesystem that path is on */
 PHP_FUNCTION(disk_total_space)
 {
-       pval **path;
+       zval **path;
 #ifdef WINDOWS
        double bytestotal;
 
@@ -221,7 +221,7 @@ PHP_FUNCTION(disk_total_space)
    Get free disk space for filesystem that path is on */
 PHP_FUNCTION(disk_free_space)
 {
-       pval **path;
+       zval **path;
 #ifdef WINDOWS
        double bytesfree;
 
@@ -329,7 +329,7 @@ PHP_FUNCTION(disk_free_space)
 PHP_FUNCTION(chgrp)
 {
 #if !defined(WINDOWS)
-       pval **filename, **group;
+       zval **filename, **group;
        gid_t gid;
        struct group *gr=NULL;
        int ret;
@@ -379,7 +379,7 @@ PHP_FUNCTION(chgrp)
 PHP_FUNCTION(chown)
 {
 #if !defined(WINDOWS)
-       pval **filename, **user;
+       zval **filename, **user;
        int ret;
        uid_t uid;
        struct passwd *pw = NULL;
@@ -425,7 +425,7 @@ PHP_FUNCTION(chown)
    Change file mode */
 PHP_FUNCTION(chmod)
 {
-       pval **filename, **mode;
+       zval **filename, **mode;
        int ret;
        mode_t imode;
 
@@ -466,7 +466,7 @@ PHP_FUNCTION(chmod)
    Set modification time of file */
 PHP_FUNCTION(touch)
 {
-       pval **filename, **filetime, **fileatime;
+       zval **filename, **filetime, **fileatime;
        int ret;
        struct stat sb;
        FILE *file;
@@ -547,7 +547,7 @@ PHP_FUNCTION(clearstatcache)
 
 /* {{{ php_stat
  */
-PHPAPI void php_stat(const char *filename, php_stat_len filename_length, int type, pval *return_value TSRMLS_DC)
+PHPAPI void php_stat(const char *filename, php_stat_len filename_length, int type, zval *return_value TSRMLS_DC)
 {
        zval *stat_dev, *stat_ino, *stat_mode, *stat_nlink, *stat_uid, *stat_gid, *stat_rdev,
                *stat_size, *stat_atime, *stat_mtime, *stat_ctime, *stat_blksize, *stat_blocks;
@@ -793,7 +793,7 @@ PHPAPI void php_stat(const char *filename, php_stat_len filename_length, int typ
 /* another quickie macro to make defining similar functions easier */
 #define FileFunction(name, funcnum) \
 void name(INTERNAL_FUNCTION_PARAMETERS) { \
-       pval **filename; \
+       zval **filename; \
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) { \
                WRONG_PARAM_COUNT; \
        } \

diff --git a/ext/standard/image.c b/ext/standard/image.c
index 52f03b5698d0490fdef95b9be920c9c686ba2586..bc8b9c68941658d5e09104a5988caf258d12c330 100644 (file)
--- a/ext/standard/image.c
+++ b/ext/standard/image.c
@@ -468,7 +468,7 @@ static int php_read_APP(php_stream * stream, unsigned int marker, zval *info TSR
 
 /* {{{ php_handle_jpeg
    main loop to parse JPEG structure */
-static struct gfxinfo *php_handle_jpeg (php_stream * stream, pval *info TSRMLS_DC) 
+static struct gfxinfo *php_handle_jpeg (php_stream * stream, zval *info TSRMLS_DC) 
 {
        struct gfxinfo *result = NULL;
        unsigned int marker = M_PSEUDO;
@@ -796,7 +796,7 @@ static unsigned php_ifd_get32u(void *Long, int motorola_intel)
 
 /* {{{ php_handle_tiff
    main loop to parse TIFF structure */
-static struct gfxinfo *php_handle_tiff (php_stream * stream, pval *info, int motorola_intel TSRMLS_DC)
+static struct gfxinfo *php_handle_tiff (php_stream * stream, zval *info, int motorola_intel TSRMLS_DC)
 {
        struct gfxinfo *result = NULL;
        int i, num_entries;

diff --git a/ext/standard/info.c b/ext/standard/info.c
index 0b1ff27c9b2a3457aff417674391aecd1aa6835c..0c716f75d044f41f7278f9f32bd2bdb6d6356cb9 100644 (file)
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -708,7 +708,7 @@ PHPAPI void php_print_info(int flag TSRMLS_DC)
        }
 
        if (flag & PHP_INFO_VARIABLES) {
-               pval **data;
+               zval **data;
 
                SECTION("PHP Variables");
 

diff --git a/ext/standard/iptc.c b/ext/standard/iptc.c
index af77640f6baa2ec884beeec56f4571395456cea8..2503128565598a1843fa801c7bddac1d5b14a984 100644 (file)
--- a/ext/standard/iptc.c
+++ b/ext/standard/iptc.c
@@ -360,7 +360,7 @@ PHP_FUNCTION(iptcparse)
                        INIT_PZVAL(values);
                        array_init(values);
                        
-                       zend_hash_update(Z_ARRVAL_P(return_value), key, strlen(key)+1, (void *) &values, sizeof(pval*), (void **) &element);
+                       zend_hash_update(Z_ARRVAL_P(return_value), key, strlen(key)+1, (void *) &values, sizeof(zval*), (void **) &element);
                } 
                        
                add_next_index_stringl(*element, buffer+inx, len, 1);

diff --git a/ext/standard/php_filestat.h b/ext/standard/php_filestat.h
index a7dddfcb2ece9b8c540999c981e64e985b9b41cf..fdf2803504081fe69e71a1c9db4d8fd40c895039 100644 (file)
--- a/ext/standard/php_filestat.h
+++ b/ext/standard/php_filestat.h
@@ -81,7 +81,7 @@ typedef unsigned int php_stat_len;
 typedef int php_stat_len;
 #endif
 
-PHPAPI void php_stat(const char *filename, php_stat_len filename_length, int type, pval *return_value TSRMLS_DC);
+PHPAPI void php_stat(const char *filename, php_stat_len filename_length, int type, zval *return_value TSRMLS_DC);
 
 /* Switches for various filestat functions: */
 #define FS_PERMS    0

diff --git a/ext/standard/php_string.h b/ext/standard/php_string.h
index 3bcc27d246e2b879057ba7c9889735ec6d678c84..9ebc39c4633aedb16091ec67f8048fc1746b03d9 100644 (file)
--- a/ext/standard/php_string.h
+++ b/ext/standard/php_string.h
@@ -142,8 +142,8 @@ PHPAPI char *php_str_to_str(char *haystack, int length, char *needle,
 PHPAPI char *php_trim(char *c, int len, char *what, int what_len, zend_uchar str_type, zval *return_value, int mode TSRMLS_DC);
 PHPAPI int32_t php_u_strip_tags(UChar *rbuf, int32_t len, int *stateptr, UChar *allow, int32_t allow_len TSRMLS_DC);
 PHPAPI size_t php_strip_tags(char *rbuf, int len, int *state, char *allow, int allow_len);
-PHPAPI int php_char_to_str_ex(char *str, uint len, char from, char *to, int to_len, pval *result, int case_sensitivity, int *replace_count);
-PHPAPI int php_char_to_str(char *str, uint len, char from, char *to, int to_len, pval *result);
+PHPAPI int php_char_to_str_ex(char *str, uint len, char from, char *to, int to_len, zval *result, int case_sensitivity, int *replace_count);
+PHPAPI int php_char_to_str(char *str, uint len, char from, char *to, int to_len, zval *result);
 PHPAPI void php_implode(zval *delim, zval *arr, zval *return_value);
 PHPAPI void php_explode(char *delim, uint delim_len, char *str, uint str_len, zend_uchar str_type, zval *return_value, int limit);
 

diff --git a/ext/standard/quot_print.c b/ext/standard/quot_print.c
index 77a1b53fc9cd758864a1734b015ce3095efc9d76..2de636043496306d41a1aa7c1643a6f09d91c12e 100644 (file)
--- a/ext/standard/quot_print.c
+++ b/ext/standard/quot_print.c
@@ -151,7 +151,7 @@ PHPAPI unsigned char *php_quot_print_decode(const unsigned char *str, size_t len
    Convert a quoted-printable string to an 8 bit string */
 PHP_FUNCTION(quoted_printable_decode)
 {
-       pval **arg1;
+       zval **arg1;
        char *str_in, *str_out;
        int i = 0, j = 0, k;
 

diff --git a/ext/standard/reg.c b/ext/standard/reg.c
index 0b87b184165ffb91b8da0d8d344f496bb9562a9c..d5c25ded1c21e1210ce488583617a7536a1a8a17 100644 (file)
--- a/ext/standard/reg.c
+++ b/ext/standard/reg.c
@@ -184,7 +184,7 @@ static void php_reg_eprint(int err, regex_t *re) {
  */
 static void php_ereg(INTERNAL_FUNCTION_PARAMETERS, int icase)
 {
-       pval **regex,                   /* Regular expression */
+       zval **regex,                   /* Regular expression */
                **findin,               /* String to apply expression to */
                **array = NULL;         /* Optional register array */
        regex_t re;
@@ -442,7 +442,7 @@ PHPAPI char *php_reg_replace(const char *pattern, const char *replace, const cha
  */
 static void php_ereg_replace(INTERNAL_FUNCTION_PARAMETERS, int icase)
 {
-       pval **arg_pattern,
+       zval **arg_pattern,
                **arg_replace,
                **arg_string;
        char *pattern;

diff --git a/ext/standard/scanf.c b/ext/standard/scanf.c
index b05af5331c35ee04097b56dbae800bc7012929f1..0a4dc5c3f36cc82d8884242ff65f142d17f7477a 100644 (file)
--- a/ext/standard/scanf.c
+++ b/ext/standard/scanf.c
@@ -126,7 +126,7 @@ typedef struct CharSet {
 static char *BuildCharSet(CharSet *cset, char *format);
 static int     CharInSet(CharSet *cset, int ch);
 static void    ReleaseCharSet(CharSet *cset);
-static inline void scan_set_error_return(int numVars, pval **return_value);
+static inline void scan_set_error_return(int numVars, zval **return_value);
 
 
 /* {{{ BuildCharSet
@@ -594,7 +594,7 @@ error:
 
 PHPAPI int php_sscanf_internal(        char *string, char *format,
                                int argCount, zval ***args,
-                               int varStart, pval **return_value TSRMLS_DC)
+                               int varStart, zval **return_value TSRMLS_DC)
 {
        int  numVars, nconversions, totalVars = -1;
        int  i, value, result;
@@ -1238,13 +1238,13 @@ done:
 /* }}} */
 
 /* the compiler choked when i tried to make this a macro    */
-static inline void scan_set_error_return(int numVars, pval **return_value)
+static inline void scan_set_error_return(int numVars, zval **return_value)
 {
        if (numVars) {
                Z_TYPE_PP(return_value) = IS_LONG;
                Z_LVAL_PP(return_value) = SCAN_ERROR_EOF;  /* EOF marker */
        } else {        
-         /* pval_destructor( *return_value ); */ 
+         /* zval_dtor( *return_value ); */ 
          /* convert_to_null calls destructor */
                convert_to_null( *return_value );
        }       

diff --git a/ext/standard/scanf.h b/ext/standard/scanf.h
index c848b6e3727ad77463faa8662be8ef87791aa6c4..de4bdd740a1339bce078d672d305d5d486e89d56 100644 (file)
--- a/ext/standard/scanf.h
+++ b/ext/standard/scanf.h
@@ -42,8 +42,6 @@
  * e.g. fscanf
  */
 PHPAPI int ValidateFormat(char *format, int numVars, int *totalVars);
-PHPAPI int php_sscanf_internal(char *string,char *format,int argCount,zval ***args,
-                               int varStart, pval **return_value TSRMLS_DC);
-
+PHPAPI int php_sscanf_internal(char *string, char *format, int argCount, zval ***args, int varStart, zval **return_value TSRMLS_DC);
 
 #endif /* SCANF_H */

diff --git a/ext/standard/string.c b/ext/standard/string.c
index cfc84902666c770d54c1676f922898a9a90a1a7c..66e197fd20790f635e2e2e1a854d67b72b6c82b2 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -5159,7 +5159,7 @@ PHP_FUNCTION(strip_tags)
    Set locale information */
 PHP_FUNCTION(setlocale)
 {
-       pval ***args = (pval ***) safe_emalloc(sizeof(pval **), ZEND_NUM_ARGS(), 0);
+       zval ***args = (zval ***) safe_emalloc(sizeof(zval **), ZEND_NUM_ARGS(), 0);
        zval **pcategory, **plocale;
        int i, cat, n_args=ZEND_NUM_ARGS();
        char *loc, *retval;

diff --git a/ext/standard/type.c b/ext/standard/type.c
index a98d9cf1d694e249c91f635b59b885c26d60a47a..e285a3db72fa55a7ecdb50ed9fe6525685c19ab9 100644 (file)
--- a/ext/standard/type.c
+++ b/ext/standard/type.c
@@ -25,7 +25,7 @@
    Returns the type of the variable */
 PHP_FUNCTION(gettype)
 {
-       pval **arg;
+       zval **arg;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
                WRONG_PARAM_COUNT;
@@ -99,7 +99,7 @@ PHP_FUNCTION(gettype)
    Set the type of the variable */
 PHP_FUNCTION(settype)
 {
-       pval **var, **type;
+       zval **var, **type;
        char *new_type;
 
        if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &var, &type) == FAILURE) {
@@ -144,7 +144,7 @@ PHP_FUNCTION(settype)
    Get the integer value of a variable using the optional base for the conversion */
 PHP_FUNCTION(intval)
 {
-       pval **num, **arg_base;
+       zval **num, **arg_base;
        int base;
 
        switch (ZEND_NUM_ARGS()) {
@@ -176,7 +176,7 @@ PHP_FUNCTION(intval)
    Get the float value of a variable */
 PHP_FUNCTION(floatval)
 {
-       pval **num;
+       zval **num;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &num) == FAILURE) {
                WRONG_PARAM_COUNT;
@@ -211,7 +211,7 @@ PHP_FUNCTION(strval)
 
 static void php_is_type(INTERNAL_FUNCTION_PARAMETERS, int type)
 {
-       pval **arg;
+       zval **arg;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Only one argument expected");
@@ -312,7 +312,7 @@ PHP_FUNCTION(is_binary)
    Returns true if variable is a native, unicode or binary string */
 PHP_FUNCTION(is_buffer)
 {
-       pval **arg;
+       zval **arg;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Only one argument expected");