cvs: php-src(PHP_4_3) /ext/calendar calendar.c /ext/db db.c /ext/dio dio.c /ext/filepro filepro.c /ext/hyperwave hw.c /ext/ldap ldap.c
/ext/mssql php_mssql.c /ext/pspell pspell.c /ext/sockets sockets.c /ext/sysvsem sysvsem.c /ext/sysvshm sysvshm.c /ext/xmlrpc xmlrpc-epi-php.c
/ext/xslt sablot.c /ext/zlib zlib.c
| From: | Ilia Alshanetsky | Date: | Thu, 28 Aug 2003 20:01:35 +0000 |
| Subject: | cvs: php-src(PHP_4_3) /ext/calendar calendar.c /ext/db db.c /ext/dio dio.c /ext/filepro filepro.c /ext/hyperwave hw.c /ext/ldap ldap.c /ext/mssql php_mssql.c /ext/pspell pspell.c /ext/sockets sockets.c /ext/sysvsem sysvsem.c /ext/sysvshm sysvshm.c /ext/xmlrpc xmlrpc-epi-php.c /ext/xslt sablot.c /ext/zlib zlib.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-23471@lists.php.net to get a copy of this message | ||
iliaa Thu Aug 28 16:01:35 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/calendar calendar.c
/php-src/ext/db db.c
/php-src/ext/dio dio.c
/php-src/ext/filepro filepro.c
/php-src/ext/hyperwave hw.c
/php-src/ext/ldap ldap.c
/php-src/ext/mssql php_mssql.c
/php-src/ext/pspell pspell.c
/php-src/ext/sockets sockets.c
/php-src/ext/sysvsem sysvsem.c
/php-src/ext/sysvshm sysvshm.c
/php-src/ext/xmlrpc xmlrpc-epi-php.c
/php-src/ext/xslt sablot.c
/php-src/ext/zlib zlib.c
Log:
Compiler warning fixes.
Index: php-src/ext/calendar/calendar.c diff -u php-src/ext/calendar/calendar.c:1.30.2.2 php-src/ext/calendar/calendar.c:1.30.2.3 --- php-src/ext/calendar/calendar.c:1.30.2.2 Tue Dec 31 11:34:11 2002 +++ php-src/ext/calendar/calendar.c Thu Aug 28 16:01:24 2003 @@ -18,7 +18,7 @@ | Wez Furlong <wez@thebrainroom.com> | +----------------------------------------------------------------------+ */ -/* $Id: calendar.c,v 1.30.2.2 2002/12/31 16:34:11 sebastian Exp $ */ +/* $Id: calendar.c,v 1.30.2.3 2003/08/28 20:01:24 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -161,7 +161,7 @@ } convert_to_long_ex(cal); if (Z_LVAL_PP(cal) < 0 || Z_LVAL_PP(cal) >= CAL_NUM_CALS) { - zend_error(E_WARNING, "%s(): invalid calendar ID %d", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal)); + zend_error(E_WARNING, "%s(): invalid calendar ID %ld", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal)); RETURN_FALSE; } @@ -203,7 +203,7 @@ convert_to_long_ex(year); if (Z_LVAL_PP(cal) < 0 || Z_LVAL_PP(cal) >= CAL_NUM_CALS) { - zend_error(E_WARNING, "%s(): invalid calendar ID %d", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal)); + zend_error(E_WARNING, "%s(): invalid calendar ID %ld", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal)); RETURN_FALSE; } @@ -239,7 +239,7 @@ convert_to_long_ex(year); if (Z_LVAL_PP(cal) < 0 || Z_LVAL_PP(cal) >= CAL_NUM_CALS) { - zend_error(E_WARNING, "%s(): invalid calendar ID %d", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal)); + zend_error(E_WARNING, "%s(): invalid calendar ID %ld", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal)); RETURN_FALSE; } @@ -265,7 +265,7 @@ convert_to_long_ex(cal); if (Z_LVAL_PP(cal) < 0 || Z_LVAL_PP(cal) >= CAL_NUM_CALS) { - zend_error(E_WARNING, "%s(): invalid calendar ID %d", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal)); + zend_error(E_WARNING, "%s(): invalid calendar ID %ld", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal)); RETURN_FALSE; } calendar = &cal_conversion_table[Z_LVAL_PP(cal)]; Index: php-src/ext/db/db.c diff -u php-src/ext/db/db.c:1.81.2.3 php-src/ext/db/db.c:1.81.2.4 --- php-src/ext/db/db.c:1.81.2.3 Thu Mar 6 15:58:14 2003 +++ php-src/ext/db/db.c Thu Aug 28 16:01:25 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.81.2.3 2003/03/06 20:58:14 sesser Exp $ */ +/* $Id: db.c,v 1.81.2.4 2003/08/28 20:01:25 iliaa Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -513,7 +513,7 @@ info = php_find_dbm(id TSRMLS_CC); if (!info) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %ld", Z_LVAL_P(id)); RETURN_FALSE; } @@ -539,7 +539,7 @@ info = php_find_dbm(id TSRMLS_CC); if (!info) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %ld", Z_LVAL_P(id)); RETURN_FALSE; } @@ -607,7 +607,7 @@ info = php_find_dbm(id TSRMLS_CC); if (!info) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %ld", Z_LVAL_P(id)); RETURN_FALSE; } @@ -683,7 +683,7 @@ info = php_find_dbm(id TSRMLS_CC); if (!info) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %ld", Z_LVAL_P(id)); RETURN_FALSE; } @@ -732,7 +732,7 @@ info = php_find_dbm(id TSRMLS_CC); if (!info) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %ld", Z_LVAL_P(id)); RETURN_FALSE; } @@ -779,7 +779,7 @@ info = php_find_dbm(id TSRMLS_CC); if (!info) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %ld", Z_LVAL_P(id)); RETURN_FALSE; } @@ -841,7 +841,7 @@ info = php_find_dbm(id TSRMLS_CC); if (!info) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %ld", Z_LVAL_P(id)); RETURN_FALSE; } Index: php-src/ext/dio/dio.c diff -u php-src/ext/dio/dio.c:1.21.2.3 php-src/ext/dio/dio.c:1.21.2.4 --- php-src/ext/dio/dio.c:1.21.2.3 Fri Mar 7 08:42:11 2003 +++ php-src/ext/dio/dio.c Thu Aug 28 16:01:26 2003 @@ -161,7 +161,7 @@ } if (fd == -1) { - php_error(E_WARNING, "%s(): cannot open file %s with flags %d and permissions %d: %s", + php_error(E_WARNING, "%s(): cannot open file %s with flags %ld and permissions %ld: %s", get_active_function_name(TSRMLS_C), file_name, flags, mode, strerror(errno)); RETURN_FALSE; } @@ -240,7 +240,7 @@ ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd); if (ftruncate(f->fd, offset) == -1) { - php_error(E_WARNING, "%s(): couldn't truncate %d to %d bytes: %s", + php_error(E_WARNING, "%s(): couldn't truncate %d to %ld bytes: %s", get_active_function_name(TSRMLS_C), f->fd, offset, strerror(errno)); RETURN_FALSE; } Index: php-src/ext/filepro/filepro.c diff -u php-src/ext/filepro/filepro.c:1.47.2.1 php-src/ext/filepro/filepro.c:1.47.2.2 --- php-src/ext/filepro/filepro.c:1.47.2.1 Tue Dec 31 11:34:32 2002 +++ php-src/ext/filepro/filepro.c Thu Aug 28 16:01:26 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filepro.c,v 1.47.2.1 2002/12/31 16:34:32 sebastian Exp $ */ +/* $Id: filepro.c,v 1.47.2.2 2003/08/28 20:01:26 iliaa Exp $ */ /* filePro 4.x support developed by Chad Robinson, chadr@brttech.com @@ -386,7 +386,7 @@ } php_error(E_WARNING, - "%s(): Unable to locate field number %d.", get_active_function_name(TSRMLS_C), + "%s(): Unable to locate field number %ld.", get_active_function_name(TSRMLS_C), Z_LVAL_P(fno)); RETVAL_FALSE; @@ -426,7 +426,7 @@ } } php_error(E_WARNING, - "%s(): Unable to locate field number %d.", get_active_function_name(TSRMLS_C), + "%s(): Unable to locate field number %ld.", get_active_function_name(TSRMLS_C), Z_LVAL_P(fno)); RETVAL_FALSE; } @@ -465,7 +465,7 @@ } } php_error(E_WARNING, - "%s(): Unable to locate field number %d.", get_active_function_name(TSRMLS_C), + "%s(): Unable to locate field number %ld.", get_active_function_name(TSRMLS_C), Z_LVAL_P(fno)); RETVAL_FALSE; } Index: php-src/ext/hyperwave/hw.c diff -u php-src/ext/hyperwave/hw.c:1.111.2.6 php-src/ext/hyperwave/hw.c:1.111.2.7 --- php-src/ext/hyperwave/hw.c:1.111.2.6 Sun Jun 29 19:59:20 2003 +++ php-src/ext/hyperwave/hw.c Thu Aug 28 16:01:27 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hw.c,v 1.111.2.6 2003/06/29 23:59:20 edink Exp $ */ +/* $Id: hw.c,v 1.111.2.7 2003/08/28 20:01:27 iliaa Exp $ */ #include <stdlib.h> #include <errno.h> @@ -766,7 +766,7 @@ list_entry new_le; if (HwSG(max_links)!=-1 && HwSG(num_links)>=HwSG(max_links)) { - php_error(E_ERROR, "%s(): Too many open links (%d)", get_active_function_name(TSRMLS_C), HwSG(num_links)); + php_error(E_ERROR, "%s(): Too many open links (%ld)", get_active_function_name(TSRMLS_C), HwSG(num_links)); if(host) efree(host); if(username) efree(username); if(password) efree(password); @@ -774,7 +774,7 @@ RETURN_FALSE; } if (HwSG(max_persistent!=-1) && HwSG(num_persistent)>=HwSG(max_persistent)) { - php_error(E_ERROR, "%s(): Too many open persistent links (%d)", get_active_function_name(TSRMLS_C), HwSG(num_persistent)); + php_error(E_ERROR, "%s(): Too many open persistent links (%ld)", get_active_function_name(TSRMLS_C), HwSG(num_persistent)); if(host) efree(host); if(username) efree(username); if(password) efree(password); Index: php-src/ext/ldap/ldap.c diff -u php-src/ext/ldap/ldap.c:1.130.2.4 php-src/ext/ldap/ldap.c:1.130.2.5 --- php-src/ext/ldap/ldap.c:1.130.2.4 Wed Apr 30 17:54:02 2003 +++ php-src/ext/ldap/ldap.c Thu Aug 28 16:01:28 2003 @@ -22,7 +22,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ldap.c,v 1.130.2.4 2003/04/30 21:54:02 iliaa Exp $ */ +/* $Id: ldap.c,v 1.130.2.5 2003/08/28 20:01:28 iliaa Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -286,7 +286,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "LDAP Support", "enabled" ); - php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.130.2.4 2003/04/30 21:54:02 iliaa Exp $" ); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.130.2.5 2003/08/28 20:01:28 iliaa Exp $" ); if (LDAPG(max_links) == -1) { snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links)); @@ -374,7 +374,7 @@ #endif if (LDAPG(max_links) != -1 && LDAPG(num_links) >= LDAPG(max_links)) { - php_error(E_WARNING, "%s(): Too many open links (%d)", get_active_function_name(TSRMLS_C), LDAPG(num_links)); + php_error(E_WARNING, "%s(): Too many open links (%ld)", get_active_function_name(TSRMLS_C), LDAPG(num_links)); RETURN_FALSE; } Index: php-src/ext/mssql/php_mssql.c diff -u php-src/ext/mssql/php_mssql.c:1.86.2.23 php-src/ext/mssql/php_mssql.c:1.86.2.24 --- php-src/ext/mssql/php_mssql.c:1.86.2.23 Wed Jul 23 12:54:54 2003 +++ php-src/ext/mssql/php_mssql.c Thu Aug 28 16:01:29 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.86.2.23 2003/07/23 16:54:54 iliaa Exp $ */ +/* $Id: php_mssql.c,v 1.86.2.24 2003/08/28 20:01:29 iliaa Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -483,13 +483,13 @@ list_entry new_le; if (MS_SQL_G(max_links) != -1 && MS_SQL_G(num_links) >= MS_SQL_G(max_links)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%d)", MS_SQL_G(num_links)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%ld)", MS_SQL_G(num_links)); efree(hashed_details); dbfreelogin(mssql.login); RETURN_FALSE; } if (MS_SQL_G(max_persistent) != -1 && MS_SQL_G(num_persistent) >= MS_SQL_G(max_persistent)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open persistent links (%d)", MS_SQL_G(num_persistent)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open persistent links (%ld)", MS_SQL_G(num_persistent)); efree(hashed_details); dbfreelogin(mssql.login); RETURN_FALSE; @@ -604,7 +604,7 @@ } } if (MS_SQL_G(max_links) != -1 && MS_SQL_G(num_links) >= MS_SQL_G(max_links)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%d)", MS_SQL_G(num_links)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%ld)", MS_SQL_G(num_links)); efree(hashed_details); RETURN_FALSE; } @@ -1730,7 +1730,7 @@ convert_to_long_ex(row); if (Z_LVAL_PP(row) < 0 || Z_LVAL_PP(row) >= result->num_rows) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad row offset (%d)", Z_LVAL_PP(row)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad row offset (%ld)", Z_LVAL_PP(row)); RETURN_FALSE; } Index: php-src/ext/pspell/pspell.c diff -u php-src/ext/pspell/pspell.c:1.28.8.4 php-src/ext/pspell/pspell.c:1.28.8.5 --- php-src/ext/pspell/pspell.c:1.28.8.4 Wed Aug 13 16:59:44 2003 +++ php-src/ext/pspell/pspell.c Thu Aug 28 16:01:29 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pspell.c,v 1.28.8.4 2003/08/13 20:59:44 vlad Exp $ */ +/* $Id: pspell.c,v 1.28.8.5 2003/08/28 20:01:29 iliaa Exp $ */ #define IS_EXT_MODULE @@ -354,7 +354,7 @@ config = (PspellConfig *) zend_list_find(Z_LVAL_PP(conf), &type); if (config == NULL || type != le_pspell_config) { - php_error(E_WARNING, "%d is not a PSPELL config index", Z_LVAL_PP(conf)); + php_error(E_WARNING, "%ld is not a PSPELL config index", Z_LVAL_PP(conf)); RETURN_FALSE; } @@ -389,7 +389,7 @@ convert_to_string_ex(word); manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); if(!manager){ - php_error(E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); RETURN_FALSE; } @@ -421,7 +421,7 @@ convert_to_string_ex(word); manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); if(!manager){ - php_error(E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); RETURN_FALSE; } @@ -460,7 +460,7 @@ convert_to_string_ex(corr); manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); if(!manager){ - php_error(E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); RETURN_FALSE; } @@ -492,7 +492,7 @@ convert_to_string_ex(word); manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); if(!manager){ - php_error(E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); RETURN_FALSE; } @@ -529,7 +529,7 @@ convert_to_string_ex(word); manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); if(!manager){ - php_error(E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); RETURN_FALSE; } @@ -565,7 +565,7 @@ convert_to_long_ex(scin); manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); if(!manager){ - php_error(E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); RETURN_FALSE; } @@ -596,7 +596,7 @@ convert_to_long_ex(scin); manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); if(!manager){ - php_error(E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); RETURN_FALSE; } @@ -679,7 +679,7 @@ convert_to_long_ex(sccin); config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); if(!config){ - php_error(E_WARNING, "%d is not a PSPELL config index",Z_LVAL_PP(sccin)); + php_error(E_WARNING, "%ld is not a PSPELL config index",Z_LVAL_PP(sccin)); RETURN_FALSE; } @@ -708,7 +708,7 @@ convert_to_long_ex(sccin); config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); if(!config){ - php_error(E_WARNING, "%d is not a PSPELL config index",Z_LVAL_PP(sccin)); + php_error(E_WARNING, "%ld is not a PSPELL config index",Z_LVAL_PP(sccin)); RETURN_FALSE; } @@ -749,7 +749,7 @@ convert_to_long_ex(sccin); config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); if(!config){ - php_error(E_WARNING, "%d is not a PSPELL config index",Z_LVAL_PP(sccin)); + php_error(E_WARNING, "%ld is not a PSPELL config index",Z_LVAL_PP(sccin)); RETURN_FALSE; } @@ -795,7 +795,7 @@ convert_to_long_ex(sccin); config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); if(!config){ - php_error(E_WARNING, "%d is not a PSPELL config index",Z_LVAL_PP(sccin)); + php_error(E_WARNING, "%ld is not a PSPELL config index",Z_LVAL_PP(sccin)); RETURN_FALSE; } @@ -833,7 +833,7 @@ convert_to_long_ex(sccin); config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); if(!config){ - php_error(E_WARNING, "%d is not a PSPELL config index",Z_LVAL_PP(sccin)); + php_error(E_WARNING, "%ld is not a PSPELL config index",Z_LVAL_PP(sccin)); RETURN_FALSE; } @@ -873,7 +873,7 @@ convert_to_long_ex(sccin); config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); if(!config){ - php_error(E_WARNING, "%d is not a PSPELL config index",Z_LVAL_PP(sccin)); + php_error(E_WARNING, "%ld is not a PSPELL config index",Z_LVAL_PP(sccin)); RETURN_FALSE; } Index: php-src/ext/sockets/sockets.c diff -u php-src/ext/sockets/sockets.c:1.125.2.18 php-src/ext/sockets/sockets.c:1.125.2.19 --- php-src/ext/sockets/sockets.c:1.125.2.18 Thu Jul 24 21:50:09 2003 +++ php-src/ext/sockets/sockets.c Thu Aug 28 16:01:30 2003 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sockets.c,v 1.125.2.18 2003/07/25 01:50:09 jason Exp $ */ +/* $Id: sockets.c,v 1.125.2.19 2003/08/28 20:01:30 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -960,12 +960,12 @@ } if (arg1 != AF_UNIX && arg1 != AF_INET) { - php_error(E_WARNING, "%s() invalid socket domain [%d] specified for argument 1, assuming AF_INET", get_active_function_name(TSRMLS_C), arg1); + php_error(E_WARNING, "%s() invalid socket domain [%ld] specified for argument 1, assuming AF_INET", get_active_function_name(TSRMLS_C), arg1); arg1 = AF_INET; } if (arg2 > 10) { - php_error(E_WARNING, "%s() invalid socket type [%d] specified for argument 2, assuming SOCK_STREAM", get_active_function_name(TSRMLS_C), arg2); + php_error(E_WARNING, "%s() invalid socket type [%ld] specified for argument 2, assuming SOCK_STREAM", get_active_function_name(TSRMLS_C), arg2); arg2 = SOCK_STREAM; } @@ -1979,12 +1979,12 @@ php_sock[1] = (php_socket*)emalloc(sizeof(php_socket)); if (domain != AF_INET && domain != AF_UNIX) { - php_error(E_WARNING, "%s() invalid socket domain [%d] specified for argument 1, assuming AF_INET", get_active_function_name(TSRMLS_C), domain); + php_error(E_WARNING, "%s() invalid socket domain [%ld] specified for argument 1, assuming AF_INET", get_active_function_name(TSRMLS_C), domain); domain = AF_INET; } if (type > 10) { - php_error(E_WARNING, "%s() invalid socket type [%d] specified for argument 2, assuming SOCK_STREAM", get_active_function_name(TSRMLS_C), type); + php_error(E_WARNING, "%s() invalid socket type [%ld] specified for argument 2, assuming SOCK_STREAM", get_active_function_name(TSRMLS_C), type); type = SOCK_STREAM; } Index: php-src/ext/sysvsem/sysvsem.c diff -u php-src/ext/sysvsem/sysvsem.c:1.41.2.2 php-src/ext/sysvsem/sysvsem.c:1.41.2.3 --- php-src/ext/sysvsem/sysvsem.c:1.41.2.2 Fri Mar 7 08:42:20 2003 +++ php-src/ext/sysvsem/sysvsem.c Thu Aug 28 16:01:31 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvsem.c,v 1.41.2.2 2003/03/07 13:42:20 ddhill Exp $ */ +/* $Id: sysvsem.c,v 1.41.2.3 2003/08/28 20:01:31 iliaa Exp $ */ /* Latest update build anc tested on Linux 2.2.14 * @@ -185,7 +185,7 @@ semid = semget(key, 3, perm|IPC_CREAT); if (semid == -1) { - php_error(E_WARNING, "semget() failed for key 0x%x: %s", key, strerror(errno)); + php_error(E_WARNING, "semget() failed for key 0x%lx: %s", key, strerror(errno)); RETURN_FALSE; } @@ -217,7 +217,7 @@ sop[2].sem_flg = SEM_UNDO; while (semop(semid, sop, 3) == -1) { if (errno != EINTR) { - php_error(E_WARNING, "semop() failed acquiring SYSVSEM_SETVAL for key 0x%x: %s", key, strerror(errno)); + php_error(E_WARNING, "semop() failed acquiring SYSVSEM_SETVAL for key 0x%lx: %s", key, strerror(errno)); break; } } @@ -229,7 +229,7 @@ count = semctl(semid, SYSVSEM_USAGE, GETVAL, NULL); #endif if (count == -1) { - php_error(E_WARNING, "semctl(GETVAL) failed for key 0x%x: %s", key, strerror(errno)); + php_error(E_WARNING, "semctl(GETVAL) failed for key 0x%lx: %s", key, strerror(errno)); } /* If we are the only user, then take this opportunity to set the max. */ @@ -240,17 +240,17 @@ union semun semarg; semarg.val = max_acquire; if (semctl(semid, SYSVSEM_SEM, SETVAL, semarg) == -1) { - php_error(E_WARNING, "semctl(SETVAL) failed for key 0x%x: %s", key, strerror(errno)); + php_error(E_WARNING, "semctl(SETVAL) failed for key 0x%lx: %s", key, strerror(errno)); } #elif defined(SETVAL_WANTS_PTR) /* This is correct for Solaris 2.6 which does not have union semun. */ if (semctl(semid, SYSVSEM_SEM, SETVAL, &max_acquire) == -1) { - php_error(E_WARNING, "semctl(SETVAL) failed for key 0x%x: %s", key, strerror(errno)); + php_error(E_WARNING, "semctl(SETVAL) failed for key 0x%lx: %s", key, strerror(errno)); } #else /* This works for i.e. AIX */ if (semctl(semid, SYSVSEM_SEM, SETVAL, max_acquire) == -1) { - php_error(E_WARNING, "semctl(SETVAL) failed for key 0x%x: %s", key, strerror(errno)); + php_error(E_WARNING, "semctl(SETVAL) failed for key 0x%lx: %s", key, strerror(errno)); } #endif } @@ -262,7 +262,7 @@ sop[0].sem_flg = SEM_UNDO; while (semop(semid, sop, 1) == -1) { if (errno != EINTR) { - php_error(E_WARNING, "semop() failed releasing SYSVSEM_SETVAL for key 0x%x: %s", key, strerror(errno)); + php_error(E_WARNING, "semop() failed releasing SYSVSEM_SETVAL for key 0x%lx: %s", key, strerror(errno)); break; } } @@ -299,7 +299,7 @@ ZEND_FETCH_RESOURCE(sem_ptr, sysvsem_sem *, arg_id, -1, "SysV semphore", php_sysvsem_module.le_sem); if (!acquire && sem_ptr->count == 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "SysV semaphore %d (key 0x%x) is not currently acquired", Z_LVAL_PP(arg_id), sem_ptr->key); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "SysV semaphore %ld (key 0x%x) is not currently acquired", Z_LVAL_PP(arg_id), sem_ptr->key); RETURN_FALSE; } @@ -365,7 +365,7 @@ #else if(semctl(sem_ptr->semid, 0, IPC_STAT, NULL) < 0) { #endif - php_error_docref(NULL TSRMLS_CC, E_WARNING, "SysV semphore %d does not (any longer) exist", Z_LVAL_PP(arg_id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "SysV semphore %ld does not (any longer) exist", Z_LVAL_PP(arg_id)); RETURN_FALSE; } @@ -374,7 +374,7 @@ #else if(semctl(sem_ptr->semid, 0, IPC_RMID, NULL) < 0) { #endif - php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for SysV sempphore %d: %s", Z_LVAL_PP(arg_id), strerror(errno)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for SysV sempphore %ld: %s", Z_LVAL_PP(arg_id), strerror(errno)); RETURN_FALSE; } Index: php-src/ext/sysvshm/sysvshm.c diff -u php-src/ext/sysvshm/sysvshm.c:1.56.8.2 php-src/ext/sysvshm/sysvshm.c:1.56.8.3 --- php-src/ext/sysvshm/sysvshm.c:1.56.8.2 Tue Dec 31 11:35:40 2002 +++ php-src/ext/sysvshm/sysvshm.c Thu Aug 28 16:01:32 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvshm.c,v 1.56.8.2 2002/12/31 16:35:40 sebastian Exp $ */ +/* $Id: sysvshm.c,v 1.56.8.3 2003/08/28 20:01:32 iliaa Exp $ */ /* This has been built and tested on Linux 2.2.14 * @@ -215,7 +215,7 @@ } if(shmctl(shm_list_ptr->id,IPC_RMID,NULL)<0) { - php_error(E_WARNING, "shm_remove() failed for key 0x%x, id %i: %s", shm_list_ptr->key, id,strerror(errno)); + php_error(E_WARNING, "shm_remove() failed for key 0x%x, id %ld: %s", shm_list_ptr->key, id,strerror(errno)); RETURN_FALSE; } @@ -246,7 +246,7 @@ shm_list_ptr = (sysvshm_shm *) zend_list_find(id, &type); if (type!=php_sysvshm.le_shm) { - php_error(E_WARNING, "%d is not a SysV shared memory index", id); + php_error(E_WARNING, "%ld is not a SysV shared memory index", id); RETURN_FALSE; } @@ -293,7 +293,7 @@ shm_list_ptr = (sysvshm_shm *) zend_list_find(id, &type); if (type!=php_sysvshm.le_shm) { - php_error(E_WARNING, "%d is not a SysV shared memory index", id); + php_error(E_WARNING, "%ld is not a SysV shared memory index", id); RETURN_FALSE; } @@ -302,7 +302,7 @@ shm_varpos=php_check_shm_data((shm_list_ptr->ptr),key); if(shm_varpos<0) { - php_error(E_WARNING, "variable key %d doesn't exist", key); + php_error(E_WARNING, "variable key %ld doesn't exist", key); RETURN_FALSE; } shm_var=(sysvshm_chunk*)((char*)shm_list_ptr->ptr+shm_varpos); @@ -339,14 +339,14 @@ shm_list_ptr = (sysvshm_shm *) zend_list_find(id, &type); if (type!=php_sysvshm.le_shm) { - php_error(E_WARNING, "%d is not a SysV shared memory index", id); + php_error(E_WARNING, "%ld is not a SysV shared memory index", id); RETURN_FALSE; } shm_varpos=php_check_shm_data((shm_list_ptr->ptr),key); if(shm_varpos<0) { - php_error(E_WARNING, "variable key %d doesn't exist", key); + php_error(E_WARNING, "variable key %ld doesn't exist", key); RETURN_FALSE; } php_remove_shm_data((shm_list_ptr->ptr),shm_varpos); Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.24.2.3 php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.24.2.4 --- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.24.2.3 Wed Jul 23 22:53:46 2003 +++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Thu Aug 28 16:01:32 2003 @@ -51,7 +51,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xmlrpc-epi-php.c,v 1.24.2.3 2003/07/24 02:53:46 sniper Exp $ */ +/* $Id: xmlrpc-epi-php.c,v 1.24.2.4 2003/08/28 20:01:32 iliaa Exp $ */ /********************************************************************** * BUGS: * @@ -931,7 +931,7 @@ else { /* could not create description */ if(err.xml_elem_error.parser_code) { - zend_error(E_WARNING, "xml parse error: [line %i, column %i, message: %s] Unable to add introspection data returned from %s()", + zend_error(E_WARNING, "xml parse error: [line %ld, column %ld, message: %s] Unable to add introspection data returned from %s()", err.xml_elem_error.column, err.xml_elem_error.line, err.xml_elem_error.parser_error, Z_STRVAL_PP(php_function)); } else { @@ -1221,7 +1221,7 @@ else { /* could not create description */ if(err.xml_elem_error.parser_code) { - zend_error(E_WARNING, "xml parse error: [line %i, column %i, message: %s] Unable to create introspection data", + zend_error(E_WARNING, "xml parse error: [line %ld, column %ld, message: %s] Unable to create introspection data", err.xml_elem_error.column, err.xml_elem_error.line, err.xml_elem_error.parser_error); } else { Index: php-src/ext/xslt/sablot.c diff -u php-src/ext/xslt/sablot.c:1.68.2.3 php-src/ext/xslt/sablot.c:1.68.2.4 --- php-src/ext/xslt/sablot.c:1.68.2.3 Thu Mar 6 15:58:17 2003 +++ php-src/ext/xslt/sablot.c Thu Aug 28 16:01:33 2003 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sablot.c,v 1.68.2.3 2003/03/06 20:58:17 sesser Exp $ */ +/* $Id: sablot.c,v 1.68.2.4 2003/08/28 20:01:33 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -279,7 +279,7 @@ key_type = zend_hash_get_current_key(sax_handlers, &string_key, &num_key, 0); if (key_type == HASH_KEY_IS_LONG) { convert_to_string_ex(handler); - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Skipping numerical index %d (with value %s)", + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Skipping numerical index %ld (with value %s)", num_key, Z_STRVAL_PP(handler)); continue; } @@ -363,7 +363,7 @@ key_type = zend_hash_get_current_key(scheme_handlers, &string_key, &num_key, 0); if (key_type == HASH_KEY_IS_LONG) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Numerical key %d (with value %s) being ignored", + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Numerical key %ld (with value %s) being ignored", num_key, Z_STRVAL_PP(handler)); continue; } Index: php-src/ext/zlib/zlib.c diff -u php-src/ext/zlib/zlib.c:1.153.2.14 php-src/ext/zlib/zlib.c:1.153.2.15 --- php-src/ext/zlib/zlib.c:1.153.2.14 Thu Aug 28 12:05:17 2003 +++ php-src/ext/zlib/zlib.c Thu Aug 28 16:01:34 2003 @@ -18,7 +18,7 @@ | Jade Nicoletti <nicoletti@nns.ch> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.153.2.14 2003/08/28 16:05:17 sr Exp $ */ +/* $Id: zlib.c,v 1.153.2.15 2003/08/28 20:01:34 iliaa Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -818,7 +818,7 @@ } if((level<-1)||(level>9)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "compression level(%d) must be within -1..9", level); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "compression level(%ld) must be within -1..9", level); RETURN_FALSE; }
Index: php-src/ext/calendar/calendar.c diff -u php-src/ext/calendar/calendar.c:1.30.2.2 php-src/ext/calendar/calendar.c:1.30.2.3 --- php-src/ext/calendar/calendar.c:1.30.2.2 Tue Dec 31 11:34:11 2002 +++ php-src/ext/calendar/calendar.c Thu Aug 28 16:01:24 2003 @@ -18,7 +18,7 @@ | Wez Furlong <wez@thebrainroom.com> | +----------------------------------------------------------------------+ */ -/* $Id: calendar.c,v 1.30.2.2 2002/12/31 16:34:11 sebastian Exp $ */ +/* $Id: calendar.c,v 1.30.2.3 2003/08/28 20:01:24 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -161,7 +161,7 @@ } convert_to_long_ex(cal); if (Z_LVAL_PP(cal) < 0 || Z_LVAL_PP(cal) >= CAL_NUM_CALS) { - zend_error(E_WARNING, "%s(): invalid calendar ID %d", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal)); + zend_error(E_WARNING, "%s(): invalid calendar ID %ld", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal)); RETURN_FALSE; } @@ -203,7 +203,7 @@ convert_to_long_ex(year); if (Z_LVAL_PP(cal) < 0 || Z_LVAL_PP(cal) >= CAL_NUM_CALS) { - zend_error(E_WARNING, "%s(): invalid calendar ID %d", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal)); + zend_error(E_WARNING, "%s(): invalid calendar ID %ld", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal)); RETURN_FALSE; } @@ -239,7 +239,7 @@ convert_to_long_ex(year); if (Z_LVAL_PP(cal) < 0 || Z_LVAL_PP(cal) >= CAL_NUM_CALS) { - zend_error(E_WARNING, "%s(): invalid calendar ID %d", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal)); + zend_error(E_WARNING, "%s(): invalid calendar ID %ld", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal)); RETURN_FALSE; } @@ -265,7 +265,7 @@ convert_to_long_ex(cal); if (Z_LVAL_PP(cal) < 0 || Z_LVAL_PP(cal) >= CAL_NUM_CALS) { - zend_error(E_WARNING, "%s(): invalid calendar ID %d", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal)); + zend_error(E_WARNING, "%s(): invalid calendar ID %ld", get_active_function_name(TSRMLS_C), Z_LVAL_PP(cal)); RETURN_FALSE; } calendar = &cal_conversion_table[Z_LVAL_PP(cal)]; Index: php-src/ext/db/db.c diff -u php-src/ext/db/db.c:1.81.2.3 php-src/ext/db/db.c:1.81.2.4 --- php-src/ext/db/db.c:1.81.2.3 Thu Mar 6 15:58:14 2003 +++ php-src/ext/db/db.c Thu Aug 28 16:01:25 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.81.2.3 2003/03/06 20:58:14 sesser Exp $ */ +/* $Id: db.c,v 1.81.2.4 2003/08/28 20:01:25 iliaa Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -513,7 +513,7 @@ info = php_find_dbm(id TSRMLS_CC); if (!info) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %ld", Z_LVAL_P(id)); RETURN_FALSE; } @@ -539,7 +539,7 @@ info = php_find_dbm(id TSRMLS_CC); if (!info) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %ld", Z_LVAL_P(id)); RETURN_FALSE; } @@ -607,7 +607,7 @@ info = php_find_dbm(id TSRMLS_CC); if (!info) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %ld", Z_LVAL_P(id)); RETURN_FALSE; } @@ -683,7 +683,7 @@ info = php_find_dbm(id TSRMLS_CC); if (!info) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %ld", Z_LVAL_P(id)); RETURN_FALSE; } @@ -732,7 +732,7 @@ info = php_find_dbm(id TSRMLS_CC); if (!info) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %ld", Z_LVAL_P(id)); RETURN_FALSE; } @@ -779,7 +779,7 @@ info = php_find_dbm(id TSRMLS_CC); if (!info) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %ld", Z_LVAL_P(id)); RETURN_FALSE; } @@ -841,7 +841,7 @@ info = php_find_dbm(id TSRMLS_CC); if (!info) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %ld", Z_LVAL_P(id)); RETURN_FALSE; } Index: php-src/ext/dio/dio.c diff -u php-src/ext/dio/dio.c:1.21.2.3 php-src/ext/dio/dio.c:1.21.2.4 --- php-src/ext/dio/dio.c:1.21.2.3 Fri Mar 7 08:42:11 2003 +++ php-src/ext/dio/dio.c Thu Aug 28 16:01:26 2003 @@ -161,7 +161,7 @@ } if (fd == -1) { - php_error(E_WARNING, "%s(): cannot open file %s with flags %d and permissions %d: %s", + php_error(E_WARNING, "%s(): cannot open file %s with flags %ld and permissions %ld: %s", get_active_function_name(TSRMLS_C), file_name, flags, mode, strerror(errno)); RETURN_FALSE; } @@ -240,7 +240,7 @@ ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd); if (ftruncate(f->fd, offset) == -1) { - php_error(E_WARNING, "%s(): couldn't truncate %d to %d bytes: %s", + php_error(E_WARNING, "%s(): couldn't truncate %d to %ld bytes: %s", get_active_function_name(TSRMLS_C), f->fd, offset, strerror(errno)); RETURN_FALSE; } Index: php-src/ext/filepro/filepro.c diff -u php-src/ext/filepro/filepro.c:1.47.2.1 php-src/ext/filepro/filepro.c:1.47.2.2 --- php-src/ext/filepro/filepro.c:1.47.2.1 Tue Dec 31 11:34:32 2002 +++ php-src/ext/filepro/filepro.c Thu Aug 28 16:01:26 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filepro.c,v 1.47.2.1 2002/12/31 16:34:32 sebastian Exp $ */ +/* $Id: filepro.c,v 1.47.2.2 2003/08/28 20:01:26 iliaa Exp $ */ /* filePro 4.x support developed by Chad Robinson, chadr@brttech.com @@ -386,7 +386,7 @@ } php_error(E_WARNING, - "%s(): Unable to locate field number %d.", get_active_function_name(TSRMLS_C), + "%s(): Unable to locate field number %ld.", get_active_function_name(TSRMLS_C), Z_LVAL_P(fno)); RETVAL_FALSE; @@ -426,7 +426,7 @@ } } php_error(E_WARNING, - "%s(): Unable to locate field number %d.", get_active_function_name(TSRMLS_C), + "%s(): Unable to locate field number %ld.", get_active_function_name(TSRMLS_C), Z_LVAL_P(fno)); RETVAL_FALSE; } @@ -465,7 +465,7 @@ } } php_error(E_WARNING, - "%s(): Unable to locate field number %d.", get_active_function_name(TSRMLS_C), + "%s(): Unable to locate field number %ld.", get_active_function_name(TSRMLS_C), Z_LVAL_P(fno)); RETVAL_FALSE; } Index: php-src/ext/hyperwave/hw.c diff -u php-src/ext/hyperwave/hw.c:1.111.2.6 php-src/ext/hyperwave/hw.c:1.111.2.7 --- php-src/ext/hyperwave/hw.c:1.111.2.6 Sun Jun 29 19:59:20 2003 +++ php-src/ext/hyperwave/hw.c Thu Aug 28 16:01:27 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hw.c,v 1.111.2.6 2003/06/29 23:59:20 edink Exp $ */ +/* $Id: hw.c,v 1.111.2.7 2003/08/28 20:01:27 iliaa Exp $ */ #include <stdlib.h> #include <errno.h> @@ -766,7 +766,7 @@ list_entry new_le; if (HwSG(max_links)!=-1 && HwSG(num_links)>=HwSG(max_links)) { - php_error(E_ERROR, "%s(): Too many open links (%d)", get_active_function_name(TSRMLS_C), HwSG(num_links)); + php_error(E_ERROR, "%s(): Too many open links (%ld)", get_active_function_name(TSRMLS_C), HwSG(num_links)); if(host) efree(host); if(username) efree(username); if(password) efree(password); @@ -774,7 +774,7 @@ RETURN_FALSE; } if (HwSG(max_persistent!=-1) && HwSG(num_persistent)>=HwSG(max_persistent)) { - php_error(E_ERROR, "%s(): Too many open persistent links (%d)", get_active_function_name(TSRMLS_C), HwSG(num_persistent)); + php_error(E_ERROR, "%s(): Too many open persistent links (%ld)", get_active_function_name(TSRMLS_C), HwSG(num_persistent)); if(host) efree(host); if(username) efree(username); if(password) efree(password); Index: php-src/ext/ldap/ldap.c diff -u php-src/ext/ldap/ldap.c:1.130.2.4 php-src/ext/ldap/ldap.c:1.130.2.5 --- php-src/ext/ldap/ldap.c:1.130.2.4 Wed Apr 30 17:54:02 2003 +++ php-src/ext/ldap/ldap.c Thu Aug 28 16:01:28 2003 @@ -22,7 +22,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ldap.c,v 1.130.2.4 2003/04/30 21:54:02 iliaa Exp $ */ +/* $Id: ldap.c,v 1.130.2.5 2003/08/28 20:01:28 iliaa Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -286,7 +286,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "LDAP Support", "enabled" ); - php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.130.2.4 2003/04/30 21:54:02 iliaa Exp $" ); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.130.2.5 2003/08/28 20:01:28 iliaa Exp $" ); if (LDAPG(max_links) == -1) { snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links)); @@ -374,7 +374,7 @@ #endif if (LDAPG(max_links) != -1 && LDAPG(num_links) >= LDAPG(max_links)) { - php_error(E_WARNING, "%s(): Too many open links (%d)", get_active_function_name(TSRMLS_C), LDAPG(num_links)); + php_error(E_WARNING, "%s(): Too many open links (%ld)", get_active_function_name(TSRMLS_C), LDAPG(num_links)); RETURN_FALSE; } Index: php-src/ext/mssql/php_mssql.c diff -u php-src/ext/mssql/php_mssql.c:1.86.2.23 php-src/ext/mssql/php_mssql.c:1.86.2.24 --- php-src/ext/mssql/php_mssql.c:1.86.2.23 Wed Jul 23 12:54:54 2003 +++ php-src/ext/mssql/php_mssql.c Thu Aug 28 16:01:29 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.86.2.23 2003/07/23 16:54:54 iliaa Exp $ */ +/* $Id: php_mssql.c,v 1.86.2.24 2003/08/28 20:01:29 iliaa Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -483,13 +483,13 @@ list_entry new_le; if (MS_SQL_G(max_links) != -1 && MS_SQL_G(num_links) >= MS_SQL_G(max_links)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%d)", MS_SQL_G(num_links)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%ld)", MS_SQL_G(num_links)); efree(hashed_details); dbfreelogin(mssql.login); RETURN_FALSE; } if (MS_SQL_G(max_persistent) != -1 && MS_SQL_G(num_persistent) >= MS_SQL_G(max_persistent)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open persistent links (%d)", MS_SQL_G(num_persistent)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open persistent links (%ld)", MS_SQL_G(num_persistent)); efree(hashed_details); dbfreelogin(mssql.login); RETURN_FALSE; @@ -604,7 +604,7 @@ } } if (MS_SQL_G(max_links) != -1 && MS_SQL_G(num_links) >= MS_SQL_G(max_links)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%d)", MS_SQL_G(num_links)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%ld)", MS_SQL_G(num_links)); efree(hashed_details); RETURN_FALSE; } @@ -1730,7 +1730,7 @@ convert_to_long_ex(row); if (Z_LVAL_PP(row) < 0 || Z_LVAL_PP(row) >= result->num_rows) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad row offset (%d)", Z_LVAL_PP(row)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad row offset (%ld)", Z_LVAL_PP(row)); RETURN_FALSE; } Index: php-src/ext/pspell/pspell.c diff -u php-src/ext/pspell/pspell.c:1.28.8.4 php-src/ext/pspell/pspell.c:1.28.8.5 --- php-src/ext/pspell/pspell.c:1.28.8.4 Wed Aug 13 16:59:44 2003 +++ php-src/ext/pspell/pspell.c Thu Aug 28 16:01:29 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pspell.c,v 1.28.8.4 2003/08/13 20:59:44 vlad Exp $ */ +/* $Id: pspell.c,v 1.28.8.5 2003/08/28 20:01:29 iliaa Exp $ */ #define IS_EXT_MODULE @@ -354,7 +354,7 @@ config = (PspellConfig *) zend_list_find(Z_LVAL_PP(conf), &type); if (config == NULL || type != le_pspell_config) { - php_error(E_WARNING, "%d is not a PSPELL config index", Z_LVAL_PP(conf)); + php_error(E_WARNING, "%ld is not a PSPELL config index", Z_LVAL_PP(conf)); RETURN_FALSE; } @@ -389,7 +389,7 @@ convert_to_string_ex(word); manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); if(!manager){ - php_error(E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); RETURN_FALSE; } @@ -421,7 +421,7 @@ convert_to_string_ex(word); manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); if(!manager){ - php_error(E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); RETURN_FALSE; } @@ -460,7 +460,7 @@ convert_to_string_ex(corr); manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); if(!manager){ - php_error(E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); RETURN_FALSE; } @@ -492,7 +492,7 @@ convert_to_string_ex(word); manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); if(!manager){ - php_error(E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); RETURN_FALSE; } @@ -529,7 +529,7 @@ convert_to_string_ex(word); manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); if(!manager){ - php_error(E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); RETURN_FALSE; } @@ -565,7 +565,7 @@ convert_to_long_ex(scin); manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); if(!manager){ - php_error(E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); RETURN_FALSE; } @@ -596,7 +596,7 @@ convert_to_long_ex(scin); manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), &type); if(!manager){ - php_error(E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error(E_WARNING, "%ld is not a PSPELL result index",Z_LVAL_PP(scin)); RETURN_FALSE; } @@ -679,7 +679,7 @@ convert_to_long_ex(sccin); config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); if(!config){ - php_error(E_WARNING, "%d is not a PSPELL config index",Z_LVAL_PP(sccin)); + php_error(E_WARNING, "%ld is not a PSPELL config index",Z_LVAL_PP(sccin)); RETURN_FALSE; } @@ -708,7 +708,7 @@ convert_to_long_ex(sccin); config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); if(!config){ - php_error(E_WARNING, "%d is not a PSPELL config index",Z_LVAL_PP(sccin)); + php_error(E_WARNING, "%ld is not a PSPELL config index",Z_LVAL_PP(sccin)); RETURN_FALSE; } @@ -749,7 +749,7 @@ convert_to_long_ex(sccin); config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); if(!config){ - php_error(E_WARNING, "%d is not a PSPELL config index",Z_LVAL_PP(sccin)); + php_error(E_WARNING, "%ld is not a PSPELL config index",Z_LVAL_PP(sccin)); RETURN_FALSE; } @@ -795,7 +795,7 @@ convert_to_long_ex(sccin); config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); if(!config){ - php_error(E_WARNING, "%d is not a PSPELL config index",Z_LVAL_PP(sccin)); + php_error(E_WARNING, "%ld is not a PSPELL config index",Z_LVAL_PP(sccin)); RETURN_FALSE; } @@ -833,7 +833,7 @@ convert_to_long_ex(sccin); config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); if(!config){ - php_error(E_WARNING, "%d is not a PSPELL config index",Z_LVAL_PP(sccin)); + php_error(E_WARNING, "%ld is not a PSPELL config index",Z_LVAL_PP(sccin)); RETURN_FALSE; } @@ -873,7 +873,7 @@ convert_to_long_ex(sccin); config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), &type); if(!config){ - php_error(E_WARNING, "%d is not a PSPELL config index",Z_LVAL_PP(sccin)); + php_error(E_WARNING, "%ld is not a PSPELL config index",Z_LVAL_PP(sccin)); RETURN_FALSE; } Index: php-src/ext/sockets/sockets.c diff -u php-src/ext/sockets/sockets.c:1.125.2.18 php-src/ext/sockets/sockets.c:1.125.2.19 --- php-src/ext/sockets/sockets.c:1.125.2.18 Thu Jul 24 21:50:09 2003 +++ php-src/ext/sockets/sockets.c Thu Aug 28 16:01:30 2003 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sockets.c,v 1.125.2.18 2003/07/25 01:50:09 jason Exp $ */ +/* $Id: sockets.c,v 1.125.2.19 2003/08/28 20:01:30 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -960,12 +960,12 @@ } if (arg1 != AF_UNIX && arg1 != AF_INET) { - php_error(E_WARNING, "%s() invalid socket domain [%d] specified for argument 1, assuming AF_INET", get_active_function_name(TSRMLS_C), arg1); + php_error(E_WARNING, "%s() invalid socket domain [%ld] specified for argument 1, assuming AF_INET", get_active_function_name(TSRMLS_C), arg1); arg1 = AF_INET; } if (arg2 > 10) { - php_error(E_WARNING, "%s() invalid socket type [%d] specified for argument 2, assuming SOCK_STREAM", get_active_function_name(TSRMLS_C), arg2); + php_error(E_WARNING, "%s() invalid socket type [%ld] specified for argument 2, assuming SOCK_STREAM", get_active_function_name(TSRMLS_C), arg2); arg2 = SOCK_STREAM; } @@ -1979,12 +1979,12 @@ php_sock[1] = (php_socket*)emalloc(sizeof(php_socket)); if (domain != AF_INET && domain != AF_UNIX) { - php_error(E_WARNING, "%s() invalid socket domain [%d] specified for argument 1, assuming AF_INET", get_active_function_name(TSRMLS_C), domain); + php_error(E_WARNING, "%s() invalid socket domain [%ld] specified for argument 1, assuming AF_INET", get_active_function_name(TSRMLS_C), domain); domain = AF_INET; } if (type > 10) { - php_error(E_WARNING, "%s() invalid socket type [%d] specified for argument 2, assuming SOCK_STREAM", get_active_function_name(TSRMLS_C), type); + php_error(E_WARNING, "%s() invalid socket type [%ld] specified for argument 2, assuming SOCK_STREAM", get_active_function_name(TSRMLS_C), type); type = SOCK_STREAM; } Index: php-src/ext/sysvsem/sysvsem.c diff -u php-src/ext/sysvsem/sysvsem.c:1.41.2.2 php-src/ext/sysvsem/sysvsem.c:1.41.2.3 --- php-src/ext/sysvsem/sysvsem.c:1.41.2.2 Fri Mar 7 08:42:20 2003 +++ php-src/ext/sysvsem/sysvsem.c Thu Aug 28 16:01:31 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvsem.c,v 1.41.2.2 2003/03/07 13:42:20 ddhill Exp $ */ +/* $Id: sysvsem.c,v 1.41.2.3 2003/08/28 20:01:31 iliaa Exp $ */ /* Latest update build anc tested on Linux 2.2.14 * @@ -185,7 +185,7 @@ semid = semget(key, 3, perm|IPC_CREAT); if (semid == -1) { - php_error(E_WARNING, "semget() failed for key 0x%x: %s", key, strerror(errno)); + php_error(E_WARNING, "semget() failed for key 0x%lx: %s", key, strerror(errno)); RETURN_FALSE; } @@ -217,7 +217,7 @@ sop[2].sem_flg = SEM_UNDO; while (semop(semid, sop, 3) == -1) { if (errno != EINTR) { - php_error(E_WARNING, "semop() failed acquiring SYSVSEM_SETVAL for key 0x%x: %s", key, strerror(errno)); + php_error(E_WARNING, "semop() failed acquiring SYSVSEM_SETVAL for key 0x%lx: %s", key, strerror(errno)); break; } } @@ -229,7 +229,7 @@ count = semctl(semid, SYSVSEM_USAGE, GETVAL, NULL); #endif if (count == -1) { - php_error(E_WARNING, "semctl(GETVAL) failed for key 0x%x: %s", key, strerror(errno)); + php_error(E_WARNING, "semctl(GETVAL) failed for key 0x%lx: %s", key, strerror(errno)); } /* If we are the only user, then take this opportunity to set the max. */ @@ -240,17 +240,17 @@ union semun semarg; semarg.val = max_acquire; if (semctl(semid, SYSVSEM_SEM, SETVAL, semarg) == -1) { - php_error(E_WARNING, "semctl(SETVAL) failed for key 0x%x: %s", key, strerror(errno)); + php_error(E_WARNING, "semctl(SETVAL) failed for key 0x%lx: %s", key, strerror(errno)); } #elif defined(SETVAL_WANTS_PTR) /* This is correct for Solaris 2.6 which does not have union semun. */ if (semctl(semid, SYSVSEM_SEM, SETVAL, &max_acquire) == -1) { - php_error(E_WARNING, "semctl(SETVAL) failed for key 0x%x: %s", key, strerror(errno)); + php_error(E_WARNING, "semctl(SETVAL) failed for key 0x%lx: %s", key, strerror(errno)); } #else /* This works for i.e. AIX */ if (semctl(semid, SYSVSEM_SEM, SETVAL, max_acquire) == -1) { - php_error(E_WARNING, "semctl(SETVAL) failed for key 0x%x: %s", key, strerror(errno)); + php_error(E_WARNING, "semctl(SETVAL) failed for key 0x%lx: %s", key, strerror(errno)); } #endif } @@ -262,7 +262,7 @@ sop[0].sem_flg = SEM_UNDO; while (semop(semid, sop, 1) == -1) { if (errno != EINTR) { - php_error(E_WARNING, "semop() failed releasing SYSVSEM_SETVAL for key 0x%x: %s", key, strerror(errno)); + php_error(E_WARNING, "semop() failed releasing SYSVSEM_SETVAL for key 0x%lx: %s", key, strerror(errno)); break; } } @@ -299,7 +299,7 @@ ZEND_FETCH_RESOURCE(sem_ptr, sysvsem_sem *, arg_id, -1, "SysV semphore", php_sysvsem_module.le_sem); if (!acquire && sem_ptr->count == 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "SysV semaphore %d (key 0x%x) is not currently acquired", Z_LVAL_PP(arg_id), sem_ptr->key); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "SysV semaphore %ld (key 0x%x) is not currently acquired", Z_LVAL_PP(arg_id), sem_ptr->key); RETURN_FALSE; } @@ -365,7 +365,7 @@ #else if(semctl(sem_ptr->semid, 0, IPC_STAT, NULL) < 0) { #endif - php_error_docref(NULL TSRMLS_CC, E_WARNING, "SysV semphore %d does not (any longer) exist", Z_LVAL_PP(arg_id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "SysV semphore %ld does not (any longer) exist", Z_LVAL_PP(arg_id)); RETURN_FALSE; } @@ -374,7 +374,7 @@ #else if(semctl(sem_ptr->semid, 0, IPC_RMID, NULL) < 0) { #endif - php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for SysV sempphore %d: %s", Z_LVAL_PP(arg_id), strerror(errno)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for SysV sempphore %ld: %s", Z_LVAL_PP(arg_id), strerror(errno)); RETURN_FALSE; } Index: php-src/ext/sysvshm/sysvshm.c diff -u php-src/ext/sysvshm/sysvshm.c:1.56.8.2 php-src/ext/sysvshm/sysvshm.c:1.56.8.3 --- php-src/ext/sysvshm/sysvshm.c:1.56.8.2 Tue Dec 31 11:35:40 2002 +++ php-src/ext/sysvshm/sysvshm.c Thu Aug 28 16:01:32 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvshm.c,v 1.56.8.2 2002/12/31 16:35:40 sebastian Exp $ */ +/* $Id: sysvshm.c,v 1.56.8.3 2003/08/28 20:01:32 iliaa Exp $ */ /* This has been built and tested on Linux 2.2.14 * @@ -215,7 +215,7 @@ } if(shmctl(shm_list_ptr->id,IPC_RMID,NULL)<0) { - php_error(E_WARNING, "shm_remove() failed for key 0x%x, id %i: %s", shm_list_ptr->key, id,strerror(errno)); + php_error(E_WARNING, "shm_remove() failed for key 0x%x, id %ld: %s", shm_list_ptr->key, id,strerror(errno)); RETURN_FALSE; } @@ -246,7 +246,7 @@ shm_list_ptr = (sysvshm_shm *) zend_list_find(id, &type); if (type!=php_sysvshm.le_shm) { - php_error(E_WARNING, "%d is not a SysV shared memory index", id); + php_error(E_WARNING, "%ld is not a SysV shared memory index", id); RETURN_FALSE; } @@ -293,7 +293,7 @@ shm_list_ptr = (sysvshm_shm *) zend_list_find(id, &type); if (type!=php_sysvshm.le_shm) { - php_error(E_WARNING, "%d is not a SysV shared memory index", id); + php_error(E_WARNING, "%ld is not a SysV shared memory index", id); RETURN_FALSE; } @@ -302,7 +302,7 @@ shm_varpos=php_check_shm_data((shm_list_ptr->ptr),key); if(shm_varpos<0) { - php_error(E_WARNING, "variable key %d doesn't exist", key); + php_error(E_WARNING, "variable key %ld doesn't exist", key); RETURN_FALSE; } shm_var=(sysvshm_chunk*)((char*)shm_list_ptr->ptr+shm_varpos); @@ -339,14 +339,14 @@ shm_list_ptr = (sysvshm_shm *) zend_list_find(id, &type); if (type!=php_sysvshm.le_shm) { - php_error(E_WARNING, "%d is not a SysV shared memory index", id); + php_error(E_WARNING, "%ld is not a SysV shared memory index", id); RETURN_FALSE; } shm_varpos=php_check_shm_data((shm_list_ptr->ptr),key); if(shm_varpos<0) { - php_error(E_WARNING, "variable key %d doesn't exist", key); + php_error(E_WARNING, "variable key %ld doesn't exist", key); RETURN_FALSE; } php_remove_shm_data((shm_list_ptr->ptr),shm_varpos); Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.24.2.3 php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.24.2.4 --- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.24.2.3 Wed Jul 23 22:53:46 2003 +++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Thu Aug 28 16:01:32 2003 @@ -51,7 +51,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xmlrpc-epi-php.c,v 1.24.2.3 2003/07/24 02:53:46 sniper Exp $ */ +/* $Id: xmlrpc-epi-php.c,v 1.24.2.4 2003/08/28 20:01:32 iliaa Exp $ */ /********************************************************************** * BUGS: * @@ -931,7 +931,7 @@ else { /* could not create description */ if(err.xml_elem_error.parser_code) { - zend_error(E_WARNING, "xml parse error: [line %i, column %i, message: %s] Unable to add introspection data returned from %s()", + zend_error(E_WARNING, "xml parse error: [line %ld, column %ld, message: %s] Unable to add introspection data returned from %s()", err.xml_elem_error.column, err.xml_elem_error.line, err.xml_elem_error.parser_error, Z_STRVAL_PP(php_function)); } else { @@ -1221,7 +1221,7 @@ else { /* could not create description */ if(err.xml_elem_error.parser_code) { - zend_error(E_WARNING, "xml parse error: [line %i, column %i, message: %s] Unable to create introspection data", + zend_error(E_WARNING, "xml parse error: [line %ld, column %ld, message: %s] Unable to create introspection data", err.xml_elem_error.column, err.xml_elem_error.line, err.xml_elem_error.parser_error); } else { Index: php-src/ext/xslt/sablot.c diff -u php-src/ext/xslt/sablot.c:1.68.2.3 php-src/ext/xslt/sablot.c:1.68.2.4 --- php-src/ext/xslt/sablot.c:1.68.2.3 Thu Mar 6 15:58:17 2003 +++ php-src/ext/xslt/sablot.c Thu Aug 28 16:01:33 2003 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sablot.c,v 1.68.2.3 2003/03/06 20:58:17 sesser Exp $ */ +/* $Id: sablot.c,v 1.68.2.4 2003/08/28 20:01:33 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -279,7 +279,7 @@ key_type = zend_hash_get_current_key(sax_handlers, &string_key, &num_key, 0); if (key_type == HASH_KEY_IS_LONG) { convert_to_string_ex(handler); - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Skipping numerical index %d (with value %s)", + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Skipping numerical index %ld (with value %s)", num_key, Z_STRVAL_PP(handler)); continue; } @@ -363,7 +363,7 @@ key_type = zend_hash_get_current_key(scheme_handlers, &string_key, &num_key, 0); if (key_type == HASH_KEY_IS_LONG) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Numerical key %d (with value %s) being ignored", + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Numerical key %ld (with value %s) being ignored", num_key, Z_STRVAL_PP(handler)); continue; } Index: php-src/ext/zlib/zlib.c diff -u php-src/ext/zlib/zlib.c:1.153.2.14 php-src/ext/zlib/zlib.c:1.153.2.15 --- php-src/ext/zlib/zlib.c:1.153.2.14 Thu Aug 28 12:05:17 2003 +++ php-src/ext/zlib/zlib.c Thu Aug 28 16:01:34 2003 @@ -18,7 +18,7 @@ | Jade Nicoletti <nicoletti@nns.ch> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.153.2.14 2003/08/28 16:05:17 sr Exp $ */ +/* $Id: zlib.c,v 1.153.2.15 2003/08/28 20:01:34 iliaa Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -818,7 +818,7 @@ } if((level<-1)||(level>9)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "compression level(%d) must be within -1..9", level); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "compression level(%ld) must be within -1..9", level); RETURN_FALSE; }