nuke php3 legacy

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 66ad3c0a357550313ec4632673fc725dc289c117..2109a1d2da7ca982e22b5b15b6ea5b50633c19d8 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -2569,7 +2569,7 @@ PHP_FUNCTION(imageinterlace)
 static void php_imagepolygon(INTERNAL_FUNCTION_PARAMETERS, int filled)
 {
        zval **IM, **POINTS, **NPOINTS, **COL;
-       pval **var = NULL;
+       zval **var = NULL;
        gdImagePtr im;
        gdPointPtr points;
        int npoints, col, nelem, i;
@@ -4159,7 +4159,7 @@ PHP_FUNCTION(imagefilter)
 PHP_FUNCTION(imageconvolution)
 {
        zval *SIM, *hash_matrix;
-       pval **var = NULL, **var2 = NULL;
+       zval **var = NULL, **var2 = NULL;
        gdImagePtr im_src = NULL;
        double div, offset;
        int nelem, i, j, res;

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 8b5dcc03acb4a10c8c9a3c5342e91ec89012d87d..ccf5627284a5561ffb6da3323d43ff1b1dcfe720 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -181,7 +181,7 @@ static const struct mb_overload_def mb_ovld[] = {
 /* }}} */
 
 /* {{{ function_entry mbstring_functions[] */
-function_entry mbstring_functions[] = {
+zval_function_entry mbstring_functions[] = {
        PHP_FE(mb_convert_case,                 NULL)
        PHP_FE(mb_strtoupper,                   NULL)
        PHP_FE(mb_strtolower,                   NULL)
@@ -1776,7 +1776,7 @@ PHP_FUNCTION(mb_substr)
    Returns part of a string */
 PHP_FUNCTION(mb_strcut)
 {
-       pval **arg1, **arg2, **arg3, **arg4;
+       zval **arg1, **arg2, **arg3, **arg4;
        int argc, from, len;
        mbfl_string string, result, *ret;
 
@@ -1892,7 +1892,7 @@ PHP_FUNCTION(mb_strwidth)
    Trim the string in terminal width */
 PHP_FUNCTION(mb_strimwidth)
 {
-       pval **arg1, **arg2, **arg3, **arg4, **arg5;
+       zval **arg1, **arg2, **arg3, **arg4, **arg5;
        int from, width;
        mbfl_string string, result, marker, *ret;
 
@@ -2054,7 +2054,7 @@ MBSTRING_API char * php_mb_convert_encoding(char *input, size_t length, char *_t
    Returns converted string in desired encoding */
 PHP_FUNCTION(mb_convert_encoding)
 {
-       pval **arg_str, **arg_new, **arg_old;
+       zval **arg_str, **arg_new, **arg_old;
        int i;
        size_t size, l, n;
        char *_from_encodings, *ret, *s_free = NULL;
@@ -2198,7 +2198,7 @@ PHP_FUNCTION(mb_strtolower)
    Encodings of the given string is returned (as a string) */
 PHP_FUNCTION(mb_detect_encoding)
 {
-       pval **arg_str, **arg_list, **arg_strict;
+       zval **arg_str, **arg_list, **arg_strict;
        mbfl_string string;
        const char *ret;
        enum mbfl_no_encoding *elist;
@@ -2484,7 +2484,7 @@ PHP_FUNCTION(mb_convert_kana)
    Converts the string resource in variables to desired encoding */
 PHP_FUNCTION(mb_convert_variables)
 {
-       pval ***args, ***stack, **var, **hash_entry;
+       zval ***args, ***stack, **var, **hash_entry;
        HashTable *target_hash;
        mbfl_string string, result, *ret;
        enum mbfl_no_encoding from_encoding, to_encoding;
@@ -2499,7 +2499,7 @@ PHP_FUNCTION(mb_convert_variables)
        if (argc < 3) {
                WRONG_PARAM_COUNT;
        }
-       args = (pval ***)ecalloc(argc, sizeof(pval **));
+       args = (zval ***)ecalloc(argc, sizeof(zval **));
        if (zend_get_parameters_array_ex(argc, args) == FAILURE) {
                efree((void *)args);
                WRONG_PARAM_COUNT;
@@ -2541,7 +2541,7 @@ PHP_FUNCTION(mb_convert_variables)
                /* auto detect */
                from_encoding = mbfl_no_encoding_invalid;
                stack_max = PHP_MBSTR_STACK_BLOCK_SIZE;
-               stack = (pval ***)safe_emalloc(stack_max, sizeof(pval **), 0);
+               stack = (zval ***)safe_emalloc(stack_max, sizeof(zval **), 0);
                stack_level = 0;
                identd = mbfl_encoding_detector_new(elist, elistsz);
                if (identd != NULL) {
@@ -2567,8 +2567,8 @@ PHP_FUNCTION(mb_convert_variables)
                                                        if (Z_TYPE_PP(hash_entry) == IS_ARRAY || Z_TYPE_PP(hash_entry) == IS_OBJECT) {
                                                                if (stack_level >= stack_max) {
                                                                        stack_max += PHP_MBSTR_STACK_BLOCK_SIZE;
-                                                                       ptmp = erealloc(stack, sizeof(pval **)*stack_max);
-                                                                       stack = (pval ***)ptmp;
+                                                                       ptmp = erealloc(stack, sizeof(zval **)*stack_max);
+                                                                       stack = (zval ***)ptmp;
                                                                }
                                                                stack[stack_level] = var;
                                                                stack_level++;
@@ -2624,7 +2624,7 @@ detect_end:
        /* convert */
        if (convd != NULL) {
                stack_max = PHP_MBSTR_STACK_BLOCK_SIZE;
-               stack = (pval ***)safe_emalloc(stack_max, sizeof(pval **), 0);
+               stack = (zval ***)safe_emalloc(stack_max, sizeof(zval **), 0);
                stack_level = 0;
                n = 2;
                while (n < argc || stack_level > 0) {
@@ -2648,8 +2648,8 @@ detect_end:
                                                if (Z_TYPE_PP(hash_entry) == IS_ARRAY || Z_TYPE_PP(hash_entry) == IS_OBJECT) {
                                                        if (stack_level >= stack_max) {
                                                                stack_max += PHP_MBSTR_STACK_BLOCK_SIZE;
-                                                               ptmp = erealloc(stack, sizeof(pval **)*stack_max);
-                                                               stack = (pval ***)ptmp;
+                                                               ptmp = erealloc(stack, sizeof(zval **)*stack_max);
+                                                               stack = (zval ***)ptmp;
                                                        }
                                                        stack[stack_level] = var;
                                                        stack_level++;
@@ -2707,7 +2707,7 @@ detect_end:
 static void
 php_mb_numericentity_exec(INTERNAL_FUNCTION_PARAMETERS, int type)
 {
-       pval **arg1, **arg2, **arg3, **hash_entry;
+       zval **arg1, **arg2, **arg3, **hash_entry;
        HashTable *target_hash;
        int argc, i, *convmap, *mapelm, mapsize=0;
        mbfl_string string, result, *ret;

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 6443d7a7a86a04b8ec4317906e556a479edb0fe1..e9a7f064ec01d5f76d4d4d0f186f6b7200cd3273 100644 (file)
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -47,7 +47,7 @@ static void php_mssql_get_column_content_without_type(mssql_link *mssql_ptr,int
 
 static void _mssql_bind_hash_dtor(void *data);
 
-function_entry mssql_functions[] = {
+zend_function_entry mssql_functions[] = {
        PHP_FE(mssql_connect,                           NULL)
        PHP_FE(mssql_pconnect,                          NULL)
        PHP_FE(mssql_close,                                     NULL)

diff --git a/ext/mssql/php_mssql.h b/ext/mssql/php_mssql.h
index b2ead409b88d57a4c9fc533fc1009bc8ab3872ff..17e5d4d10e5ead89944cbbc1754f6d93782b1917 100644 (file)
--- a/ext/mssql/php_mssql.h
+++ b/ext/mssql/php_mssql.h
@@ -162,7 +162,7 @@ ZEND_BEGIN_MODULE_GLOBALS(mssql)
        long cfg_min_error_severity, cfg_min_message_severity;
        long connect_timeout, timeout;
        zend_bool compatability_mode;
-       void (*get_column_content)(mssql_link *mssql_ptr,int offset,pval *result,int column_type  TSRMLS_DC);
+       void (*get_column_content)(mssql_link *mssql_ptr,int offset,zval *result,int column_type  TSRMLS_DC);
        long textsize, textlimit, batchsize;
        zend_bool datetimeconvert;
        HashTable *resource_list, *resource_plist;
@@ -180,7 +180,7 @@ typedef struct mssql_field {
 } mssql_field;
 
 typedef struct mssql_result {
-       pval **data;
+       zval **data;
        mssql_field *fields;
        mssql_link *mssql_ptr;
        mssql_statement * statement;

diff --git a/ext/sybase/php_sybase_db.c b/ext/sybase/php_sybase_db.c
index 69cfb67f6e24e4fab18385e1f37dbf286e58a2f3..6cd6db1b03574d8684947baa4c6b67e60b3a97a9 100644 (file)
--- a/ext/sybase/php_sybase_db.c
+++ b/ext/sybase/php_sybase_db.c
@@ -72,7 +72,7 @@ typedef struct {
 } sybase_field;
 
 typedef struct {
-        pval ***data;
+        zval ***data;
         sybase_field *fields;
         sybase_link *sybase_ptr;
         int cur_row,cur_field;
@@ -140,7 +140,7 @@ THREAD_LS sybase_module php_sybase_module;
 #define CHECK_LINK(link) { if (link==-1) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase:  A link to the server could not be established"); RETURN_FALSE; } }
 
 
-static void php_sybase_get_column_content(sybase_link *sybase_ptr,int offset,pval **result_ptr, int column_type);
+static void php_sybase_get_column_content(sybase_link *sybase_ptr,int offset,zval **result_ptr, int column_type);
 
 /* error handler */
 static int php_sybase_error_handler(DBPROCESS *dbproc,int severity,int dberr,
@@ -671,7 +671,7 @@ PHP_FUNCTION(sybase_select_db)
 /* }}} */
        
 
-static void php_sybase_get_column_content(sybase_link *sybase_ptr,int offset,pval **result_ptr, int column_type)
+static void php_sybase_get_column_content(sybase_link *sybase_ptr,int offset,zval **result_ptr, int column_type)
 {
        zval *result;
 
@@ -840,7 +840,7 @@ PHP_FUNCTION(sybase_query)
        }
        
        result = (sybase_result *) emalloc(sizeof(sybase_result));
-       result->data = (pval ***) safe_emalloc(sizeof(pval **), SYBASE_ROWS_BLOCK, 0);
+       result->data = (zval ***) safe_emalloc(sizeof(zval **), SYBASE_ROWS_BLOCK, 0);
        result->sybase_ptr = sybase_ptr;
        result->cur_field=result->cur_row=result->num_rows=0;
        result->num_fields = num_fields;
@@ -849,9 +849,9 @@ PHP_FUNCTION(sybase_query)
        while (retvalue!=FAIL && retvalue!=NO_MORE_ROWS) {
                result->num_rows++;
                if (result->num_rows > blocks_initialized*SYBASE_ROWS_BLOCK) {
-                       result->data = (pval ***) erealloc(result->data,sizeof(pval **)*SYBASE_ROWS_BLOCK*(++blocks_initialized));
+                       result->data = (zval ***) erealloc(result->data,sizeof(zval **)*SYBASE_ROWS_BLOCK*(++blocks_initialized));
                }
-               result->data[i] = (pval **) safe_emalloc(sizeof(pval *), num_fields, 0);
+               result->data[i] = (zval **) safe_emalloc(sizeof(zval *), num_fields, 0);
                for (j=1; j<=num_fields; j++) {
                        php_sybase_get_column_content(sybase_ptr, j, &result->data[i][j-1], column_types[j-1]);
                        if (!php_sybase_module.compatability_mode) {
@@ -1041,7 +1041,7 @@ PHP_FUNCTION(sybase_fetch_row)
        zval **sybase_result_index;
        int type,i,id;
        sybase_result *result;
-       pval *field_content;
+       zval *field_content;
 
        if (ZEND_NUM_ARGS() !=1 || zend_get_parameters_ex(1, &sybase_result_index)==FAILURE) {
                WRONG_PARAM_COUNT;
@@ -1063,7 +1063,7 @@ PHP_FUNCTION(sybase_fetch_row)
        array_init(return_value);
        for (i=0; i<result->num_fields; i++) {
                ZVAL_ADDREF(result->data[result->cur_row][i]);
-               zend_hash_index_update(Z_ARRVAL_P(return_value), i, (void *) &result->data[result->cur_row][i], sizeof(pval *), NULL);
+               zend_hash_index_update(Z_ARRVAL_P(return_value), i, (void *) &result->data[result->cur_row][i], sizeof(zval *), NULL);
        }
        result->cur_row++;
 }
@@ -1097,9 +1097,9 @@ static void php_sybase_fetch_hash(INTERNAL_FUNCTION_PARAMETERS)
        
        for (i=0; i<result->num_fields; i++) {
                ZVAL_ADDREF(result->data[result->cur_row][i]);
-               zend_hash_index_update(Z_ARRVAL_P(return_value), i, (void *) &result->data[result->cur_row][i], sizeof(pval *), NULL);
+               zend_hash_index_update(Z_ARRVAL_P(return_value), i, (void *) &result->data[result->cur_row][i], sizeof(zval *), NULL);
                ZVAL_ADDREF(result->data[result->cur_row][i]);
-               zend_hash_update(Z_ARRVAL_P(return_value), result->fields[i].name, strlen(result->fields[i].name)+1, (void *) &result->data[result->cur_row][i], sizeof(pval  *), NULL);
+               zend_hash_update(Z_ARRVAL_P(return_value), result->fields[i].name, strlen(result->fields[i].name)+1, (void *) &result->data[result->cur_row][i], sizeof(zval  *), NULL);
        }
        result->cur_row++;
 }

diff --git a/ext/sybase_ct/php_sybase_ct.h b/ext/sybase_ct/php_sybase_ct.h
index 024d908e6390f576a17841aa5f0234c9fba99ea8..b05a651fccec4f4cc360f5617620b80bc578a67a 100644 (file)
--- a/ext/sybase_ct/php_sybase_ct.h
+++ b/ext/sybase_ct/php_sybase_ct.h
@@ -96,7 +96,7 @@ typedef struct {
 } sybase_field;
 
 typedef struct {
-       pval **data;
+       zval **data;
        sybase_field *fields;
        sybase_link *sybase_ptr;
        int cur_row,cur_field;