sterling                Wed Oct  9 13:15:57 2002 EDT

  Modified files:              
    /php4/ext/standard  array.c 
  Log:
  small cleanups...
  
  
Index: php4/ext/standard/array.c
diff -u php4/ext/standard/array.c:1.194 php4/ext/standard/array.c:1.195
--- php4/ext/standard/array.c:1.194     Sat Sep 21 12:10:33 2002
+++ php4/ext/standard/array.c   Wed Oct  9 13:15:56 2002
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: array.c,v 1.194 2002/09/21 16:10:33 andrey Exp $ */
+/* $Id: array.c,v 1.195 2002/10/09 17:15:56 sterling Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -246,12 +246,9 @@
 {
        long cnt = 0;
        zval **element;
-       HashTable *target_hash;
-
-       target_hash = HASH_OF(array);
 
        if (Z_TYPE_P(array) == IS_ARRAY) {
-               cnt += zend_hash_num_elements(target_hash);
+               cnt = zend_hash_num_elements(Z_ARRVAL_P(array));
                if (mode == COUNT_RECURSIVE) {
                        HashPosition pos;
 



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

Reply via email to