cvs: ZendEngine2 / zend_hash.c

tony2001		Thu Aug  7 11:50:51 2008 UTC

  Modified files:              
    /ZendEngine2	zend_hash.c 
  Log:
  fix WS
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_hash.c?r1=1.158&r2=1.159&diff_format=u
Index: ZendEngine2/zend_hash.c
diff -u ZendEngine2/zend_hash.c:1.158 ZendEngine2/zend_hash.c:1.159
--- ZendEngine2/zend_hash.c:1.158	Thu Aug  7 11:45:00 2008
+++ ZendEngine2/zend_hash.c	Thu Aug  7 11:50:51 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_hash.c,v 1.158 2008/08/07 11:45:00 dmitry Exp $ */
+/* $Id: zend_hash.c,v 1.159 2008/08/07 11:50:51 tony2001 Exp $ */
 
 #include "zend.h"
 #include "zend_operators.h"
@@ -1670,28 +1670,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_u_hash_del(ht, p->key.type, ZSTR(p->key.arKey.s), 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_u_hash_del(ht, p->key.type, ZSTR(p->key.arKey.s), p->nKeyLength);
 								} else {
 									zend_hash_index_del(ht, p->h);
 								}
-					    		return FAILURE;
-					    	}
+								return FAILURE;
+							}
 						}
 					}
 					q = q->pNext;
@@ -1718,29 +1718,29 @@
 						found = 1;
 					} else if (q->h == h && q->nKeyLength == str_length && 
 					           q->key.type == key_type &&
-					           memcmp(q->key.arKey.s, str_index.v, real_length) == 0) {
-					    if (found) {
-					    	if (mode & HASH_UPDATE_KEY_IF_BEFORE) {
-					    		break;
-					    	} else {
-					    		if (p->nKeyLength) {
+							   memcmp(q->key.arKey.s, str_index.v, real_length) == 0) {
+						if (found) {
+							if (mode & HASH_UPDATE_KEY_IF_BEFORE) {
+								break;
+							} else {
+								if (p->nKeyLength) {
 									zend_u_hash_del(ht, p->key.type, ZSTR(p->key.arKey.s), 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_u_hash_del(ht, p->key.type, ZSTR(p->key.arKey.s), 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