From: Ulf Wendel <uw@php.net>
Date: Tue, 5 Oct 2010 08:29:54 +0000 (+0000)
Subject: Fix warnings
X-Git-Tag: php-5.4.0alpha1~191^2~836
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3dfb5694969b6db5df6121ad4102e430be2d5e6;p=php

Fix warnings

ext\mysqlnd\mysqlnd_result_meta.c(57) : warning C4090: 'initializing' : different 'const' qualifiers
ext\mysqlnd\mysqlnd_result_meta.c(64) : warning C4090: 'initializing' : different 'const' qualifiers
ext\mysqli\mysqli_report.c(50) : warning C4013: 'php_mysqli_throw_sql_exception' undefined; assuming extern returning int
---

diff --git a/ext/mysqli/mysqli_report.c b/ext/mysqli/mysqli_report.c
index 6139ebe775..6cd5e74a42 100644
--- a/ext/mysqli/mysqli_report.c
+++ b/ext/mysqli/mysqli_report.c
@@ -27,6 +27,8 @@
 #include "ext/standard/info.h"
 #include "php_mysqli_structs.h"
 
+extern void php_mysqli_throw_sql_exception(char *sqlstate, int errorno TSRMLS_DC, char *format, ...);
+
 /* {{{ proto bool mysqli_report(int flags)
    sets report level */
 PHP_FUNCTION(mysqli_report)
diff --git a/ext/mysqlnd/mysqlnd_result_meta.c b/ext/mysqlnd/mysqlnd_result_meta.c
index 4cf2a72fb1..f4a71cddec 100644
--- a/ext/mysqlnd/mysqlnd_result_meta.c
+++ b/ext/mysqlnd/mysqlnd_result_meta.c
@@ -54,14 +54,14 @@ php_mysqlnd_free_field_metadata(MYSQLND_FIELD *meta, zend_bool persistent TSRMLS
 static zend_bool
 mysqlnd_is_key_numeric(const char * key, size_t length, long *idx)
 {
-	register char * tmp = key;
+	register const char * tmp = key;
 
 	if (*tmp=='-') {
 		tmp++;
 	}
 	if ((*tmp>='0' && *tmp<='9')) {
 		do { /* possibly a numeric index */
-			char *end=key+length-1;
+			const char *end=key+length-1;
 
 			if (*tmp++=='0' && length>2) { /* don't accept numbers with leading zeros */
 				break;
@@ -454,7 +454,7 @@ MYSQLND_METHOD(mysqlnd_res_meta, field_tell)(const MYSQLND_RES_METADATA * const
 /* }}} */
 
 
-static 
+static
 MYSQLND_CLASS_METHODS_START(mysqlnd_res_meta)
 	MYSQLND_METHOD(mysqlnd_res_meta, fetch_field),
 	MYSQLND_METHOD(mysqlnd_res_meta, fetch_field_direct),