From: Xinchen Hui <laruence@php.net>
Date: Tue, 9 Aug 2011 05:11:19 +0000 (+0000)
Subject: Eliminated compiler's warnings and make static analyzer silent
X-Git-Tag: php-5.4.0beta1~464
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d09d0c83cb5419422c4e30e5a541d84e5438c624;p=php

Eliminated compiler's warnings and make static analyzer silent
---

diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c
index 6d8525c557..f173fb5ed6 100644
--- a/ext/fileinfo/fileinfo.c
+++ b/ext/fileinfo/fileinfo.c
@@ -388,7 +388,7 @@ static void _php_finfo_get_type(INTERNAL_FUNCTION_PARAMETERS, int mode, int mime
 	long options = 0;
 	char *ret_val = NULL, *buffer = NULL;
 	int buffer_len;
-	struct php_fileinfo *finfo;
+	struct php_fileinfo *finfo = NULL;
 	zval *zfinfo, *zcontext = NULL;
 	zval *what;
 	char mime_directory[] = "directory";
diff --git a/ext/fileinfo/libmagic.patch b/ext/fileinfo/libmagic.patch
index 276bb011c5..a834c0039f 100644
--- a/ext/fileinfo/libmagic.patch
+++ b/ext/fileinfo/libmagic.patch
@@ -2020,9 +2020,9 @@ diff -u libmagic.orig/magic.c libmagic/magic.c
 +	if (!stream && inname) {
 +		no_in_stream = 1;
 +#if PHP_API_VERSION < 20100412
-+		stream = php_stream_open_wrapper(inname, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL);
++		stream = php_stream_open_wrapper((char *)inname, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL);
 +#else
-+		stream = php_stream_open_wrapper(inname, "rb", REPORT_ERRORS, NULL);
++		stream = php_stream_open_wrapper((char *)inname, "rb", REPORT_ERRORS, NULL);
 +#endif
 +	}
 +
diff --git a/ext/fileinfo/libmagic/magic.c b/ext/fileinfo/libmagic/magic.c
index a8bf6d8880..51cc67209c 100644
--- a/ext/fileinfo/libmagic/magic.c
+++ b/ext/fileinfo/libmagic/magic.c
@@ -291,9 +291,9 @@ file_or_stream(struct magic_set *ms, const char *inname, php_stream *stream)
 	if (!stream && inname) {
 		no_in_stream = 1;
 #if PHP_API_VERSION < 20100412
-		stream = php_stream_open_wrapper(inname, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL);
+		stream = php_stream_open_wrapper((char *)inname, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL);
 #else
-		stream = php_stream_open_wrapper(inname, "rb", REPORT_ERRORS, NULL);
+		stream = php_stream_open_wrapper((char *)inname, "rb", REPORT_ERRORS, NULL);
 #endif
 	}