Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:4814
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Date: Mon, 13 Oct 2003 12:53:28 +0100
To: internals@lists.php.net
Message-ID: <20031013115328.GE19957@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.4.1i
Subject: [PATCH] Zend warning fixes
From: jorton@redhat.com (Joe Orton)

* zend_ini_displayer_cb is declared static but never used;
maybe this is an error, otherwise #if 0 or remove it?
* alloc_globals_dtor is only used ifdef ZTS
* prevent unused variable warning in zend_hash_compare
(not a real problem)

Index: Zend/zend_ini.c
===================================================================
RCS file: /repository/Zend/Attic/zend_ini.c,v
retrieving revision 1.23.2.3
diff -u -r1.23.2.3 zend_ini.c
--- Zend/zend_ini.c	18 Jul 2003 12:03:50 -0000	1.23.2.3
+++ Zend/zend_ini.c	13 Oct 2003 11:50:19 -0000
@@ -304,6 +304,7 @@
 }
 
 
+#if 0
 static void zend_ini_displayer_cb(zend_ini_entry *ini_entry, int type)
 {
 	if (ini_entry->displayer) {
@@ -340,6 +341,7 @@
 		ZEND_WRITE(display_string, display_string_length);
 	}
 }
+#endif
 
 
 ZEND_INI_DISP(zend_ini_boolean_displayer_cb)
Index: Zend/zend_hash.c
===================================================================
RCS file: /repository/Zend/Attic/zend_hash.c,v
retrieving revision 1.87.4.5
diff -u -r1.87.4.5 zend_hash.c
--- Zend/zend_hash.c	12 Aug 2003 06:22:05 -0000	1.87.4.5
+++ Zend/zend_hash.c	13 Oct 2003 11:50:19 -0000
@@ -1175,7 +1175,7 @@
 
 ZEND_API int zend_hash_compare(HashTable *ht1, HashTable *ht2, compare_func_t compar, zend_bool ordered TSRMLS_DC)
 {
-	Bucket *p1, *p2;
+	Bucket *p1, *p2 = NULL;
 	int result;
 	void *pData2;
 
Index: Zend/zend.c
===================================================================
RCS file: /repository/Zend/Attic/zend.c,v
retrieving revision 1.162.2.13
diff -u -r1.162.2.13 zend.c
--- Zend/zend.c	22 Sep 2003 04:22:06 -0000	1.162.2.13
+++ Zend/zend.c	13 Oct 2003 11:50:19 -0000
@@ -384,10 +384,12 @@
 }
 
 
+#ifdef ZTS
 static void alloc_globals_dtor(zend_alloc_globals *alloc_globals_p TSRMLS_DC)
 {
 	shutdown_memory_manager(0, 1 TSRMLS_CC);
 }
+#endif
 
 
 #ifdef __FreeBSD__