[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/Zend/zend_hash.c branches/PHP_5_3/Zend/zend_hash.c trunk/Zend/zend_hash.c

[Felipe Pena]

felipe                                   Mon, 03 May 2010 16:36:04 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=298914

Log:
- Replaced 'zend_hash_find' to 'zend_hash_quick_find' on zend_hash_compare() 
function

Changed paths:
    U   php/php-src/branches/PHP_5_2/Zend/zend_hash.c
    U   php/php-src/branches/PHP_5_3/Zend/zend_hash.c
    U   php/php-src/trunk/Zend/zend_hash.c

Modified: php/php-src/branches/PHP_5_2/Zend/zend_hash.c
===================================================================
--- php/php-src/branches/PHP_5_2/Zend/zend_hash.c       2010-05-03 16:31:27 UTC 
(rev 298913)
+++ php/php-src/branches/PHP_5_2/Zend/zend_hash.c       2010-05-03 16:36:04 UTC 
(rev 298914)
@@ -1379,7 +1379,7 @@
                                        return 1;
                                }
                        } else { /* string index */
-                               if (zend_hash_find(ht2, p1->arKey, 
p1->nKeyLength, &pData2)==FAILURE) {
+                               if (zend_hash_quick_find(ht2, p1->arKey, 
p1->nKeyLength, p1->h, &pData2)==FAILURE) {
                                        HASH_UNPROTECT_RECURSION(ht1);
                                        HASH_UNPROTECT_RECURSION(ht2);
                                        return 1;

Modified: php/php-src/branches/PHP_5_3/Zend/zend_hash.c
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/zend_hash.c       2010-05-03 16:31:27 UTC 
(rev 298913)
+++ php/php-src/branches/PHP_5_3/Zend/zend_hash.c       2010-05-03 16:36:04 UTC 
(rev 298914)
@@ -1455,7 +1455,7 @@
                                        return 1;
                                }
                        } else { /* string index */
-                               if (zend_hash_find(ht2, p1->arKey, 
p1->nKeyLength, &pData2)==FAILURE) {
+                               if (zend_hash_quick_find(ht2, p1->arKey, 
p1->nKeyLength, p1->h, &pData2)==FAILURE) {
                                        HASH_UNPROTECT_RECURSION(ht1);
                                        HASH_UNPROTECT_RECURSION(ht2);
                                        return 1;

Modified: php/php-src/trunk/Zend/zend_hash.c
===================================================================
--- php/php-src/trunk/Zend/zend_hash.c  2010-05-03 16:31:27 UTC (rev 298913)
+++ php/php-src/trunk/Zend/zend_hash.c  2010-05-03 16:36:04 UTC (rev 298914)
@@ -1477,7 +1477,7 @@
                                        return 1;
                                }
                        } else { /* string index */
-                               if (zend_hash_find(ht2, p1->arKey, 
p1->nKeyLength, &pData2)==FAILURE) {
+                               if (zend_hash_quick_find(ht2, p1->arKey, 
p1->nKeyLength, p1->h, &pData2)==FAILURE) {
                                        HASH_UNPROTECT_RECURSION(ht1);
                                        HASH_UNPROTECT_RECURSION(ht2);
                                        return 1;


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php