com php-src: Fixed new hash API usage: ext/opcache/Optimizer/bl ock_pass.c ext/opcache/Optimizer/compact_literals.c
| From: | Dmitry Stogov | Date: | Sat, 17 May 2014 07:48:29 +0000 |
| Subject: | com php-src: Fixed new hash API usage: ext/opcache/Optimizer/bl ock_pass.c ext/opcache/Optimizer/compact_literals.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78426@lists.php.net to get a copy of this message | ||
Commit: feeebc2e05f79f598a52e8cf9cd5ac732d920887
Author: Dmitry Stogov <dmitry@zend.com> Sat, 17 May 2014 11:48:29 +0400
Parents: e9eb642a36595afb860d88697e6354f36b71eb6f
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=feeebc2e05f79f598a52e8cf9cd5ac732d920887
Log:
Fixed new hash API usage
Changed paths:
M ext/opcache/Optimizer/block_pass.c
M ext/opcache/Optimizer/compact_literals.c
Diff:
diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c
index f108012..3316e52 100644
--- a/ext/opcache/Optimizer/block_pass.c
+++ b/ext/opcache/Optimizer/block_pass.c
@@ -751,7 +751,7 @@ static void zend_optimize_block(zend_code_block *block, zend_op_array *op_array,
(flen == sizeof("is_callable")-1 && zend_binary_strcasecmp(fname, flen,
"is_callable", sizeof("is_callable")-1) == 0)
) {
zend_function *function;
- if(zend_hash_find(EG(function_table), Z_STRVAL_P(arg), Z_STRLEN_P(arg)+1, (void
**)&function) == SUCCESS) {
+ if(zend_hash_find(EG(function_table), Z_STRVAL_P(arg), Z_STRLEN_P(arg)+1, (void
**)&function) != NULL) {
literal_dtor(arg);
MAKE_NOP(sv);
MAKE_NOP(fcall);
diff --git a/ext/opcache/Optimizer/compact_literals.c b/ext/opcache/Optimizer/compact_literals.c
index 80a75f5..aad6243 100644
--- a/ext/opcache/Optimizer/compact_literals.c
+++ b/ext/opcache/Optimizer/compact_literals.c
@@ -324,7 +324,7 @@ static void optimizer_compact_literals(zend_op_array *op_array TSRMLS_DC)
map[i] = l_true;
break;
case IS_LONG:
- if ((pos = zend_hash_index_find(&hash, Z_LVAL(op_array->literals[i]))) != 0) {
+ if ((pos = zend_hash_index_find(&hash, Z_LVAL(op_array->literals[i]))) != NULL) {
map[i] = Z_LVAL_P(pos);
} else {
map[i] = j;
@@ -338,7 +338,7 @@ static void optimizer_compact_literals(zend_op_array *op_array TSRMLS_DC)
}
break;
case IS_DOUBLE:
- if ((pos = zend_hash_str_find(&hash, (char*)&Z_DVAL(op_array->literals[i]),
sizeof(double))) != 0) {
+ if ((pos = zend_hash_str_find(&hash, (char*)&Z_DVAL(op_array->literals[i]),
sizeof(double))) != NULL) {
map[i] = Z_LVAL_P(pos);
} else {
map[i] = j;
@@ -375,7 +375,7 @@ static void optimizer_compact_literals(zend_op_array *op_array TSRMLS_DC)
key->h += info[i].flags;
}
if ((info[i].flags & LITERAL_MAY_MERGE) &&
- (pos = zend_hash_find(&hash, key)) != 0 &&
+ (pos = zend_hash_find(&hash, key)) != NULL &&
Z_TYPE(op_array->literals[i]) == Z_TYPE(op_array->literals[Z_LVAL_P(pos)])
&&
info[i].flags == info[Z_LVAL_P(pos)].flags) {