diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2014-05-15 19:48:31 +0200 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2014-05-15 19:48:31 +0200 |
| commit | f87d5001fc8bebb6dc3a4789697107c1a1e6d336 (patch) | |
| tree | 982d518d7ffac8f6ed5e72ed242d1b41fd7006f2 | |
| parent | 19f6476d197353acb74a2fa0a459afa830a4da6d (diff) | |
| parent | 16d3d5dc536bc461bb6aa88d640efb123ae9fdf4 (diff) | |
| download | php-git-f87d5001fc8bebb6dc3a4789697107c1a1e6d336.tar.gz | |
Merge branch 'phpng' of git.php.net:php-src into phpng
# By Dmitry Stogov
# Via Dmitry Stogov
* 'phpng' of git.php.net:php-src:
Fixed wrong comparisons
| -rw-r--r-- | main/output.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/output.c b/main/output.c index d33e418277..2531dee2ab 100644 --- a/main/output.c +++ b/main/output.c @@ -645,15 +645,15 @@ PHPAPI int php_output_handler_reverse_conflict_register(const char *name, size_t return FAILURE; } - if (SUCCESS == (rev_ptr = zend_hash_str_find_ptr(&php_output_handler_reverse_conflicts, name, name_len))) { + if (NULL != (rev_ptr = zend_hash_str_find_ptr(&php_output_handler_reverse_conflicts, name, name_len))) { return zend_hash_next_index_insert_ptr(rev_ptr, check_func) ? SUCCESS : FAILURE; } else { zend_hash_init(&rev, 8, NULL, NULL, 1); - if (SUCCESS != zend_hash_next_index_insert_ptr(&rev, check_func)) { + if (NULL == zend_hash_next_index_insert_ptr(&rev, check_func)) { zend_hash_destroy(&rev); return FAILURE; } - if (SUCCESS != zend_hash_str_update_mem(&php_output_handler_reverse_conflicts, name, name_len+1, &rev, sizeof(HashTable))) { + if (NULL == zend_hash_str_update_mem(&php_output_handler_reverse_conflicts, name, name_len+1, &rev, sizeof(HashTable))) { zend_hash_destroy(&rev); return FAILURE; } |