com php-src: array_column: Fix compile-time warnings : ext/standard/array.c
| From: | David Soria Parra | Date: | Wed, 20 Mar 2013 01:44:19 +0000 |
| Subject: | com php-src: array_column: Fix compile-time warnings : ext/standard/array.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71653@lists.php.net to get a copy of this message | ||
Commit: f5bf1ba88fbacfebbb59b1e7bf43dd73649fa686
Author: Ben Ramsey <ramsey@php.net> Tue, 19 Mar 2013 20:44:19 -0500
Parents: 3439a098a0b646ff05d4da9748996214cac39d12
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f5bf1ba88fbacfebbb59b1e7bf43dd73649fa686
Log:
array_column: Fix compile-time warnings
Changed paths:
M ext/standard/array.c
Diff:
diff --git a/ext/standard/array.c b/ext/standard/array.c
index fa19737..6983764 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2571,9 +2571,9 @@ PHP_FUNCTION(array_column)
zval *zarray, *zcolumn, *zkey = NULL, **data, **zcolval, **zkeyval;
HashTable *arr_hash;
HashPosition pointer;
- ulong column_idx = 0, key_idx = 0, keyval_idx = 0;
+ ulong column_idx = 0, key_idx = 0;
char *column = NULL, *key = NULL, *keyval = NULL;
- int column_len = 0, key_len = 0;
+ int column_len = 0, key_len = 0, keyval_idx = -1;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "az|z", &zarray, &zcolumn,
&zkey) == FAILURE) {
return;
@@ -2640,13 +2640,13 @@ PHP_FUNCTION(array_column)
Z_ADDREF_PP(zcolval);
keyval = NULL;
- keyval_idx = NULL;
+ keyval_idx = -1;
if (zkey) {
if (key && zend_hash_find(Z_ARRVAL_PP(data), key, key_len + 1, (void**)&zkeyval) ==
FAILURE) {
- keyval_idx = NULL;
+ keyval_idx = -1;
} else if (!key && zend_hash_index_find(Z_ARRVAL_PP(data), key_idx,
(void**)&zkeyval) == FAILURE) {
- keyval_idx = NULL;
+ keyval_idx = -1;
} else {
switch (Z_TYPE_PP(zkeyval)) {
case IS_LONG:
@@ -2660,14 +2660,14 @@ PHP_FUNCTION(array_column)
keyval = Z_STRVAL_PP(zkeyval);
break;
default:
- keyval_idx = NULL;
+ keyval_idx = -1;
}
}
}
if (keyval) {
add_assoc_zval(return_value, keyval, *zcolval);
- } else if (keyval_idx != NULL) {
+ } else if (keyval_idx != -1) {
add_index_zval(return_value, keyval_idx, *zcolval);
} else {
add_next_index_zval(return_value, *zcolval);