iliaa Thu Aug 28 15:18:58 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/ftp php_ftp.c
/php-src/ext/imap php_imap.c
/php-src/ext/mysql php_mysql.c
/php-src/main streams.c
Log:
MFH: Compiler warning fixes.
Index: php-src/ext/ftp/php_ftp.c
diff -u php-src/ext/ftp/php_ftp.c:1.74.2.11 php-src/ext/ftp/php_ftp.c:1.74.2.12
--- php-src/ext/ftp/php_ftp.c:1.74.2.11 Thu Aug 7 12:03:05 2003
+++ php-src/ext/ftp/php_ftp.c Thu Aug 28 15:18:55 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ftp.c,v 1.74.2.11 2003/08/07 16:03:05 zeev Exp $ */
+/* $Id: php_ftp.c,v 1.74.2.12 2003/08/28 19:18:55 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1161,7 +1161,7 @@
RETURN_TRUE;
break;
default:
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown option
'%d'", option);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown option
'%ld'", option);
RETURN_FALSE;
break;
}
@@ -1190,7 +1190,7 @@
RETURN_BOOL(ftp->autoseek);
break;
default:
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown option
'%d'", option);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown option
'%ld'", option);
RETURN_FALSE;
break;
}
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.142.2.18 php-src/ext/imap/php_imap.c:1.142.2.19
--- php-src/ext/imap/php_imap.c:1.142.2.18 Tue Jun 17 10:13:25 2003
+++ php-src/ext/imap/php_imap.c Thu Aug 28 15:18:55 2003
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.142.2.18 2003/06/17 14:13:25 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.142.2.19 2003/08/28 19:18:55 iliaa Exp $ */
#define IMAP41
@@ -632,7 +632,7 @@
if (EG(error_reporting) & E_NOTICE) {
ecur = IMAPG(imap_errorstack);
while (ecur != NIL) {
- php_error(E_NOTICE, "%s(): %s (errflg=%d)",
get_active_function_name(TSRMLS_C), ecur->LTEXT, ecur->errflg);
+ php_error(E_NOTICE, "%s(): %s (errflg=%ld)",
get_active_function_name(TSRMLS_C), ecur->LTEXT, ecur->errflg);
ecur = ecur->next;
}
}
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.174.2.21
php-src/ext/mysql/php_mysql.c:1.174.2.22
--- php-src/ext/mysql/php_mysql.c:1.174.2.21 Fri Aug 8 09:36:44 2003
+++ php-src/ext/mysql/php_mysql.c Thu Aug 28 15:18:56 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.174.2.21 2003/08/08 13:36:44 iliaa Exp $ */
+/* $Id: php_mysql.c,v 1.174.2.22 2003/08/28 19:18:56 iliaa Exp $ */
/* TODO:
*
@@ -652,12 +652,12 @@
list_entry new_le;
if (MySG(max_links)!=-1 && MySG(num_links)>=MySG(max_links)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many
open links (%d)", MySG(num_links));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many
open links (%ld)", MySG(num_links));
efree(hashed_details);
MYSQL_DO_CONNECT_RETURN_FALSE();
}
if (MySG(max_persistent)!=-1 &&
MySG(num_persistent)>=MySG(max_persistent)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many
open persistent links (%d)", MySG(num_persistent));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many
open persistent links (%ld)", MySG(num_persistent));
efree(hashed_details);
MYSQL_DO_CONNECT_RETURN_FALSE();
}
@@ -762,7 +762,7 @@
}
}
if (MySG(max_links)!=-1 && MySG(num_links)>=MySG(max_links)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open
links (%d)", MySG(num_links));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open
links (%ld)", MySG(num_links));
efree(hashed_details);
MYSQL_DO_CONNECT_RETURN_FALSE();
}
@@ -1772,7 +1772,7 @@
convert_to_long_ex(row);
if (Z_LVAL_PP(row)<0 || Z_LVAL_PP(row)>=(int)mysql_num_rows(mysql_result)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to jump to row %d
on MySQL result index %d", Z_LVAL_PP(row), Z_LVAL_PP(result));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to jump to row %ld
on MySQL result index %ld", Z_LVAL_PP(row), Z_LVAL_PP(result));
RETURN_FALSE;
}
mysql_data_seek(mysql_result, Z_LVAL_PP(row));
@@ -1804,7 +1804,7 @@
i++;
}
if (!tmp_field) { /* no match found */
- php_error_docref(NULL TSRMLS_CC,
E_WARNING, "%s%s%s not found in MySQL result index %d",
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING, "%s%s%s not found in MySQL result index %ld",
(table_name?table_name:""), (table_name?".":""), field_name, Z_LVAL_PP(result));
efree(field_name);
if (table_name) {
@@ -2025,7 +2025,7 @@
convert_to_long_ex(offset);
if (Z_LVAL_PP(offset)<0 ||
Z_LVAL_PP(offset)>=(int)mysql_num_rows(mysql_result)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset %d is invalid for
MySQL result index %d (or the query data is unbuffered)", Z_LVAL_PP(offset),
Z_LVAL_PP(result));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset %ld is invalid for
MySQL result index %ld (or the query data is unbuffered)", Z_LVAL_PP(offset),
Z_LVAL_PP(result));
RETURN_FALSE;
}
mysql_data_seek(mysql_result, Z_LVAL_PP(offset));
@@ -2192,7 +2192,7 @@
convert_to_long_ex(offset);
if (Z_LVAL_PP(offset)<0 ||
Z_LVAL_PP(offset)>=(int)mysql_num_fields(mysql_result)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Field %d is invalid for
MySQL result index %d", Z_LVAL_PP(offset), Z_LVAL_PP(result));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Field %ld is invalid for
MySQL result index %ld", Z_LVAL_PP(offset), Z_LVAL_PP(result));
RETURN_FALSE;
}
mysql_field_seek(mysql_result, Z_LVAL_PP(offset));
@@ -2225,7 +2225,7 @@
convert_to_long_ex(field);
if (Z_LVAL_PP(field)<0 ||
Z_LVAL_PP(field)>=(int)mysql_num_fields(mysql_result)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Field %d is invalid for
MySQL result index %d", Z_LVAL_PP(field), Z_LVAL_PP(result));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Field %ld is invalid for
MySQL result index %ld", Z_LVAL_PP(field), Z_LVAL_PP(result));
RETURN_FALSE;
}
mysql_field_seek(mysql_result, Z_LVAL_PP(field));
Index: php-src/main/streams.c
diff -u php-src/main/streams.c:1.125.2.75 php-src/main/streams.c:1.125.2.76
--- php-src/main/streams.c:1.125.2.75 Thu Aug 28 12:04:18 2003
+++ php-src/main/streams.c Thu Aug 28 15:18:57 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.125.2.75 2003/08/28 16:04:18 sas Exp $ */
+/* $Id: streams.c,v 1.125.2.76 2003/08/28 19:18:57 iliaa Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -2268,7 +2268,7 @@
* know that they should try something else */
php_error_docref(NULL TSRMLS_CC, E_WARNING,
- "%d bytes of buffered data lost during conversion to
FILE*!",
+ "%ld bytes of buffered data lost during conversion to
FILE*!",
stream->writepos - stream->readpos);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
