From: Nuno Lopes <nlopess@php.net>
Date: Sat, 29 Sep 2007 11:26:51 +0000 (+0000)
Subject: MFB: fix compiler warnings
X-Git-Tag: RELEASE_2_0_0a1~1711
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b514dc1070aae88d0ce21da1e78dede481c938ce;p=php

MFB: fix compiler warnings
---

diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 768f49758d..9595a0304f 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -464,7 +464,7 @@ static inline int php_openssl_enable_crypto(php_stream *stream,
 								"ssl", "peer_certificate",
 								zcert);
 						peer_cert = NULL;
-						efree(zcert);
+						FREE_ZVAL(zcert);
 					}
 
 					if (SUCCESS == php_stream_context_get_option(
@@ -490,8 +490,8 @@ static inline int php_openssl_enable_crypto(php_stream *stream,
 										zend_list_insert(mycert,
 											php_openssl_get_x509_list_id()));
 								add_next_index_zval(arr, zcert);
+								FREE_ZVAL(zcert);
 							}
-							efree(zcert);
 						} else {
 							ZVAL_NULL(arr);
 						}
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index 6784a15554..a5300878fe 100644
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -388,7 +388,7 @@ static inline int object_custom(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
 	}
 
 	if (datalen < 0 || (*p) + datalen >= max) {
-		zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, max - (*p));
+		zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, (long)(max - (*p)));
 		return 0;
 	}
 
diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
index ea53001feb..0aca9a657a 100644
--- a/ext/standard/var_unserializer.re
+++ b/ext/standard/var_unserializer.re
@@ -392,7 +392,7 @@ static inline int object_custom(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
 	}
 
 	if (datalen < 0 || (*p) + datalen >= max) {
-		zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, max - (*p));
+		zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, (long)(max - (*p)));
 		return 0;
 	}
 
diff --git a/sapi/cli/php_cli_readline.c b/sapi/cli/php_cli_readline.c
index d1e344f47d..ff79016984 100644
--- a/sapi/cli/php_cli_readline.c
+++ b/sapi/cli/php_cli_readline.c
@@ -423,7 +423,7 @@ TODO:
 
 - future: respect scope ("php > function foo() { $[tab]" should only expand to local variables...)
 */
-	char *retval;
+	char *retval = NULL;
 	int textlen = strlen(text);
 	TSRMLS_FETCH();