iliaa Mon Sep 22 19:28:10 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/exif exif.c
/php-src/ext/sysvmsg sysvmsg.c
/php-src/ext/mysql php_mysql.c
Log:
MFH: string format stuff.
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.118.2.24 php-src/ext/exif/exif.c:1.118.2.25
--- php-src/ext/exif/exif.c:1.118.2.24 Sun Sep 7 19:50:25 2003
+++ php-src/ext/exif/exif.c Mon Sep 22 19:28:07 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: exif.c,v 1.118.2.24 2003/09/07 23:50:25 helly Exp $ */
+/* $Id: exif.c,v 1.118.2.25 2003/09/22 23:28:07 iliaa Exp $ */
/* ToDos
*
@@ -99,7 +99,7 @@
};
/* }}} */
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.118.2.24 2003/09/07 23:50:25 helly Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.118.2.25 2003/09/22 23:28:07 iliaa Exp $"
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -243,10 +243,10 @@
static const char * EXIF_ERROR_THUMBEOF = "Thumbnail goes IFD boundary or end of
file reached";
static const char * EXIF_ERROR_FSREALLOC = "Illegal reallocating of undefined file
section";
-#define EXIF_ERRLOG_FILEEOF php_error_docref(NULL TSRMLS_CC, E_WARNING,
EXIF_ERROR_FILEEOF);
-#define EXIF_ERRLOG_CORRUPT php_error_docref(NULL TSRMLS_CC, E_WARNING,
EXIF_ERROR_CORRUPT);
-#define EXIF_ERRLOG_THUMBEOF php_error_docref(NULL TSRMLS_CC, E_WARNING,
EXIF_ERROR_THUMBEOF);
-#define EXIF_ERRLOG_FSREALLOC php_error_docref(NULL TSRMLS_CC, E_WARNING,
EXIF_ERROR_FSREALLOC);
+#define EXIF_ERRLOG_FILEEOF php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s",
EXIF_ERROR_FILEEOF);
+#define EXIF_ERRLOG_CORRUPT php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s",
EXIF_ERROR_CORRUPT);
+#define EXIF_ERRLOG_THUMBEOF php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s",
EXIF_ERROR_THUMBEOF);
+#define EXIF_ERRLOG_FSREALLOC php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s",
EXIF_ERROR_FSREALLOC);
/* }}} */
/* {{{ format description defines
Index: php-src/ext/sysvmsg/sysvmsg.c
diff -u php-src/ext/sysvmsg/sysvmsg.c:1.4.2.2 php-src/ext/sysvmsg/sysvmsg.c:1.4.2.3
--- php-src/ext/sysvmsg/sysvmsg.c:1.4.2.2 Tue Dec 31 11:35:38 2002
+++ php-src/ext/sysvmsg/sysvmsg.c Mon Sep 22 19:28:08 2003
@@ -15,7 +15,7 @@
| Authors: Wez Furlong <[EMAIL PROTECTED] |
+----------------------------------------------------------------------+
*/
-/* $Id: sysvmsg.c,v 1.4.2.2 2002/12/31 16:35:38 sebastian Exp $ */
+/* $Id: sysvmsg.c,v 1.4.2.3 2003/09/22 23:28:08 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -120,7 +120,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "sysvmsg support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.4.2.2 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.4.2.3 $");
php_info_print_table_end();
}
/* }}} */
@@ -223,7 +223,7 @@
/* doesn't already exist; create it */
mq->id = msgget(key, IPC_CREAT|IPC_EXCL|perms);
if (mq->id < 0) {
- zend_error(E_WARNING, "%s: msgget() failed for key 0x%x: %s",
+ zend_error(E_WARNING, "%s: msgget() failed for key 0x%lx: %s",
get_active_function_name(TSRMLS_C), key,
strerror(errno));
efree(mq);
RETURN_FALSE;
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.174.2.22
php-src/ext/mysql/php_mysql.c:1.174.2.23
--- php-src/ext/mysql/php_mysql.c:1.174.2.22 Thu Aug 28 15:18:56 2003
+++ php-src/ext/mysql/php_mysql.c Mon Sep 22 19:28:09 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.174.2.22 2003/08/28 19:18:56 iliaa Exp $ */
+/* $Id: php_mysql.c,v 1.174.2.23 2003/09/22 23:28:09 iliaa Exp $ */
/* TODO:
*
@@ -437,9 +437,7 @@
{
if (MySG(trace_mode)) {
if (MySG(result_allocated)){
- char tmp[128];
- sprintf((char *)&tmp, "%lu result set(s) not freed. Use
mysql_free_result to free result sets which were requested using mysql_query()",
MySG(result_allocated));
- php_error_docref("function.mysql-free-result" TSRMLS_CC,
E_WARNING, tmp);
+ php_error_docref("function.mysql-free-result" TSRMLS_CC,
E_WARNING, "%lu result set(s) not freed. Use mysql_free_result to free result sets
which were requested using mysql_query()", MySG(result_allocated));
}
}
@@ -1239,7 +1237,7 @@
mysql_real_query(&mysql->conn, newquery, strlen(newquery));
efree (newquery);
if (mysql_errno(&mysql->conn)) {
- php_error_docref("http://www.mysql.com/doc"; TSRMLS_CC,
E_WARNING, mysql_error(&mysql->conn));
+ php_error_docref("http://www.mysql.com/doc"; TSRMLS_CC,
E_WARNING, "%s", mysql_error(&mysql->conn));
RETURN_FALSE;
}
else {
@@ -1262,7 +1260,7 @@
/* check possible error */
if (MySG(trace_mode)){
if (mysql_errno(&mysql->conn)){
- php_error_docref("http://www.mysql.com/doc"; TSRMLS_CC,
E_WARNING, mysql_error(&mysql->conn));
+ php_error_docref("http://www.mysql.com/doc"; TSRMLS_CC,
E_WARNING, "%s", mysql_error(&mysql->conn));
}
}
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
