cvs: php-src /ext/spl spl_array.c spl_heap.c

tony2001 Tue May 20 12:04:37 2008 UTC Modified files: /php-src/ext/spl spl_array.c spl_heap.c Log: nuke unused variables http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.138&r2=1.139&diff_format=u Index: php-src/ext/spl/spl_array.c diff -u php-src/ext/spl/spl_array.c:1.138 php-src/ext/spl/spl_array.c:1.139 --- php-src/ext/spl/spl_array.c:1.138 Tue May 6 22:59:59 2008 +++ php-src/ext/spl/spl_array.c Tue May 20 12:04:37 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_array.c,v 1.138 2008/05/06 22:59:59 colder Exp $ */ +/* $Id: spl_array.c,v 1.139 2008/05/20 12:04:37 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -1443,8 +1443,7 @@ zval *object = getThis(); spl_array_object *intern = (spl_array_object*)zend_object_store_get_object(object TSRMLS_CC); HashTable *aht = spl_array_get_hash_table(intern, 0 TSRMLS_CC); - zval **entry, members, *pmembers; - HashPosition pos; + zval members, *pmembers; php_serialize_data_t var_hash; smart_str buf = {0}; @@ -1494,7 +1493,7 @@ int buf_len; const unsigned char *p, *s; php_unserialize_data_t var_hash; - zval *pentry, *pmembers, *pflags = NULL; + zval *pmembers, *pflags = NULL; long flags; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &buf, &buf_len) == FAILURE) { http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_heap.c?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/spl/spl_heap.c diff -u php-src/ext/spl/spl_heap.c:1.4 php-src/ext/spl/spl_heap.c:1.5 --- php-src/ext/spl/spl_heap.c:1.4 Thu May 15 17:05:20 2008 +++ php-src/ext/spl/spl_heap.c Tue May 20 12:04:37 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_heap.c,v 1.4 2008/05/15 17:05:20 colder Exp $ */ +/* $Id: spl_heap.c,v 1.5 2008/05/20 12:04:37 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -755,11 +755,11 @@ RETURN_LONG(intern->flags); } /* }}} */ + /* {{{ proto int SplPriorityQueue::getExtractFlags($flags) U Set the flags of extraction*/ SPL_METHOD(SplPriorityQueue, getExtractFlags) { - long value; spl_heap_object *intern; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {