iliaa Mon Mar 21 20:45:17 2005 EDT
Modified files:
/php-src/ext/standard array.c
Log:
Simplify argument checking code for array_combine().
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.295&r2=1.296&ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.295 php-src/ext/standard/array.c:1.296
--- php-src/ext/standard/array.c:1.295 Sat Mar 19 09:24:17 2005
+++ php-src/ext/standard/array.c Mon Mar 21 20:45:17 2005
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.295 2005/03/19 14:24:17 helly Exp $ */
+/* $Id: array.c,v 1.296 2005/03/22 01:45:17 iliaa Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -4366,17 +4366,16 @@
return;
}
- if (zend_hash_num_elements(Z_ARRVAL_P(keys)) == 0 ||
zend_hash_num_elements(Z_ARRVAL_P(values)) == 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Both parameters
should have at least 1 element");
+ if (zend_hash_num_elements(Z_ARRVAL_P(keys)) !=
zend_hash_num_elements(Z_ARRVAL_P(values))) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Both parameters
should have equal number of elements");
RETURN_FALSE;
}
-
- if (zend_hash_num_elements(Z_ARRVAL_P(keys)) !=
zend_hash_num_elements(Z_ARRVAL_P(values))) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Both parameters
should have equal number of elements");
+ if (!zend_hash_num_elements(Z_ARRVAL_P(keys))) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Both parameters
should have at least 1 element");
RETURN_FALSE;
}
-
+
array_init(return_value);
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(keys), &pos_keys);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
