From 05331829c67fef7fd9e716c929fd6fd92209de8a Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Mon, 22 Sep 2003 23:28:09 +0000 Subject: [PATCH] MFH: string format stuff. --- ext/exif/exif.c | 8 ++++---- ext/mysql/php_mysql.c | 8 +++----- ext/sysvmsg/sysvmsg.c | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 82c154a3bb..c130fbc44a 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -243,10 +243,10 @@ static const char * EXIF_ERROR_CORRUPT = "File structure corrupted"; 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 diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index e601a6d708..049ec01f6c 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -437,9 +437,7 @@ PHP_RSHUTDOWN_FUNCTION(mysql) { 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 @@ static void php_mysql_do_query_general(zval **query, zval **mysql_link, int link 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 @@ static void php_mysql_do_query_general(zval **query, zval **mysql_link, int link /* 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; diff --git a/ext/sysvmsg/sysvmsg.c b/ext/sysvmsg/sysvmsg.c index 1c03f8146e..1a3b6bb8ca 100644 --- a/ext/sysvmsg/sysvmsg.c +++ b/ext/sysvmsg/sysvmsg.c @@ -223,7 +223,7 @@ PHP_FUNCTION(msg_get_queue) /* 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; -- 2.40.0