From: Anatol Belski <ab@php.net>
Date: Thu, 23 Oct 2014 09:45:44 +0000 (+0200)
Subject: fix datatype mismatches
X-Git-Tag: POST_NATIVE_TLS_MERGE^2~49^2~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=88ca46d92bc1c426e7c7f7313f0fd2b7dcc33cf6;p=php

fix datatype mismatches
---

diff --git a/Zend/zend_highlight.c b/Zend/zend_highlight.c
index 26c34686a6..79a552635f 100644
--- a/Zend/zend_highlight.c
+++ b/Zend/zend_highlight.c
@@ -54,7 +54,7 @@ ZEND_API void zend_html_putc(char c)
 }
 
 
-ZEND_API void zend_html_puts(const char *s, uint len TSRMLS_DC)
+ZEND_API void zend_html_puts(const char *s, size_t len TSRMLS_DC)
 {
 	const unsigned char *ptr = (const unsigned char*)s, *end = ptr + len;
 	unsigned char *filtered = NULL;
diff --git a/Zend/zend_highlight.h b/Zend/zend_highlight.h
index 1a35505135..3e91fd71f4 100644
--- a/Zend/zend_highlight.h
+++ b/Zend/zend_highlight.h
@@ -44,7 +44,7 @@ ZEND_API void zend_strip(TSRMLS_D);
 ZEND_API int highlight_file(char *filename, zend_syntax_highlighter_ini *syntax_highlighter_ini TSRMLS_DC);
 ZEND_API int highlight_string(zval *str, zend_syntax_highlighter_ini *syntax_highlighter_ini, char *str_name TSRMLS_DC);
 ZEND_API void zend_html_putc(char c);
-ZEND_API void zend_html_puts(const char *s, uint len TSRMLS_DC);
+ZEND_API void zend_html_puts(const char *s, size_t len TSRMLS_DC);
 END_EXTERN_C()
 
 extern zend_syntax_highlighter_ini syntax_highlighter_ini;
diff --git a/ext/standard/info.c b/ext/standard/info.c
index bc0ddddcc0..7a118af7b4 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -61,9 +61,9 @@ PHPAPI extern char *php_ini_opened_path;
 PHPAPI extern char *php_ini_scanned_path;
 PHPAPI extern char *php_ini_scanned_files;
 
-static int php_info_print_html_esc(const char *str, int len) /* {{{ */
+static int php_info_print_html_esc(const char *str, size_t len) /* {{{ */
 {
-	int written;
+	size_t written;
 	zend_string *new_str;
 	TSRMLS_FETCH();
 
@@ -77,7 +77,7 @@ static int php_info_print_html_esc(const char *str, int len) /* {{{ */
 static int php_info_printf(const char *fmt, ...) /* {{{ */
 {
 	char *buf;
-	int len, written;
+	size_t len, written;
 	va_list argv;
 	TSRMLS_FETCH();
 
@@ -1026,7 +1026,7 @@ PHPAPI void php_info_print_table_colspan_header(int num_cols, char *header) /* {
 	if (!sapi_module.phpinfo_as_text) {
 		php_info_printf("<tr class=\"h\"><th colspan=\"%d\">%s</th></tr>\n", num_cols, header );
 	} else {
-		spaces = (74 - strlen(header));
+		spaces = (int)(74 - strlen(header));
 		php_info_printf("%*s%s%*s\n", (int)(spaces/2), " ", header, (int)(spaces/2), " ");
 	}
 }
@@ -1176,7 +1176,7 @@ PHP_FUNCTION(phpinfo)
 
 	/* Andale!  Andale!  Yee-Hah! */
 	php_output_start_default(TSRMLS_C);
-	php_print_info(flag TSRMLS_CC);
+	php_print_info((int)flag TSRMLS_CC);
 	php_output_end(TSRMLS_C);
 
 	RETURN_TRUE;
@@ -1218,7 +1218,7 @@ PHP_FUNCTION(phpcredits)
 		return;
 	}
 
-	php_print_credits(flag TSRMLS_CC);
+	php_print_credits((int)flag TSRMLS_CC);
 	RETURN_TRUE;
 }
 /* }}} */