cvs: ZendEngine2(PHP_5_3) / zend_hash.c

tony2001		Thu Aug  7 11:51:55 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /ZendEngine2	zend_hash.c 
  Log:
  fix WS
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_hash.c?r1=1.121.2.4.2.8.2.5&r2=1.121.2.4.2.8.2.6&diff_format=u
Index: ZendEngine2/zend_hash.c
diff -u ZendEngine2/zend_hash.c:1.121.2.4.2.8.2.5 ZendEngine2/zend_hash.c:1.121.2.4.2.8.2.6
--- ZendEngine2/zend_hash.c:1.121.2.4.2.8.2.5	Thu Aug  7 11:45:35 2008
+++ ZendEngine2/zend_hash.c	Thu Aug  7 11:51:54 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_hash.c,v 1.121.2.4.2.8.2.5 2008/08/07 11:45:35 dmitry Exp $ */
+/* $Id: zend_hash.c,v 1.121.2.4.2.8.2.6 2008/08/07 11:51:54 tony2001 Exp $ */
 
 #include "zend.h"
 
@@ -1193,28 +1193,28 @@
 					if (q == p) {
 						found = 1;
 					} else if (!q->nKeyLength && q->h == num_index) {
-					    if (found) {
-					    	if (mode & HASH_UPDATE_KEY_IF_BEFORE) {
-					    		break;
-					    	} else {
-					    		if (p->nKeyLength) {
+						if (found) {
+							if (mode & HASH_UPDATE_KEY_IF_BEFORE) {
+								break;
+							} else {
+								if (p->nKeyLength) {
 									zend_hash_del(ht, p->arKey, p->nKeyLength);
 								} else {
 									zend_hash_index_del(ht, p->h);
 								}
-					    		return FAILURE;
-					    	}
-					    } else {
-					    	if (mode & HASH_UPDATE_KEY_IF_AFTER) {
-					    		break;
-					    	} else {
-					    		if (p->nKeyLength) {
+								return FAILURE;
+							}
+						} else {
+							if (mode & HASH_UPDATE_KEY_IF_AFTER) {
+								break;
+							} else {
+								if (p->nKeyLength) {
 									zend_hash_del(ht, p->arKey, p->nKeyLength);
 								} else {
 									zend_hash_index_del(ht, p->h);
 								}
-					    		return FAILURE;
-					    	}
+								return FAILURE;
+							}
 						}
 					}
 					q = q->pNext;
@@ -1239,27 +1239,27 @@
 					} else if (q->h == h && q->nKeyLength == str_length && 
 					           memcmp(q->arKey, str_index, str_length) == 0) {
 					    if (found) {
-					    	if (mode & HASH_UPDATE_KEY_IF_BEFORE) {
-					    		break;
-					    	} else {
-					    		if (p->nKeyLength) {
+							if (mode & HASH_UPDATE_KEY_IF_BEFORE) {
+								break;
+							} else {
+								if (p->nKeyLength) {
 									zend_hash_del(ht, p->arKey, p->nKeyLength);
 								} else {
 									zend_hash_index_del(ht, p->h);
 								}
-					    		return FAILURE;
-					    	}
-					    } else {
-					    	if (mode & HASH_UPDATE_KEY_IF_AFTER) {
-					    		break;
-					    	} else {
-					    		if (p->nKeyLength) {
+								return FAILURE;
+							}
+						} else {
+							if (mode & HASH_UPDATE_KEY_IF_AFTER) {
+								break;
+							} else {
+								if (p->nKeyLength) {
 									zend_hash_del(ht, p->arKey, p->nKeyLength);
 								} else {
 									zend_hash_index_del(ht, p->h);
 								}
-					    		return FAILURE;
-					    	}
+								return FAILURE;
+							}
 						}
 					}
 					q = q->pNext;



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