[PHP-CVS] cvs: php-src /ext/mysqli mysqli_api.c mysqli_nonapi.c mysqli_report.c

[Stefan Esser]

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.123r2=1.124diff_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.57r2=1.58diff_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.11r2=1.12diff_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

[PHP-CVS] cvs: php-src /ext/mysqli mysqli_api.c mysqli_nonapi.c mysqli_report.c php_mysqli.h

[Marcus Boerger]

helly   Sat Dec 13 08:44:57 2003 EDT

  Modified files:  
/php-src/ext/mysqli mysqli_api.c mysqli_nonapi.c mysqli_report.c 
php_mysqli.h 
  Log:
  ZTS fixes
  
  
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.52 php-src/ext/mysqli/mysqli_api.c:1.53
--- php-src/ext/mysqli/mysqli_api.c:1.52Fri Dec 12 19:28:20 2003
+++ php-src/ext/mysqli/mysqli_api.c Sat Dec 13 08:44:56 2003
@@ -15,7 +15,7 @@
   | Author: Georg Richter [EMAIL PROTECTED]|
   +--+
 
-  $Id: mysqli_api.c,v 1.52 2003/12/13 00:28:20 georg Exp $ 
+  $Id: mysqli_api.c,v 1.53 2003/12/13 13:44:56 helly Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -1381,7 +1381,7 @@
 
if (!mysql_field_count(mysql)) {
if (MyG(report_mode)  MYSQLI_REPORT_INDEX) {
-   php_mysqli_report_index(query, mysql-server_status);
+   php_mysqli_report_index(query, mysql-server_status TSRMLS_CC);
}
}
 
@@ -1829,7 +1829,7 @@
RETURN_FALSE;
}
if (MyG(report_mode)  MYSQLI_REPORT_INDEX) {
-   php_mysqli_report_index(from previous mysql_real_connect, 
mysql-server_status);
+   php_mysqli_report_index(from previous mysql_real_connect, 
mysql-server_status TSRMLS_CC);
}
MYSQLI_DISABLE_MQ;
mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
@@ -1884,7 +1884,7 @@
}
 
if (MyG(report_mode)  MYSQLI_REPORT_INDEX) {
-   php_mysqli_report_index(from previous mysql_real_connect, 
mysql-server_status);
+   php_mysqli_report_index(from previous mysql_real_connect, 
mysql-server_status TSRMLS_CC);
}
 
mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.22 php-src/ext/mysqli/mysqli_nonapi.c:1.23
--- php-src/ext/mysqli/mysqli_nonapi.c:1.22 Sat Dec 13 05:15:45 2003
+++ php-src/ext/mysqli/mysqli_nonapi.c  Sat Dec 13 08:44:56 2003
@@ -15,7 +15,7 @@
   | Author: Georg Richter [EMAIL PROTECTED]|
   +--+
 
-  $Id: mysqli_nonapi.c,v 1.22 2003/12/13 10:15:45 georg Exp $ 
+  $Id: mysqli_nonapi.c,v 1.23 2003/12/13 13:44:56 helly Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -230,7 +230,7 @@
 
if (!mysql_field_count(mysql)) {
if (MyG(report_mode)  MYSQLI_REPORT_INDEX) {
-   php_mysqli_report_index(query, mysql-server_status);
+   php_mysqli_report_index(query, mysql-server_status TSRMLS_CC);
}
RETURN_TRUE;
}
@@ -242,7 +242,7 @@
}
 
if (MyG(report_mode)  MYSQLI_REPORT_INDEX) {
-   php_mysqli_report_index(query, mysql-server_status);
+   php_mysqli_report_index(query, mysql-server_status TSRMLS_CC);
}
 
mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
Index: php-src/ext/mysqli/mysqli_report.c
diff -u php-src/ext/mysqli/mysqli_report.c:1.1 php-src/ext/mysqli/mysqli_report.c:1.2
--- php-src/ext/mysqli/mysqli_report.c:1.1  Fri Dec 12 19:28:20 2003
+++ php-src/ext/mysqli/mysqli_report.c  Sat Dec 13 08:44:56 2003
@@ -15,7 +15,7 @@
   | Author: Georg Richter [EMAIL PROTECTED]|
   +--+
 
-  $Id: mysqli_report.c,v 1.1 2003/12/13 00:28:20 georg Exp $ 
+  $Id: mysqli_report.c,v 1.2 2003/12/13 13:44:56 helly Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -52,13 +52,13 @@
 /* }}} */
 
 /* {{{ void php_mysqli_report_error(char *sqlstate, int errorno, char *error) */ 
-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_error_docref(NULL TSRMLS_CC, E_WARNING, Error (%s/%d): %s, sqlstate, 
errorno, error);
 }
 /* }}} */
 
 /* {{{ void php_mysqli_report_index() */ 
-void php_mysqli_report_index(char *query, unsigned int status) {
+void php_mysqli_report_index(char *query, unsigned int status TSRMLS_DC) {
char index[15];
 
if (status  SERVER_QUERY_NO_GOOD_INDEX_USED) {
Index: php-src/ext/mysqli/php_mysqli.h
diff -u php-src/ext/mysqli/php_mysqli.h:1.25 php-src/ext/mysqli/php_mysqli.h:1.26
--- php-src/ext/mysqli/php_mysqli.h:1.25Fri Dec 12 19:28:20 2003
+++ php-src/ext/mysqli/php_mysqli.h Sat Dec 13 08:44:56 2003
@@ -15,7 +15,7 @@
   | Author: Georg Richter [EMAIL PROTECTED]|
   +--+
 
-  $Id: php_mysqli.h,v 1.25 2003/12/13 00:28:20 georg Exp $ 
+  $Id: php_mysqli.h,v 1.26 2003/12/13