Skip to content

Commit d70ce7b

Browse files
zsuraskizsuraski
committed
var_reset -> ZVAL_RESET
1 parent ed54233 commit d70ce7b

File tree

14 files changed

+29
-29
lines changed

14 files changed

+29
-29
lines changed

‎ext/com/COM.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1321,7 +1321,7 @@ PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_pro
13211321
PHP_FN(com_load)(INTERNAL_FUNCTION_PARAM_PASSTHRU);
13221322
if(!zend_is_true(return_value))
13231323
{
1324-
var_reset(object);
1324+
ZVAL_RESET(object);
13251325
return;
13261326
}
13271327
ALLOC_ZVAL(object_handle);

‎ext/com/VARIANT.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ void php_VARIANT_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_proper
161161

162162
if(!zend_is_true(return_value))
163163
{
164-
var_reset(object);
164+
ZVAL_RESET(object);
165165
return;
166166
}
167167

@@ -189,15 +189,15 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_referenc
189189

190190
if(!var_arg || (type != IS_VARIANT))
191191
{
192-
var_reset(&result);
192+
ZVAL_RESET(&result);
193193
}
194194
else
195195
{
196196
overloaded_property = (zend_overloaded_element *) property_reference->elements_list->head->data;
197197
switch(overloaded_property->type)
198198
{
199199
case OE_IS_ARRAY:
200-
var_reset(&result);
200+
ZVAL_RESET(&result);
201201
break;
202202

203203
case OE_IS_OBJECT:
@@ -211,12 +211,12 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_referenc
211211
}
212212
else
213213
{
214-
var_reset(&result);
214+
ZVAL_RESET(&result);
215215
php_error(E_WARNING, "Unknown member.");
216216
}
217217
break;
218218
case OE_IS_METHOD:
219-
var_reset(&result);
219+
ZVAL_RESET(&result);
220220
php_error(E_WARNING, "Unknown method.");
221221
break;
222222

‎ext/com/conversion.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage)
127127
if(NULL == safeArray)
128128
{
129129
php_error( E_WARNING,"Unable to convert php array to VARIANT array - %s", numberOfElements ? "" : "(Empty input array)");
130-
var_reset(pval_arg);
130+
ZVAL_RESET(pval_arg);
131131
}
132132
else
133133
{
@@ -473,7 +473,7 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent,
473473
if (1 != (Dims = SafeArrayGetDim(array)))
474474
{
475475
php_error(E_WARNING,"Unsupported: multi-dimensional (%d) SafeArrays", Dims);
476-
var_reset(pval_arg);
476+
ZVAL_RESET(pval_arg);
477477
return FAILURE;
478478
}
479479
SafeArrayLock( array);

‎ext/java/java.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ static int checkError(pval *value) {
401401
if (value->type == IS_EXCEPTION) {
402402
php_error(E_WARNING, "%s", value->value.str.val);
403403
efree(value->value.str.val);
404-
var_reset(value);
404+
ZVAL_RESET(value);
405405
return 1;
406406
};
407407
return 0;

‎ext/msql/php_msql.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@ PHP_FUNCTION(msql_result)
849849
return_value->value.str.val = (char *) safe_estrndup(sql_row[field_offset],return_value->value.str.len);
850850
}
851851
} else {
852-
var_reset(return_value);
852+
ZVAL_RESET(return_value);
853853
}
854854

855855
return_value->type = IS_STRING;
@@ -1211,7 +1211,7 @@ static void php_msql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type)
12111211
return_value->value.str.len = 11;
12121212
return_value->type = IS_STRING;
12131213
} else {
1214-
var_reset(return_value);
1214+
ZVAL_RESET(return_value);
12151215
}
12161216
#else
12171217
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)
12271227
return_value->value.str.len = 6;
12281228
return_value->type = IS_STRING;
12291229
} else {
1230-
var_reset(return_value);
1230+
ZVAL_RESET(return_value);
12311231
}
12321232
#endif
12331233
break;

‎ext/mssql/php_mssql.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ static void php_mssql_get_column_content_with_type(mssql_link *mssql_ptr,int off
829829
result->type = IS_STRING;
830830
} else {
831831
php_error(E_WARNING,"MS SQL: column %d has unknown data type (%d)", offset, coltype(offset));
832-
var_reset(result);
832+
ZVAL_RESET(result);
833833
}
834834
}
835835
}
@@ -871,7 +871,7 @@ static void php_mssql_get_column_content_without_type(mssql_link *mssql_ptr,int
871871
result->type = IS_STRING;
872872
} else {
873873
php_error(E_WARNING,"MS SQL: column %d has unknown data type (%d)", offset, coltype(offset));
874-
var_reset(result);
874+
ZVAL_RESET(result);
875875
}
876876
}
877877

‎ext/rpc/com/com_wrapper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1321,7 +1321,7 @@ PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_pro
13211321
PHP_FN(com_load)(INTERNAL_FUNCTION_PARAM_PASSTHRU);
13221322
if(!zend_is_true(return_value))
13231323
{
1324-
var_reset(object);
1324+
ZVAL_RESET(object);
13251325
return;
13261326
}
13271327
ALLOC_ZVAL(object_handle);

‎ext/rpc/com/conversion.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage)
127127
if(NULL == safeArray)
128128
{
129129
php_error( E_WARNING,"Unable to convert php array to VARIANT array - %s", numberOfElements ? "" : "(Empty input array)");
130-
var_reset(pval_arg);
130+
ZVAL_RESET(pval_arg);
131131
}
132132
else
133133
{
@@ -473,7 +473,7 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent,
473473
if (1 != (Dims = SafeArrayGetDim(array)))
474474
{
475475
php_error(E_WARNING,"Unsupported: multi-dimensional (%d) SafeArrays", Dims);
476-
var_reset(pval_arg);
476+
ZVAL_RESET(pval_arg);
477477
return FAILURE;
478478
}
479479
SafeArrayLock( array);

‎ext/rpc/com/variant.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ void php_VARIANT_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_proper
161161

162162
if(!zend_is_true(return_value))
163163
{
164-
var_reset(object);
164+
ZVAL_RESET(object);
165165
return;
166166
}
167167

@@ -189,15 +189,15 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_referenc
189189

190190
if(!var_arg || (type != IS_VARIANT))
191191
{
192-
var_reset(&result);
192+
ZVAL_RESET(&result);
193193
}
194194
else
195195
{
196196
overloaded_property = (zend_overloaded_element *) property_reference->elements_list->head->data;
197197
switch(overloaded_property->type)
198198
{
199199
case OE_IS_ARRAY:
200-
var_reset(&result);
200+
ZVAL_RESET(&result);
201201
break;
202202

203203
case OE_IS_OBJECT:
@@ -211,12 +211,12 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_referenc
211211
}
212212
else
213213
{
214-
var_reset(&result);
214+
ZVAL_RESET(&result);
215215
php_error(E_WARNING, "Unknown member.");
216216
}
217217
break;
218218
case OE_IS_METHOD:
219-
var_reset(&result);
219+
ZVAL_RESET(&result);
220220
php_error(E_WARNING, "Unknown method.");
221221
break;
222222

‎ext/rpc/java/java.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ static int checkError(pval *value) {
401401
if (value->type == IS_EXCEPTION) {
402402
php_error(E_WARNING, "%s", value->value.str.val);
403403
efree(value->value.str.val);
404-
var_reset(value);
404+
ZVAL_RESET(value);
405405
return 1;
406406
};
407407
return 0;

‎ext/standard/url.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ PHP_FUNCTION(urlencode)
295295
convert_to_string_ex(arg);
296296

297297
if (!(*arg)->value.str.len) {
298-
var_reset(return_value);
298+
ZVAL_RESET(return_value);
299299
return;
300300
}
301301
str = php_url_encode((*arg)->value.str.val, (*arg)->value.str.len, &str_len);
@@ -316,7 +316,7 @@ PHP_FUNCTION(urldecode)
316316
convert_to_string_ex(arg);
317317

318318
if (!(*arg)->value.str.len) {
319-
var_reset(return_value);
319+
ZVAL_RESET(return_value);
320320
return;
321321
}
322322

‎ext/sybase/php_sybase_db.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ static void php_sybase_get_column_content(sybase_link *sybase_ptr,int offset,pva
617617
*result_ptr = result;
618618

619619
if (dbdatlen(sybase_ptr->link,offset) == 0) {
620-
var_reset(result);
620+
ZVAL_RESET(result);
621621
return;
622622
}
623623

@@ -688,7 +688,7 @@ static void php_sybase_get_column_content(sybase_link *sybase_ptr,int offset,pva
688688
result->type = IS_STRING;
689689
} else {
690690
php_error(E_WARNING,"Sybase: column %d has unknown data type (%d)", offset, coltype(offset));
691-
var_reset(result);
691+
ZVAL_RESET(result);
692692
}
693693
}
694694
}

‎ext/sybase_ct/php_sybase_ct.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -991,7 +991,7 @@ static sybase_result * php_sybase_fetch_result_set (sybase_link *sybase_ptr)
991991
result->data[i] = (pval *) emalloc(sizeof(pval)*num_fields);
992992
for (j=0; j<num_fields; j++) {
993993
if (indicators[j] == -1) { /* null value */
994-
var_reset(&result->data[i][j]);
994+
ZVAL_RESET(&result->data[i][j]);
995995
} else {
996996
result->data[i][j].value.str.len = lengths[j]-1; /* we don't need the NULL in the length */
997997
result->data[i][j].value.str.val = estrndup(tmp_buffer[j], lengths[j]);

‎ext/xml/xml.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ static zval *_xml_xmlchar_zval(const XML_Char *s, int len, const XML_Char *encod
271271
MAKE_STD_ZVAL(ret);
272272

273273
if (s == NULL) {
274-
var_reset(ret);
274+
ZVAL_RESET(ret);
275275
return ret;
276276
}
277277
if (len == 0) {

0 commit comments

Comments
 (0)