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/oci8 oci8.c /ext/standard
assert.c url.c /ext/sybase php_sybase_db.c /ext/sybase_ct php_sybase_ct.c /ext/xml xml.c
| From: | Thies C. Arntzen | Date: | Wed, 11 Jul 2001 12:42:25 +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/oci8 oci8.c /ext/standard assert.c 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-6180@lists.php.net to get a copy of this message | ||
thies Wed Jul 11 08:42:25 2001 EDT
Modified files:
/php4/ext/com COM.c conversion.c VARIANT.c
/php4/ext/java java.c
/php4/ext/msql php_msql.c
/php4/ext/mssql php_mssql.c
/php4/ext/oci8 oci8.c
/php4/ext/standard assert.c url.c
/php4/ext/sybase_ct php_sybase_ct.c
/php4/ext/sybase php_sybase_db.c
/php4/ext/xml xml.c
Log:
ZVAL_BOOL(v,0) -> ZVAL_FALSE(v)
Index: php4/ext/com/COM.c diff -u php4/ext/com/COM.c:1.28 php4/ext/com/COM.c:1.29 --- php4/ext/com/COM.c:1.28 Wed Jul 11 07:39:07 2001 +++ php4/ext/com/COM.c Wed Jul 11 08:42:21 2001 @@ -1321,7 +1321,7 @@ PHP_FN(com_load)(INTERNAL_FUNCTION_PARAM_PASSTHRU); if(!zend_is_true(return_value)) { - ZVAL_BOOL(object, 0); + ZVAL_FALSE(object); return; } ALLOC_ZVAL(object_handle); Index: php4/ext/com/conversion.c diff -u php4/ext/com/conversion.c:1.21 php4/ext/com/conversion.c:1.22 --- php4/ext/com/conversion.c:1.21 Wed Jul 11 07:39:07 2001 +++ php4/ext/com/conversion.c Wed Jul 11 08:42:21 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)"); - ZVAL_BOOL(pval_arg, 0); + ZVAL_FALSE(pval_arg); } else { @@ -473,7 +473,7 @@ if (1 != (Dims = SafeArrayGetDim(array))) { php_error(E_WARNING,"Unsupported: multi-dimensional (%d) SafeArrays", Dims); - ZVAL_BOOL(pval_arg, 0); + ZVAL_FALSE(pval_arg); return FAILURE; } SafeArrayLock( array); Index: php4/ext/com/VARIANT.c diff -u php4/ext/com/VARIANT.c:1.14 php4/ext/com/VARIANT.c:1.15 --- php4/ext/com/VARIANT.c:1.14 Wed Jul 11 07:39:07 2001 +++ php4/ext/com/VARIANT.c Wed Jul 11 08:42:21 2001 @@ -161,7 +161,7 @@ if(!zend_is_true(return_value)) { - ZVAL_BOOL(object, 0); + ZVAL_FALSE(object); return; } @@ -189,7 +189,7 @@ if(!var_arg || (type != IS_VARIANT)) { - ZVAL_BOOL(&result, 0); + ZVAL_FALSE(&result); } else { @@ -197,7 +197,7 @@ switch(overloaded_property->type) { case OE_IS_ARRAY: - ZVAL_BOOL(&result, 0); + ZVAL_FALSE(&result); break; case OE_IS_OBJECT: @@ -211,12 +211,12 @@ } else { - ZVAL_BOOL(&result, 0); + ZVAL_FALSE(&result); php_error(E_WARNING, "Unknown member."); } break; case OE_IS_METHOD: - ZVAL_BOOL(&result, 0); + ZVAL_FALSE(&result); php_error(E_WARNING, "Unknown method."); break; Index: php4/ext/java/java.c diff -u php4/ext/java/java.c:1.45 php4/ext/java/java.c:1.46 --- php4/ext/java/java.c:1.45 Wed Jul 11 07:39:07 2001 +++ php4/ext/java/java.c Wed Jul 11 08:42:21 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: java.c,v 1.45 2001/07/11 11:39:07 zeev Exp $ */ +/* $Id: java.c,v 1.46 2001/07/11 12:42:21 thies 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); - ZVAL_BOOL(value, 0); + ZVAL_FALSE(value); return 1; }; return 0; Index: php4/ext/msql/php_msql.c diff -u php4/ext/msql/php_msql.c:1.35 php4/ext/msql/php_msql.c:1.36 --- php4/ext/msql/php_msql.c:1.35 Wed Jul 11 07:39:08 2001 +++ php4/ext/msql/php_msql.c Wed Jul 11 08:42:21 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_msql.c,v 1.35 2001/07/11 11:39:08 zeev Exp $ */ +/* $Id: php_msql.c,v 1.36 2001/07/11 12:42:21 thies 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 { - ZVAL_BOOL(return_value, 0); + ZVAL_FALSE(return_value); } return_value->type = IS_STRING; @@ -1211,7 +1211,7 @@ return_value->value.str.len = 11; return_value->type = IS_STRING; } else { - ZVAL_BOOL(return_value, 0); + ZVAL_FALSE(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 { - ZVAL_BOOL(return_value, 0); + ZVAL_FALSE(return_value); } #endif break; Index: php4/ext/mssql/php_mssql.c diff -u php4/ext/mssql/php_mssql.c:1.54 php4/ext/mssql/php_mssql.c:1.55 --- php4/ext/mssql/php_mssql.c:1.54 Wed Jul 11 07:39:08 2001 +++ php4/ext/mssql/php_mssql.c Wed Jul 11 08:42:22 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.54 2001/07/11 11:39:08 zeev Exp $ */ +/* $Id: php_mssql.c,v 1.55 2001/07/11 12:42:22 thies 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)); - ZVAL_BOOL(result, 0); + ZVAL_FALSE(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)); - ZVAL_BOOL(result, 0); + ZVAL_FALSE(result); } } Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.133 php4/ext/oci8/oci8.c:1.134 --- php4/ext/oci8/oci8.c:1.133 Mon Jul 9 14:01:18 2001 +++ php4/ext/oci8/oci8.c Wed Jul 11 08:42:22 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.133 2001/07/09 18:01:18 thies Exp $ */ +/* $Id: oci8.c,v 1.134 2001/07/11 12:42:22 thies Exp $ */ /* TODO list: * @@ -581,7 +581,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.133 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.134 $"); #ifndef PHP_WIN32 php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION ); php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR ); @@ -1174,7 +1174,7 @@ } if (oci_loadlob(statement->conn,descr,&buffer,&loblen)) { - ZVAL_BOOL(value,0); + ZVAL_FALSE(value); } else { ZVAL_STRINGL(value,buffer,loblen,0); } @@ -1197,7 +1197,7 @@ default: /* XXX we SHOULD maybe have a different behaviour for unknown results! */ - ZVAL_BOOL(value,0); + ZVAL_FALSE(value); return 0; } Index: php4/ext/standard/assert.c diff -u php4/ext/standard/assert.c:1.32 php4/ext/standard/assert.c:1.33 --- php4/ext/standard/assert.c:1.32 Mon Jul 9 06:20:39 2001 +++ php4/ext/standard/assert.c Wed Jul 11 08:42:22 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: assert.c,v 1.32 2001/07/09 10:20:39 thies Exp $ */ +/* $Id: assert.c,v 1.33 2001/07/11 12:42:22 thies Exp $ */ /* {{{ includes/startup/misc */ @@ -201,7 +201,7 @@ ZVAL_STRING(args[2],SAFE_STRING(myeval),1); MAKE_STD_ZVAL(retval); - ZVAL_BOOL(retval,0); + ZVAL_FALSE(retval); /* XXX do we want to check for error here? */ call_user_function(CG(function_table), NULL, ASSERT(callback), retval, 3, args); Index: php4/ext/standard/url.c diff -u php4/ext/standard/url.c:1.41 php4/ext/standard/url.c:1.42 --- php4/ext/standard/url.c:1.41 Wed Jul 11 07:39:08 2001 +++ php4/ext/standard/url.c Wed Jul 11 08:42:22 2001 @@ -15,7 +15,7 @@ | Author: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: url.c,v 1.41 2001/07/11 11:39:08 zeev Exp $ */ +/* $Id: url.c,v 1.42 2001/07/11 12:42:22 thies Exp $ */ #include <stdlib.h> #include <string.h> @@ -295,7 +295,7 @@ convert_to_string_ex(arg); if (!(*arg)->value.str.len) { - ZVAL_BOOL(return_value, 0); + ZVAL_FALSE(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) { - ZVAL_BOOL(return_value, 0); + ZVAL_FALSE(return_value); return; } Index: php4/ext/sybase_ct/php_sybase_ct.c diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.50 php4/ext/sybase_ct/php_sybase_ct.c:1.51 --- php4/ext/sybase_ct/php_sybase_ct.c:1.50 Wed Jul 11 07:39:10 2001 +++ php4/ext/sybase_ct/php_sybase_ct.c Wed Jul 11 08:42:23 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.50 2001/07/11 11:39:10 zeev Exp $ */ +/* $Id: php_sybase_ct.c,v 1.51 2001/07/11 12:42:23 thies 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 */ - ZVAL_BOOL(&result->data[i][j], 0); + ZVAL_FALSE(&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/sybase/php_sybase_db.c diff -u php4/ext/sybase/php_sybase_db.c:1.18 php4/ext/sybase/php_sybase_db.c:1.19 --- php4/ext/sybase/php_sybase_db.c:1.18 Wed Jul 11 07:39:09 2001 +++ php4/ext/sybase/php_sybase_db.c Wed Jul 11 08:42:24 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_db.c,v 1.18 2001/07/11 11:39:09 zeev Exp $ */ +/* $Id: php_sybase_db.c,v 1.19 2001/07/11 12:42:24 thies Exp $ */ #ifdef HAVE_CONFIG_H @@ -617,7 +617,7 @@ *result_ptr = result; if (dbdatlen(sybase_ptr->link,offset) == 0) { - ZVAL_BOOL(result, 0); + ZVAL_FALSE(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)); - ZVAL_BOOL(result, 0); + ZVAL_FALSE(result); } } } Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.82 php4/ext/xml/xml.c:1.83 --- php4/ext/xml/xml.c:1.82 Wed Jul 11 07:39:10 2001 +++ php4/ext/xml/xml.c Wed Jul 11 08:42:24 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.82 2001/07/11 11:39:10 zeev Exp $ */ +/* $Id: xml.c,v 1.83 2001/07/11 12:42:24 thies Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -271,7 +271,7 @@ MAKE_STD_ZVAL(ret); if (s == NULL) { - ZVAL_BOOL(ret, 0); + ZVAL_FALSE(ret); return ret; } if (len == 0) { @@ -375,8 +375,7 @@ int result; MAKE_STD_ZVAL(retval); - retval->type = IS_BOOL; - retval->value.lval = 0; + ZVAL_FALSE(retval); result = call_user_function(EG(function_table), &parser->object, handler, retval, argc, argv);
Index: php4/ext/com/COM.c diff -u php4/ext/com/COM.c:1.28 php4/ext/com/COM.c:1.29 --- php4/ext/com/COM.c:1.28 Wed Jul 11 07:39:07 2001 +++ php4/ext/com/COM.c Wed Jul 11 08:42:21 2001 @@ -1321,7 +1321,7 @@ PHP_FN(com_load)(INTERNAL_FUNCTION_PARAM_PASSTHRU); if(!zend_is_true(return_value)) { - ZVAL_BOOL(object, 0); + ZVAL_FALSE(object); return; } ALLOC_ZVAL(object_handle); Index: php4/ext/com/conversion.c diff -u php4/ext/com/conversion.c:1.21 php4/ext/com/conversion.c:1.22 --- php4/ext/com/conversion.c:1.21 Wed Jul 11 07:39:07 2001 +++ php4/ext/com/conversion.c Wed Jul 11 08:42:21 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)"); - ZVAL_BOOL(pval_arg, 0); + ZVAL_FALSE(pval_arg); } else { @@ -473,7 +473,7 @@ if (1 != (Dims = SafeArrayGetDim(array))) { php_error(E_WARNING,"Unsupported: multi-dimensional (%d) SafeArrays", Dims); - ZVAL_BOOL(pval_arg, 0); + ZVAL_FALSE(pval_arg); return FAILURE; } SafeArrayLock( array); Index: php4/ext/com/VARIANT.c diff -u php4/ext/com/VARIANT.c:1.14 php4/ext/com/VARIANT.c:1.15 --- php4/ext/com/VARIANT.c:1.14 Wed Jul 11 07:39:07 2001 +++ php4/ext/com/VARIANT.c Wed Jul 11 08:42:21 2001 @@ -161,7 +161,7 @@ if(!zend_is_true(return_value)) { - ZVAL_BOOL(object, 0); + ZVAL_FALSE(object); return; } @@ -189,7 +189,7 @@ if(!var_arg || (type != IS_VARIANT)) { - ZVAL_BOOL(&result, 0); + ZVAL_FALSE(&result); } else { @@ -197,7 +197,7 @@ switch(overloaded_property->type) { case OE_IS_ARRAY: - ZVAL_BOOL(&result, 0); + ZVAL_FALSE(&result); break; case OE_IS_OBJECT: @@ -211,12 +211,12 @@ } else { - ZVAL_BOOL(&result, 0); + ZVAL_FALSE(&result); php_error(E_WARNING, "Unknown member."); } break; case OE_IS_METHOD: - ZVAL_BOOL(&result, 0); + ZVAL_FALSE(&result); php_error(E_WARNING, "Unknown method."); break; Index: php4/ext/java/java.c diff -u php4/ext/java/java.c:1.45 php4/ext/java/java.c:1.46 --- php4/ext/java/java.c:1.45 Wed Jul 11 07:39:07 2001 +++ php4/ext/java/java.c Wed Jul 11 08:42:21 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: java.c,v 1.45 2001/07/11 11:39:07 zeev Exp $ */ +/* $Id: java.c,v 1.46 2001/07/11 12:42:21 thies 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); - ZVAL_BOOL(value, 0); + ZVAL_FALSE(value); return 1; }; return 0; Index: php4/ext/msql/php_msql.c diff -u php4/ext/msql/php_msql.c:1.35 php4/ext/msql/php_msql.c:1.36 --- php4/ext/msql/php_msql.c:1.35 Wed Jul 11 07:39:08 2001 +++ php4/ext/msql/php_msql.c Wed Jul 11 08:42:21 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_msql.c,v 1.35 2001/07/11 11:39:08 zeev Exp $ */ +/* $Id: php_msql.c,v 1.36 2001/07/11 12:42:21 thies 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 { - ZVAL_BOOL(return_value, 0); + ZVAL_FALSE(return_value); } return_value->type = IS_STRING; @@ -1211,7 +1211,7 @@ return_value->value.str.len = 11; return_value->type = IS_STRING; } else { - ZVAL_BOOL(return_value, 0); + ZVAL_FALSE(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 { - ZVAL_BOOL(return_value, 0); + ZVAL_FALSE(return_value); } #endif break; Index: php4/ext/mssql/php_mssql.c diff -u php4/ext/mssql/php_mssql.c:1.54 php4/ext/mssql/php_mssql.c:1.55 --- php4/ext/mssql/php_mssql.c:1.54 Wed Jul 11 07:39:08 2001 +++ php4/ext/mssql/php_mssql.c Wed Jul 11 08:42:22 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.54 2001/07/11 11:39:08 zeev Exp $ */ +/* $Id: php_mssql.c,v 1.55 2001/07/11 12:42:22 thies 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)); - ZVAL_BOOL(result, 0); + ZVAL_FALSE(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)); - ZVAL_BOOL(result, 0); + ZVAL_FALSE(result); } } Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.133 php4/ext/oci8/oci8.c:1.134 --- php4/ext/oci8/oci8.c:1.133 Mon Jul 9 14:01:18 2001 +++ php4/ext/oci8/oci8.c Wed Jul 11 08:42:22 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.133 2001/07/09 18:01:18 thies Exp $ */ +/* $Id: oci8.c,v 1.134 2001/07/11 12:42:22 thies Exp $ */ /* TODO list: * @@ -581,7 +581,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.133 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.134 $"); #ifndef PHP_WIN32 php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION ); php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR ); @@ -1174,7 +1174,7 @@ } if (oci_loadlob(statement->conn,descr,&buffer,&loblen)) { - ZVAL_BOOL(value,0); + ZVAL_FALSE(value); } else { ZVAL_STRINGL(value,buffer,loblen,0); } @@ -1197,7 +1197,7 @@ default: /* XXX we SHOULD maybe have a different behaviour for unknown results! */ - ZVAL_BOOL(value,0); + ZVAL_FALSE(value); return 0; } Index: php4/ext/standard/assert.c diff -u php4/ext/standard/assert.c:1.32 php4/ext/standard/assert.c:1.33 --- php4/ext/standard/assert.c:1.32 Mon Jul 9 06:20:39 2001 +++ php4/ext/standard/assert.c Wed Jul 11 08:42:22 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: assert.c,v 1.32 2001/07/09 10:20:39 thies Exp $ */ +/* $Id: assert.c,v 1.33 2001/07/11 12:42:22 thies Exp $ */ /* {{{ includes/startup/misc */ @@ -201,7 +201,7 @@ ZVAL_STRING(args[2],SAFE_STRING(myeval),1); MAKE_STD_ZVAL(retval); - ZVAL_BOOL(retval,0); + ZVAL_FALSE(retval); /* XXX do we want to check for error here? */ call_user_function(CG(function_table), NULL, ASSERT(callback), retval, 3, args); Index: php4/ext/standard/url.c diff -u php4/ext/standard/url.c:1.41 php4/ext/standard/url.c:1.42 --- php4/ext/standard/url.c:1.41 Wed Jul 11 07:39:08 2001 +++ php4/ext/standard/url.c Wed Jul 11 08:42:22 2001 @@ -15,7 +15,7 @@ | Author: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: url.c,v 1.41 2001/07/11 11:39:08 zeev Exp $ */ +/* $Id: url.c,v 1.42 2001/07/11 12:42:22 thies Exp $ */ #include <stdlib.h> #include <string.h> @@ -295,7 +295,7 @@ convert_to_string_ex(arg); if (!(*arg)->value.str.len) { - ZVAL_BOOL(return_value, 0); + ZVAL_FALSE(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) { - ZVAL_BOOL(return_value, 0); + ZVAL_FALSE(return_value); return; } Index: php4/ext/sybase_ct/php_sybase_ct.c diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.50 php4/ext/sybase_ct/php_sybase_ct.c:1.51 --- php4/ext/sybase_ct/php_sybase_ct.c:1.50 Wed Jul 11 07:39:10 2001 +++ php4/ext/sybase_ct/php_sybase_ct.c Wed Jul 11 08:42:23 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.50 2001/07/11 11:39:10 zeev Exp $ */ +/* $Id: php_sybase_ct.c,v 1.51 2001/07/11 12:42:23 thies 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 */ - ZVAL_BOOL(&result->data[i][j], 0); + ZVAL_FALSE(&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/sybase/php_sybase_db.c diff -u php4/ext/sybase/php_sybase_db.c:1.18 php4/ext/sybase/php_sybase_db.c:1.19 --- php4/ext/sybase/php_sybase_db.c:1.18 Wed Jul 11 07:39:09 2001 +++ php4/ext/sybase/php_sybase_db.c Wed Jul 11 08:42:24 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_db.c,v 1.18 2001/07/11 11:39:09 zeev Exp $ */ +/* $Id: php_sybase_db.c,v 1.19 2001/07/11 12:42:24 thies Exp $ */ #ifdef HAVE_CONFIG_H @@ -617,7 +617,7 @@ *result_ptr = result; if (dbdatlen(sybase_ptr->link,offset) == 0) { - ZVAL_BOOL(result, 0); + ZVAL_FALSE(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)); - ZVAL_BOOL(result, 0); + ZVAL_FALSE(result); } } } Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.82 php4/ext/xml/xml.c:1.83 --- php4/ext/xml/xml.c:1.82 Wed Jul 11 07:39:10 2001 +++ php4/ext/xml/xml.c Wed Jul 11 08:42:24 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.82 2001/07/11 11:39:10 zeev Exp $ */ +/* $Id: xml.c,v 1.83 2001/07/11 12:42:24 thies Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -271,7 +271,7 @@ MAKE_STD_ZVAL(ret); if (s == NULL) { - ZVAL_BOOL(ret, 0); + ZVAL_FALSE(ret); return ret; } if (len == 0) { @@ -375,8 +375,7 @@ int result; MAKE_STD_ZVAL(retval); - retval->type = IS_BOOL; - retval->value.lval = 0; + ZVAL_FALSE(retval); result = call_user_function(EG(function_table), &parser->object, handler, retval, argc, argv);