uw Tue, 05 Oct 2010 08:29:54 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=304066
Log:
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
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_report.c
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result_meta.c
U php/php-src/trunk/ext/mysqli/mysqli_report.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_result_meta.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_report.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_report.c 2010-10-05
08:17:33 UTC (rev 304065)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_report.c 2010-10-05
08:29:54 UTC (rev 304066)
@@ -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)
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result_meta.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result_meta.c
2010-10-05 08:17:33 UTC (rev 304065)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result_meta.c
2010-10-05 08:29:54 UTC (rev 304066)
@@ -54,14 +54,14 @@
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 @@
/* }}} */
-static
+static
MYSQLND_CLASS_METHODS_START(mysqlnd_res_meta)
MYSQLND_METHOD(mysqlnd_res_meta, fetch_field),
MYSQLND_METHOD(mysqlnd_res_meta, fetch_field_direct),
Modified: php/php-src/trunk/ext/mysqli/mysqli_report.c
===================================================================
--- php/php-src/trunk/ext/mysqli/mysqli_report.c 2010-10-05 08:17:33 UTC
(rev 304065)
+++ php/php-src/trunk/ext/mysqli/mysqli_report.c 2010-10-05 08:29:54 UTC
(rev 304066)
@@ -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)
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_result_meta.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_result_meta.c 2010-10-05 08:17:33 UTC
(rev 304065)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_result_meta.c 2010-10-05 08:29:54 UTC
(rev 304066)
@@ -54,14 +54,14 @@
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 @@
/* }}} */
-static
+static
MYSQLND_CLASS_METHODS_START(mysqlnd_res_meta)
MYSQLND_METHOD(mysqlnd_res_meta, fetch_field),
MYSQLND_METHOD(mysqlnd_res_meta, fetch_field_direct),
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
