var_reset -> ZVAL_RESET

diff --git a/ext/com/COM.c b/ext/com/COM.c
index 8b98d05b953e832f22f5ed7d950cdac3e5f7f4bf..be5883270b293f08ca297b2fba6a1bf00928b949 100644 (file)
--- a/ext/com/COM.c
+++ b/ext/com/COM.c
@@ -1321,7 +1321,7 @@ PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_pro
                PHP_FN(com_load)(INTERNAL_FUNCTION_PARAM_PASSTHRU);
                if(!zend_is_true(return_value))
                {
-                       var_reset(object);
+                       ZVAL_RESET(object);
                        return;
                }
                ALLOC_ZVAL(object_handle);

diff --git a/ext/com/VARIANT.c b/ext/com/VARIANT.c
index 030541593f9768e2d574a9b0012d0d9732466b88..7daeac117204f8624ba9f56a9bf8e3408959ef10 100644 (file)
--- a/ext/com/VARIANT.c
+++ b/ext/com/VARIANT.c
@@ -161,7 +161,7 @@ void php_VARIANT_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_proper
 
                if(!zend_is_true(return_value))
                {
-                       var_reset(object);
+                       ZVAL_RESET(object);
                        return;
                }
 
@@ -189,7 +189,7 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_referenc
 
        if(!var_arg || (type != IS_VARIANT))
        {
-               var_reset(&result);
+               ZVAL_RESET(&result);
        }
        else
        {
@@ -197,7 +197,7 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_referenc
                switch(overloaded_property->type)
                {
                        case OE_IS_ARRAY:
-                               var_reset(&result);
+                               ZVAL_RESET(&result);
                                break;
 
                        case OE_IS_OBJECT:
@@ -211,12 +211,12 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_referenc
                                }
                                else
                                {
-                                       var_reset(&result);
+                                       ZVAL_RESET(&result);
                                        php_error(E_WARNING, "Unknown member.");
                                }
                                break;
                        case OE_IS_METHOD:
-                               var_reset(&result);
+                               ZVAL_RESET(&result);
                                php_error(E_WARNING, "Unknown method.");
                                break;
 

diff --git a/ext/com/conversion.c b/ext/com/conversion.c
index cf20ceb8f30d00b613b476f42081bb8e05fd21d9..9c7feaaa2cbdd8be5101b4a160c464e9ba95f812 100644 (file)
--- a/ext/com/conversion.c
+++ b/ext/com/conversion.c
@@ -127,7 +127,7 @@ PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage)
                                if(NULL == safeArray)
                                {
                                        php_error( E_WARNING,"Unable to convert php array to VARIANT array - %s", numberOfElements ? "" : "(Empty input array)");
-                                       var_reset(pval_arg);
+                                       ZVAL_RESET(pval_arg);
                                }
                                else
                                {
@@ -473,7 +473,7 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent,
                if (1 != (Dims = SafeArrayGetDim(array)))
                {
                        php_error(E_WARNING,"Unsupported: multi-dimensional (%d) SafeArrays", Dims);
-                       var_reset(pval_arg);
+                       ZVAL_RESET(pval_arg);
                        return FAILURE;
                }
         SafeArrayLock( array);

diff --git a/ext/java/java.c b/ext/java/java.c
index 27bfc1e14c706d1b7fa9650c763e2e93289e3ef8..8b5d9f50218962b80b87ae143a43377799ab4087 100644 (file)
--- a/ext/java/java.c
+++ b/ext/java/java.c
@@ -401,7 +401,7 @@ static int checkError(pval *value) {
   if (value->type == IS_EXCEPTION) {
     php_error(E_WARNING, "%s", value->value.str.val);
     efree(value->value.str.val);
-    var_reset(value);
+    ZVAL_RESET(value);
     return 1;
   };
   return 0;

diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c
index 104ec19ea895d4e7ce83adb5d14c82f3d08869d4..79203f2cedc37acf76983937decb2299d0188194 100644 (file)
--- a/ext/msql/php_msql.c
+++ b/ext/msql/php_msql.c
@@ -849,7 +849,7 @@ PHP_FUNCTION(msql_result)
                        return_value->value.str.val = (char *) safe_estrndup(sql_row[field_offset],return_value->value.str.len);
                }
        } else {
-               var_reset(return_value);
+               ZVAL_RESET(return_value);
        }
        
        return_value->type = IS_STRING;
@@ -1211,7 +1211,7 @@ static void php_msql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type)
                                return_value->value.str.len = 11;
                                return_value->type = IS_STRING;
                        } else {
-                               var_reset(return_value);
+                               ZVAL_RESET(return_value);
                        }
 #else
                        if ((msql_field->flags&NOT_NULL_FLAG) && (msql_field->flags&UNIQUE_FLAG)) {
@@ -1227,7 +1227,7 @@ static void php_msql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type)
                                return_value->value.str.len = 6;
                                return_value->type = IS_STRING;
                        } else {
-                               var_reset(return_value);
+                               ZVAL_RESET(return_value);
                        }
 #endif
                        break;

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index e53728bc86138c4ace34bde275a23820ed1c740f..04c3cfb635faceda4da3c068bbbfcb4d63e716f3 100644 (file)
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -829,7 +829,7 @@ static void php_mssql_get_column_content_with_type(mssql_link *mssql_ptr,int off
                                result->type = IS_STRING;
                        } else {
                                php_error(E_WARNING,"MS SQL:  column %d has unknown data type (%d)", offset, coltype(offset));
-                               var_reset(result);
+                               ZVAL_RESET(result);
                        }
                }
        }
@@ -871,7 +871,7 @@ static void php_mssql_get_column_content_without_type(mssql_link *mssql_ptr,int
                result->type = IS_STRING;
        } else {
                php_error(E_WARNING,"MS SQL:  column %d has unknown data type (%d)", offset, coltype(offset));
-               var_reset(result);
+               ZVAL_RESET(result);
        }
 }
 

diff --git a/ext/rpc/com/com_wrapper.c b/ext/rpc/com/com_wrapper.c
index 8b98d05b953e832f22f5ed7d950cdac3e5f7f4bf..be5883270b293f08ca297b2fba6a1bf00928b949 100644 (file)
--- a/ext/rpc/com/com_wrapper.c
+++ b/ext/rpc/com/com_wrapper.c
@@ -1321,7 +1321,7 @@ PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_pro
                PHP_FN(com_load)(INTERNAL_FUNCTION_PARAM_PASSTHRU);
                if(!zend_is_true(return_value))
                {
-                       var_reset(object);
+                       ZVAL_RESET(object);
                        return;
                }
                ALLOC_ZVAL(object_handle);

diff --git a/ext/rpc/com/conversion.c b/ext/rpc/com/conversion.c
index cf20ceb8f30d00b613b476f42081bb8e05fd21d9..9c7feaaa2cbdd8be5101b4a160c464e9ba95f812 100644 (file)
--- a/ext/rpc/com/conversion.c
+++ b/ext/rpc/com/conversion.c
@@ -127,7 +127,7 @@ PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage)
                                if(NULL == safeArray)
                                {
                                        php_error( E_WARNING,"Unable to convert php array to VARIANT array - %s", numberOfElements ? "" : "(Empty input array)");
-                                       var_reset(pval_arg);
+                                       ZVAL_RESET(pval_arg);
                                }
                                else
                                {
@@ -473,7 +473,7 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent,
                if (1 != (Dims = SafeArrayGetDim(array)))
                {
                        php_error(E_WARNING,"Unsupported: multi-dimensional (%d) SafeArrays", Dims);
-                       var_reset(pval_arg);
+                       ZVAL_RESET(pval_arg);
                        return FAILURE;
                }
         SafeArrayLock( array);

diff --git a/ext/rpc/com/variant.c b/ext/rpc/com/variant.c
index 030541593f9768e2d574a9b0012d0d9732466b88..7daeac117204f8624ba9f56a9bf8e3408959ef10 100644 (file)
--- a/ext/rpc/com/variant.c
+++ b/ext/rpc/com/variant.c
@@ -161,7 +161,7 @@ void php_VARIANT_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_proper
 
                if(!zend_is_true(return_value))
                {
-                       var_reset(object);
+                       ZVAL_RESET(object);
                        return;
                }
 
@@ -189,7 +189,7 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_referenc
 
        if(!var_arg || (type != IS_VARIANT))
        {
-               var_reset(&result);
+               ZVAL_RESET(&result);
        }
        else
        {
@@ -197,7 +197,7 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_referenc
                switch(overloaded_property->type)
                {
                        case OE_IS_ARRAY:
-                               var_reset(&result);
+                               ZVAL_RESET(&result);
                                break;
 
                        case OE_IS_OBJECT:
@@ -211,12 +211,12 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_referenc
                                }
                                else
                                {
-                                       var_reset(&result);
+                                       ZVAL_RESET(&result);
                                        php_error(E_WARNING, "Unknown member.");
                                }
                                break;
                        case OE_IS_METHOD:
-                               var_reset(&result);
+                               ZVAL_RESET(&result);
                                php_error(E_WARNING, "Unknown method.");
                                break;
 

diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c
index 27bfc1e14c706d1b7fa9650c763e2e93289e3ef8..8b5d9f50218962b80b87ae143a43377799ab4087 100644 (file)
--- a/ext/rpc/java/java.c
+++ b/ext/rpc/java/java.c
@@ -401,7 +401,7 @@ static int checkError(pval *value) {
   if (value->type == IS_EXCEPTION) {
     php_error(E_WARNING, "%s", value->value.str.val);
     efree(value->value.str.val);
-    var_reset(value);
+    ZVAL_RESET(value);
     return 1;
   };
   return 0;

diff --git a/ext/standard/url.c b/ext/standard/url.c
index 33af3cf77790d68ab96426926505e53a5eda1623..3c3128285cb37c2fa45dbda983d43fa315a980f9 100644 (file)
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -295,7 +295,7 @@ PHP_FUNCTION(urlencode)
        convert_to_string_ex(arg);
 
        if (!(*arg)->value.str.len) {
-               var_reset(return_value);
+               ZVAL_RESET(return_value);
                return;
        }
        str = php_url_encode((*arg)->value.str.val, (*arg)->value.str.len, &str_len);
@@ -316,7 +316,7 @@ PHP_FUNCTION(urldecode)
        convert_to_string_ex(arg);
 
        if (!(*arg)->value.str.len) {
-               var_reset(return_value);
+               ZVAL_RESET(return_value);
                return;
        }
 

diff --git a/ext/sybase/php_sybase_db.c b/ext/sybase/php_sybase_db.c
index b0d496fe82a44fbb14a910a5afb3650aaf621a7e..efbdb6a6f36a349fadb684bd356033fe62dfae51 100644 (file)
--- a/ext/sybase/php_sybase_db.c
+++ b/ext/sybase/php_sybase_db.c
@@ -617,7 +617,7 @@ static void php_sybase_get_column_content(sybase_link *sybase_ptr,int offset,pva
        *result_ptr = result;
 
        if (dbdatlen(sybase_ptr->link,offset) == 0) {
-               var_reset(result);
+               ZVAL_RESET(result);
                return;
        }
 
@@ -688,7 +688,7 @@ static void php_sybase_get_column_content(sybase_link *sybase_ptr,int offset,pva
                                result->type = IS_STRING;
                        } else {
                                php_error(E_WARNING,"Sybase:  column %d has unknown data type (%d)", offset, coltype(offset));
-                               var_reset(result);
+                               ZVAL_RESET(result);
                        }
                }
        }

diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
index f0a01dd932fd29823589044c1f51e28f07c89cad..5dcdc254c74f5bc04b4a1124ab7c1065823f0499 100644 (file)
--- a/ext/sybase_ct/php_sybase_ct.c
+++ b/ext/sybase_ct/php_sybase_ct.c
@@ -991,7 +991,7 @@ static sybase_result * php_sybase_fetch_result_set (sybase_link *sybase_ptr)
                result->data[i] = (pval *) emalloc(sizeof(pval)*num_fields);
                for (j=0; j<num_fields; j++) {
                        if (indicators[j] == -1) { /* null value */
-                               var_reset(&result->data[i][j]);
+                               ZVAL_RESET(&result->data[i][j]);
                        } else {
                                result->data[i][j].value.str.len = lengths[j]-1;  /* we don't need the NULL in the length */
                                result->data[i][j].value.str.val = estrndup(tmp_buffer[j], lengths[j]);

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index 1534a4fb5bcf8074b1c26e5436354fc11d37778d..4ba97656fa68759acd82cdca6ca2ef877332e6bf 100644 (file)
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -271,7 +271,7 @@ static zval *_xml_xmlchar_zval(const XML_Char *s, int len, const XML_Char *encod
        MAKE_STD_ZVAL(ret);
        
        if (s == NULL) {
-               var_reset(ret);
+               ZVAL_RESET(ret);
                return ret;
        }
        if (len == 0) {