File php-4.3.3-miscfix.patch of Package php4 - j0ke.net Open Build Service

File php-4.3.3-miscfix.patch of Package php4 (Revision 4442a8bc886a9b59228abb0128904551)

Currently displaying revision 4442a8bc886a9b59228abb0128904551, show latest

Miscellaneous fixes from GCC warnings, failed tests etc.

Adapted for >= PHP 4.3.6-rc3 by Robert Scheck

--- php-4.3.6/ext/mbstring/mbregex/mbregex.c.miscfix
+++ php-4.3.6/ext/mbstring/mbregex/mbregex.c
@@ -1448,7 +1448,7 @@
       /* If there is no previous pattern, char not special. */
       if (!laststart) {
 	snprintf(error_msg, ERROR_MSG_MAX_SIZE, 
-		 "invalid regular expression; there's no previous pattern, to which '%c' would define cardinality at %d", 
+		 "invalid regular expression; there's no previous pattern, to which '%c' would define cardinality at %ld", 
 		 c, p-pattern);
 	if (bufp->buffer) {
 		xfree(bufp->buffer);
@@ -2105,7 +2105,7 @@
       /* If there is no previous pattern, this is an invalid pattern.  */
       if (!laststart) {
 	snprintf(error_msg, ERROR_MSG_MAX_SIZE, 
-		 "invalid regular expression; there's no previous pattern, to which '{' would define cardinality at %d", 
+		 "invalid regular expression; there's no previous pattern, to which '{' would define cardinality at %ld", 
 		 p-pattern);
 	FREE_AND_RETURN(stackb, error_msg);
       }
--- php-4.3.6/Zend/zend_ini.c.miscfix
+++ php-4.3.6/Zend/zend_ini.c
@@ -304,6 +304,7 @@
 }
 
 
+#if 0
 static void zend_ini_displayer_cb(zend_ini_entry *ini_entry, int type)
 {
 	if (ini_entry->displayer) {
@@ -340,7 +341,7 @@
 		ZEND_WRITE(display_string, display_string_length);
 	}
 }
-
+#endif
 
 ZEND_INI_DISP(zend_ini_boolean_displayer_cb)
 {
--- php-4.3.6/Zend/zend_hash.c.miscfix
+++ php-4.3.6/Zend/zend_hash.c
@@ -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;