sesser Fri Dec 23 18:43:03 2005 EDT
Modified files:
/php-src/ext/mysqli mysqli_api.c mysqli_nonapi.c mysqli_report.c
Log:
MFB: format string fixes
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.123&r2=1.124&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.123
php-src/ext/mysqli/mysqli_api.c:1.124
--- php-src/ext/mysqli/mysqli_api.c:1.123 Mon Oct 10 20:16:35 2005
+++ php-src/ext/mysqli/mysqli_api.c Fri Dec 23 18:43:03 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.123 2005/10/10 20:16:35 tony2001 Exp $
+ $Id: mysqli_api.c,v 1.124 2005/12/23 18:43:03 sesser Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1370,7 +1370,7 @@
php_mysqli_set_error(mysql_errno(mysql->mysql), (char *)
mysql_error(mysql->mysql) TSRMLS_CC);
php_mysqli_throw_sql_exception( mysql->mysql->net.sqlstate,
mysql->mysql->net.last_errno TSRMLS_CC,
-
mysql->mysql->net.last_error);
+
"%s", mysql->mysql->net.last_error);
RETURN_FALSE;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.57&r2=1.58&diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.57
php-src/ext/mysqli/mysqli_nonapi.c:1.58
--- php-src/ext/mysqli/mysqli_nonapi.c:1.57 Thu Dec 22 14:56:29 2005
+++ php-src/ext/mysqli/mysqli_nonapi.c Fri Dec 23 18:43:03 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_nonapi.c,v 1.57 2005/12/22 14:56:29 zeev Exp $
+ $Id: mysqli_nonapi.c,v 1.58 2005/12/23 18:43:03 sesser Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -91,7 +91,7 @@
/* Save error messages */
php_mysqli_throw_sql_exception( mysql->mysql->net.sqlstate,
mysql->mysql->net.last_errno TSRMLS_CC,
-
mysql->mysql->net.last_error);
+
"%s", mysql->mysql->net.last_error);
php_mysqli_set_error(mysql_errno(mysql->mysql), (char *)
mysql_error(mysql->mysql) TSRMLS_CC);
@@ -249,7 +249,7 @@
if (!result) {
php_mysqli_throw_sql_exception(mysql->mysql->net.sqlstate,
mysql->mysql->net.last_errno TSRMLS_CC,
-
mysql->mysql->net.last_error);
+
"%s", mysql->mysql->net.last_error);
RETURN_FALSE;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli_report.c?r1=1.11&r2=1.12&diff_format=u
Index: php-src/ext/mysqli/mysqli_report.c
diff -u php-src/ext/mysqli/mysqli_report.c:1.11
php-src/ext/mysqli/mysqli_report.c:1.12
--- php-src/ext/mysqli/mysqli_report.c:1.11 Wed Aug 3 14:07:31 2005
+++ php-src/ext/mysqli/mysqli_report.c Fri Dec 23 18:43:03 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_report.c,v 1.11 2005/08/03 14:07:31 sniper Exp $
+ $Id: mysqli_report.c,v 1.12 2005/12/23 18:43:03 sesser Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -46,7 +46,7 @@
/* {{{ void php_mysqli_report_error(char *sqlstate, int errorno, char *error)
*/
void php_mysqli_report_error(char *sqlstate, int errorno, char *error
TSRMLS_DC) {
- php_mysqli_throw_sql_exception(sqlstate, errorno TSRMLS_CC, error);
+ php_mysqli_throw_sql_exception(sqlstate, errorno TSRMLS_CC, "%s",
error);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
