cvs: php4 /ext/com COM.c VARIANT.c conversion.c /ext/java java.c /ext/msql php_msql.c /ext/mssql php_mssql.c /ext/standard url.c /ext/sybase
php_sybase_db.c /ext/sybase_ct php_sybase_ct.c /ext/xml xml.c
| From: | Zeev Suraski | Date: | Wed, 11 Jul 2001 09:39:10 +0000 |
| Subject: | cvs: php4 /ext/com COM.c VARIANT.c conversion.c /ext/java java.c /ext/msql php_msql.c /ext/mssql php_mssql.c /ext/standard url.c /ext/sybase php_sybase_db.c /ext/sybase_ct php_sybase_ct.c /ext/xml xml.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6169@lists.php.net to get a copy of this message | ||
zeev Wed Jul 11 05:39:10 2001 EDT
Modified files:
/php4/ext/com COM.c VARIANT.c conversion.c
/php4/ext/java java.c
/php4/ext/msql php_msql.c
/php4/ext/mssql php_mssql.c
/php4/ext/standard url.c
/php4/ext/sybase php_sybase_db.c
/php4/ext/sybase_ct php_sybase_ct.c
/php4/ext/xml xml.c
Log:
var_reset -> ZVAL_RESET
Index: php4/ext/com/COM.c diff -u php4/ext/com/COM.c:1.26 php4/ext/com/COM.c:1.27 --- php4/ext/com/COM.c:1.26 Thu Jun 28 17:26:19 2001 +++ php4/ext/com/COM.c Wed Jul 11 05:39:06 2001 @@ -1321,7 +1321,7 @@ 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); Index: php4/ext/com/VARIANT.c diff -u php4/ext/com/VARIANT.c:1.12 php4/ext/com/VARIANT.c:1.13 --- php4/ext/com/VARIANT.c:1.12 Sun Jun 24 17:09:31 2001 +++ php4/ext/com/VARIANT.c Wed Jul 11 05:39:06 2001 @@ -161,7 +161,7 @@ if(!zend_is_true(return_value)) { - var_reset(object); + ZVAL_RESET(object); return; } @@ -189,7 +189,7 @@ if(!var_arg || (type != IS_VARIANT)) { - var_reset(&result); + ZVAL_RESET(&result); } else { @@ -197,7 +197,7 @@ switch(overloaded_property->type) { case OE_IS_ARRAY: - var_reset(&result); + ZVAL_RESET(&result); break; case OE_IS_OBJECT: @@ -211,12 +211,12 @@ } 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; Index: php4/ext/com/conversion.c diff -u php4/ext/com/conversion.c:1.19 php4/ext/com/conversion.c:1.20 --- php4/ext/com/conversion.c:1.19 Sun Jun 24 17:09:31 2001 +++ php4/ext/com/conversion.c Wed Jul 11 05:39:06 2001 @@ -127,7 +127,7 @@ 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 @@ 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); Index: php4/ext/java/java.c diff -u php4/ext/java/java.c:1.43 php4/ext/java/java.c:1.44 --- php4/ext/java/java.c:1.43 Tue Jun 19 12:03:33 2001 +++ php4/ext/java/java.c Wed Jul 11 05:39:06 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: java.c,v 1.43 2001/06/19 16:03:33 andi Exp $ */ +/* $Id: java.c,v 1.44 2001/07/11 09:39:06 zeev Exp $ */ /* * This module implements Zend OO syntax overloading support for Java @@ -401,7 +401,7 @@ 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; Index: php4/ext/msql/php_msql.c diff -u php4/ext/msql/php_msql.c:1.33 php4/ext/msql/php_msql.c:1.34 --- php4/ext/msql/php_msql.c:1.33 Wed Jun 6 09:05:46 2001 +++ php4/ext/msql/php_msql.c Wed Jul 11 05:39:07 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_msql.c,v 1.33 2001/06/06 13:05:46 rasmus Exp $ */ +/* $Id: php_msql.c,v 1.34 2001/07/11 09:39:07 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -849,7 +849,7 @@ 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 @@ 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 @@ return_value->value.str.len = 6; return_value->type = IS_STRING; } else { - var_reset(return_value); + ZVAL_RESET(return_value); } #endif break; Index: php4/ext/mssql/php_mssql.c diff -u php4/ext/mssql/php_mssql.c:1.52 php4/ext/mssql/php_mssql.c:1.53 --- php4/ext/mssql/php_mssql.c:1.52 Thu Jul 5 15:17:33 2001 +++ php4/ext/mssql/php_mssql.c Wed Jul 11 05:39:07 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.52 2001/07/05 19:17:33 fmk Exp $ */ +/* $Id: php_mssql.c,v 1.53 2001/07/11 09:39:07 zeev Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -829,7 +829,7 @@ 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 @@ 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); } } Index: php4/ext/standard/url.c diff -u php4/ext/standard/url.c:1.39 php4/ext/standard/url.c:1.40 --- php4/ext/standard/url.c:1.39 Tue Jun 19 11:20:50 2001 +++ php4/ext/standard/url.c Wed Jul 11 05:39:08 2001 @@ -15,7 +15,7 @@ | Author: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: url.c,v 1.39 2001/06/19 15:20:50 sbergmann Exp $ */ +/* $Id: url.c,v 1.40 2001/07/11 09:39:08 zeev Exp $ */ #include <stdlib.h> #include <string.h> @@ -295,7 +295,7 @@ 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 @@ convert_to_string_ex(arg); if (!(*arg)->value.str.len) { - var_reset(return_value); + ZVAL_RESET(return_value); return; } Index: php4/ext/sybase/php_sybase_db.c diff -u php4/ext/sybase/php_sybase_db.c:1.16 php4/ext/sybase/php_sybase_db.c:1.17 --- php4/ext/sybase/php_sybase_db.c:1.16 Tue Jun 12 01:28:40 2001 +++ php4/ext/sybase/php_sybase_db.c Wed Jul 11 05:39:08 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_db.c,v 1.16 2001/06/12 05:28:40 sniper Exp $ */ +/* $Id: php_sybase_db.c,v 1.17 2001/07/11 09:39:08 zeev Exp $ */ #ifdef HAVE_CONFIG_H @@ -617,7 +617,7 @@ *result_ptr = result; if (dbdatlen(sybase_ptr->link,offset) == 0) { - var_reset(result); + ZVAL_RESET(result); return; } @@ -688,7 +688,7 @@ 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); } } } Index: php4/ext/sybase_ct/php_sybase_ct.c diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.48 php4/ext/sybase_ct/php_sybase_ct.c:1.49 --- php4/ext/sybase_ct/php_sybase_ct.c:1.48 Thu Jul 5 21:21:55 2001 +++ php4/ext/sybase_ct/php_sybase_ct.c Wed Jul 11 05:39:08 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.48 2001/07/06 01:21:55 joey Exp $ */ +/* $Id: php_sybase_ct.c,v 1.49 2001/07/11 09:39:08 zeev Exp $ */ #ifdef HAVE_CONFIG_H @@ -991,7 +991,7 @@ 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]); Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.80 php4/ext/xml/xml.c:1.81 --- php4/ext/xml/xml.c:1.80 Mon Jul 9 02:49:34 2001 +++ php4/ext/xml/xml.c Wed Jul 11 05:39:09 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.80 2001/07/09 06:49:34 thies Exp $ */ +/* $Id: xml.c,v 1.81 2001/07/11 09:39:09 zeev Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -271,7 +271,7 @@ MAKE_STD_ZVAL(ret); if (s == NULL) { - var_reset(ret); + ZVAL_RESET(ret); return ret; } if (len == 0) {
Index: php4/ext/com/COM.c diff -u php4/ext/com/COM.c:1.26 php4/ext/com/COM.c:1.27 --- php4/ext/com/COM.c:1.26 Thu Jun 28 17:26:19 2001 +++ php4/ext/com/COM.c Wed Jul 11 05:39:06 2001 @@ -1321,7 +1321,7 @@ 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); Index: php4/ext/com/VARIANT.c diff -u php4/ext/com/VARIANT.c:1.12 php4/ext/com/VARIANT.c:1.13 --- php4/ext/com/VARIANT.c:1.12 Sun Jun 24 17:09:31 2001 +++ php4/ext/com/VARIANT.c Wed Jul 11 05:39:06 2001 @@ -161,7 +161,7 @@ if(!zend_is_true(return_value)) { - var_reset(object); + ZVAL_RESET(object); return; } @@ -189,7 +189,7 @@ if(!var_arg || (type != IS_VARIANT)) { - var_reset(&result); + ZVAL_RESET(&result); } else { @@ -197,7 +197,7 @@ switch(overloaded_property->type) { case OE_IS_ARRAY: - var_reset(&result); + ZVAL_RESET(&result); break; case OE_IS_OBJECT: @@ -211,12 +211,12 @@ } 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; Index: php4/ext/com/conversion.c diff -u php4/ext/com/conversion.c:1.19 php4/ext/com/conversion.c:1.20 --- php4/ext/com/conversion.c:1.19 Sun Jun 24 17:09:31 2001 +++ php4/ext/com/conversion.c Wed Jul 11 05:39:06 2001 @@ -127,7 +127,7 @@ 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 @@ 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); Index: php4/ext/java/java.c diff -u php4/ext/java/java.c:1.43 php4/ext/java/java.c:1.44 --- php4/ext/java/java.c:1.43 Tue Jun 19 12:03:33 2001 +++ php4/ext/java/java.c Wed Jul 11 05:39:06 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: java.c,v 1.43 2001/06/19 16:03:33 andi Exp $ */ +/* $Id: java.c,v 1.44 2001/07/11 09:39:06 zeev Exp $ */ /* * This module implements Zend OO syntax overloading support for Java @@ -401,7 +401,7 @@ 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; Index: php4/ext/msql/php_msql.c diff -u php4/ext/msql/php_msql.c:1.33 php4/ext/msql/php_msql.c:1.34 --- php4/ext/msql/php_msql.c:1.33 Wed Jun 6 09:05:46 2001 +++ php4/ext/msql/php_msql.c Wed Jul 11 05:39:07 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_msql.c,v 1.33 2001/06/06 13:05:46 rasmus Exp $ */ +/* $Id: php_msql.c,v 1.34 2001/07/11 09:39:07 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -849,7 +849,7 @@ 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 @@ 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 @@ return_value->value.str.len = 6; return_value->type = IS_STRING; } else { - var_reset(return_value); + ZVAL_RESET(return_value); } #endif break; Index: php4/ext/mssql/php_mssql.c diff -u php4/ext/mssql/php_mssql.c:1.52 php4/ext/mssql/php_mssql.c:1.53 --- php4/ext/mssql/php_mssql.c:1.52 Thu Jul 5 15:17:33 2001 +++ php4/ext/mssql/php_mssql.c Wed Jul 11 05:39:07 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.52 2001/07/05 19:17:33 fmk Exp $ */ +/* $Id: php_mssql.c,v 1.53 2001/07/11 09:39:07 zeev Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -829,7 +829,7 @@ 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 @@ 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); } } Index: php4/ext/standard/url.c diff -u php4/ext/standard/url.c:1.39 php4/ext/standard/url.c:1.40 --- php4/ext/standard/url.c:1.39 Tue Jun 19 11:20:50 2001 +++ php4/ext/standard/url.c Wed Jul 11 05:39:08 2001 @@ -15,7 +15,7 @@ | Author: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: url.c,v 1.39 2001/06/19 15:20:50 sbergmann Exp $ */ +/* $Id: url.c,v 1.40 2001/07/11 09:39:08 zeev Exp $ */ #include <stdlib.h> #include <string.h> @@ -295,7 +295,7 @@ 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 @@ convert_to_string_ex(arg); if (!(*arg)->value.str.len) { - var_reset(return_value); + ZVAL_RESET(return_value); return; } Index: php4/ext/sybase/php_sybase_db.c diff -u php4/ext/sybase/php_sybase_db.c:1.16 php4/ext/sybase/php_sybase_db.c:1.17 --- php4/ext/sybase/php_sybase_db.c:1.16 Tue Jun 12 01:28:40 2001 +++ php4/ext/sybase/php_sybase_db.c Wed Jul 11 05:39:08 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_db.c,v 1.16 2001/06/12 05:28:40 sniper Exp $ */ +/* $Id: php_sybase_db.c,v 1.17 2001/07/11 09:39:08 zeev Exp $ */ #ifdef HAVE_CONFIG_H @@ -617,7 +617,7 @@ *result_ptr = result; if (dbdatlen(sybase_ptr->link,offset) == 0) { - var_reset(result); + ZVAL_RESET(result); return; } @@ -688,7 +688,7 @@ 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); } } } Index: php4/ext/sybase_ct/php_sybase_ct.c diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.48 php4/ext/sybase_ct/php_sybase_ct.c:1.49 --- php4/ext/sybase_ct/php_sybase_ct.c:1.48 Thu Jul 5 21:21:55 2001 +++ php4/ext/sybase_ct/php_sybase_ct.c Wed Jul 11 05:39:08 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.48 2001/07/06 01:21:55 joey Exp $ */ +/* $Id: php_sybase_ct.c,v 1.49 2001/07/11 09:39:08 zeev Exp $ */ #ifdef HAVE_CONFIG_H @@ -991,7 +991,7 @@ 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]); Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.80 php4/ext/xml/xml.c:1.81 --- php4/ext/xml/xml.c:1.80 Mon Jul 9 02:49:34 2001 +++ php4/ext/xml/xml.c Wed Jul 11 05:39:09 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.80 2001/07/09 06:49:34 thies Exp $ */ +/* $Id: xml.c,v 1.81 2001/07/11 09:39:09 zeev Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -271,7 +271,7 @@ MAKE_STD_ZVAL(ret); if (s == NULL) { - var_reset(ret); + ZVAL_RESET(ret); return ret; } if (len == 0) {