cvs: php-src /ext/db db.c /ext/dbase dbase.c /ext/filepro filepro.c /ext/gd gd.c /ext/msql php_msql.c /ext/mssql php_mssql.c /ext/mysqli
mysqli_api.c /ext/odbc birdstep.c /ext/pgsql pgsql.c /ext/pspell pspell.c /ext/sybase php_sybase_db.c
| From: | Andrey Hristov | Date: | Thu, 28 Aug 2003 21:00:26 +0000 |
| Subject: | cvs: php-src /ext/db db.c /ext/dbase dbase.c /ext/filepro filepro.c /ext/gd gd.c /ext/msql php_msql.c /ext/mssql php_mssql.c /ext/mysqli mysqli_api.c /ext/odbc birdstep.c /ext/pgsql pgsql.c /ext/pspell pspell.c /ext/sybase php_sybase_db.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-23479@lists.php.net to get a copy of this message | ||
andrey Thu Aug 28 17:00:26 2003 EDT
Modified files:
/php-src/ext/db db.c
/php-src/ext/dbase dbase.c
/php-src/ext/filepro filepro.c
/php-src/ext/gd gd.c
/php-src/ext/msql php_msql.c
/php-src/ext/mssql php_mssql.c
/php-src/ext/mysqli mysqli_api.c
/php-src/ext/odbc birdstep.c
/php-src/ext/pgsql pgsql.c
/php-src/ext/pspell pspell.c
/php-src/ext/sybase php_sybase_db.c
Log:
format string fixes
Index: php-src/ext/db/db.c diff -u php-src/ext/db/db.c:1.90 php-src/ext/db/db.c:1.91 --- php-src/ext/db/db.c:1.90 Mon Aug 11 20:55:58 2003 +++ php-src/ext/db/db.c Thu Aug 28 17:00:12 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.90 2003/08/12 00:55:58 iliaa Exp $ */ +/* $Id: db.c,v 1.91 2003/08/28 21:00:12 andrey Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -505,7 +505,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; } @@ -531,7 +531,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; } @@ -599,7 +599,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; } @@ -675,7 +675,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; } @@ -724,7 +724,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; } @@ -771,7 +771,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; } @@ -833,7 +833,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/dbase/dbase.c diff -u php-src/ext/dbase/dbase.c:1.67 php-src/ext/dbase/dbase.c:1.68 --- php-src/ext/dbase/dbase.c:1.67 Thu Jul 31 14:28:47 2003 +++ php-src/ext/dbase/dbase.c Thu Aug 28 17:00:13 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbase.c,v 1.67 2003/07/31 18:28:47 sniper Exp $ */ +/* $Id: dbase.c,v 1.68 2003/08/28 21:00:13 andrey Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -163,7 +163,7 @@ convert_to_long_ex(dbh_id); dbh = zend_list_find(Z_LVAL_PP(dbh_id), &dbh_type); if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %d", Z_LVAL_PP(dbh_id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %ld", Z_LVAL_PP(dbh_id)); RETURN_FALSE; } @@ -187,7 +187,7 @@ convert_to_long_ex(dbh_id); dbh = zend_list_find(Z_LVAL_PP(dbh_id), &dbh_type); if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %d", Z_LVAL_PP(dbh_id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %ld", Z_LVAL_PP(dbh_id)); RETURN_FALSE; } @@ -210,7 +210,7 @@ convert_to_long_ex(dbh_id); dbh = zend_list_find(Z_LVAL_PP(dbh_id), &dbh_type); if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %d", Z_LVAL_PP(dbh_id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %ld", Z_LVAL_PP(dbh_id)); RETURN_FALSE; } @@ -233,7 +233,7 @@ convert_to_long_ex(dbh_id); dbh = zend_list_find(Z_LVAL_PP(dbh_id), &dbh_type); if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %d", Z_LVAL_PP(dbh_id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %ld", Z_LVAL_PP(dbh_id)); RETURN_FALSE; } @@ -268,7 +268,7 @@ dbh = zend_list_find(Z_LVAL_PP(dbh_id), &dbh_type); if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %d", Z_LVAL_PP(dbh_id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %ld", Z_LVAL_PP(dbh_id)); RETURN_FALSE; } @@ -339,7 +339,7 @@ dbh = zend_list_find(Z_LVAL_PP(dbh_id), &dbh_type); if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %d", Z_LVAL_PP(dbh_id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %ld", Z_LVAL_PP(dbh_id)); RETURN_FALSE; } @@ -395,15 +395,15 @@ dbh = zend_list_find(Z_LVAL_PP(dbh_id), &dbh_type); if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %d", Z_LVAL_PP(dbh_id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %ld", Z_LVAL_PP(dbh_id)); RETURN_FALSE; } if (del_dbf_record(dbh, Z_LVAL_PP(record)) < 0) { if (Z_LVAL_PP(record) > dbh->db_records) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "record %d out of bounds", Z_LVAL_PP(record)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "record %ld out of bounds", Z_LVAL_PP(record)); } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to delete record %d", Z_LVAL_PP(record)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to delete record %ld", Z_LVAL_PP(record)); } RETURN_FALSE; } @@ -435,12 +435,12 @@ dbh = zend_list_find(Z_LVAL_PP(dbh_id), &dbh_type); if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %d", Z_LVAL_PP(dbh_id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %ld", Z_LVAL_PP(dbh_id)); RETURN_FALSE; } if ((data = get_dbf_record(dbh, Z_LVAL_PP(record))) == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Tried to read bad record %d", Z_LVAL_PP(record)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Tried to read bad record %ld", Z_LVAL_PP(record)); RETURN_FALSE; } @@ -760,7 +760,7 @@ dbh = zend_list_find(Z_LVAL_PP(dbh_id), &dbh_type); if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %d", Z_LVAL_PP(dbh_id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %ld", Z_LVAL_PP(dbh_id)); RETURN_FALSE; } Index: php-src/ext/filepro/filepro.c diff -u php-src/ext/filepro/filepro.c:1.51 php-src/ext/filepro/filepro.c:1.52 --- php-src/ext/filepro/filepro.c:1.51 Tue Jun 10 16:03:28 2003 +++ php-src/ext/filepro/filepro.c Thu Aug 28 17:00:14 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filepro.c,v 1.51 2003/06/10 20:03:28 imajes Exp $ */ +/* $Id: filepro.c,v 1.52 2003/08/28 21:00:14 andrey Exp $ */ /* filePro 4.x support developed by Chad Robinson, chadr@brttech.com @@ -375,7 +375,7 @@ } } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to locate field number %d.", Z_LVAL_PP(fno)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to locate field number %ld.", Z_LVAL_PP(fno)); RETVAL_FALSE; } @@ -412,7 +412,7 @@ RETURN_STRING(lp->format, 1); } } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to locate field number %d.", Z_LVAL_PP(fno)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to locate field number %ld.", Z_LVAL_PP(fno)); RETVAL_FALSE; } /* }}} */ @@ -448,7 +448,7 @@ RETURN_LONG(lp->width); } } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to locate field number %d.", Z_LVAL_PP(fno)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to locate field number %ld.", Z_LVAL_PP(fno)); RETVAL_FALSE; } /* }}} */ Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.276 php-src/ext/gd/gd.c:1.277 --- php-src/ext/gd/gd.c:1.276 Mon Aug 11 20:55:57 2003 +++ php-src/ext/gd/gd.c Thu Aug 28 17:00:15 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.276 2003/08/12 00:55:57 iliaa Exp $ */ +/* $Id: gd.c,v 1.277 2003/08/28 21:00:15 andrey Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -3247,7 +3247,7 @@ of_ind = zend_list_find(Z_LVAL_PP(fnt), &type); if (type != le_ps_font) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a Type 1 font index", Z_LVAL_PP(fnt)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a Type 1 font index", Z_LVAL_PP(fnt)); RETURN_FALSE; } Index: php-src/ext/msql/php_msql.c diff -u php-src/ext/msql/php_msql.c:1.55 php-src/ext/msql/php_msql.c:1.56 --- php-src/ext/msql/php_msql.c:1.55 Mon Jun 16 12:36:41 2003 +++ php-src/ext/msql/php_msql.c Thu Aug 28 17:00:17 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_msql.c,v 1.55 2003/06/16 16:36:41 andrey Exp $ */ +/* $Id: php_msql.c,v 1.56 2003/08/28 21:00:17 andrey Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -786,7 +786,7 @@ convert_to_long(row); if (Z_LVAL_P(row)<0 || Z_LVAL_P(row)>=msqlNumRows(msql_result)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to jump to row %d on mSQL query index %d",Z_LVAL_P(row),Z_LVAL_P(result)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to jump to row %ld on mSQL query index %ld", Z_LVAL_P(row), Z_LVAL_P(result)); RETURN_FALSE; } msqlDataSeek(msql_result,Z_LVAL_P(row)); @@ -818,7 +818,7 @@ i++; } if (!tmp_field) { /* no match found */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s%s%s not found in mSQL query index %d", + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s%s%s not found in mSQL query index %ld", (table_name?table_name:""), (table_name?".":""), field_name, Z_LVAL_P(result)); efree(field_name); if (table_name) { @@ -1010,7 +1010,7 @@ if (!msql_result || Z_LVAL_P(offset)<0 || Z_LVAL_P(offset)>=msqlNumRows(msql_result)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is invalid for mSQL query index %d",Z_LVAL_P(offset),Z_LVAL_P(result)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is invalid for mSQL query index %ld", Z_LVAL_P(offset), Z_LVAL_P(result)); RETURN_FALSE; } msqlDataSeek(msql_result,Z_LVAL_P(offset)); @@ -1128,7 +1128,7 @@ RETURN_FALSE; } if (Z_LVAL_P(offset)<0 || Z_LVAL_P(offset)>=msqlNumFields(msql_result)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING,"Field %d is invalid for mSQL query index %d", + php_error_docref(NULL TSRMLS_CC, E_WARNING,"Field %ld is invalid for mSQL query index %ld", Z_LVAL_P(offset),Z_LVAL_P(result)); RETURN_FALSE; } @@ -1162,7 +1162,7 @@ } convert_to_long(field); if (Z_LVAL_P(field)<0 || Z_LVAL_P(field)>=msqlNumFields(msql_result)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING,"Field %d is invalid for mSQL query index %d",Z_LVAL_P(field),Z_LVAL_P(result)); + php_error_docref(NULL TSRMLS_CC, E_WARNING,"Field %ld is invalid for mSQL query index %ld", Z_LVAL_P(field), Z_LVAL_P(result)); RETURN_FALSE; } msqlFieldSeek(msql_result,Z_LVAL_P(field)); Index: php-src/ext/mssql/php_mssql.c diff -u php-src/ext/mssql/php_mssql.c:1.120 php-src/ext/mssql/php_mssql.c:1.121 --- php-src/ext/mssql/php_mssql.c:1.120 Mon Aug 18 07:18:41 2003 +++ php-src/ext/mssql/php_mssql.c Thu Aug 28 17:00:18 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.120 2003/08/18 11:18:41 iliaa Exp $ */ +/* $Id: php_mssql.c,v 1.121 2003/08/28 21:00:18 andrey Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -1726,7 +1726,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/mysqli/mysqli_api.c diff -u php-src/ext/mysqli/mysqli_api.c:1.40 php-src/ext/mysqli/mysqli_api.c:1.41 --- php-src/ext/mysqli/mysqli_api.c:1.40 Thu Aug 21 10:34:07 2003 +++ php-src/ext/mysqli/mysqli_api.c Thu Aug 28 17:00:19 2003 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli_api.c,v 1.40 2003/08/21 14:34:07 helly Exp $ + $Id: mysqli_api.c,v 1.41 2003/08/28 21:00:19 andrey Exp $ */ #ifdef HAVE_CONFIG_H @@ -173,7 +173,7 @@ break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Undefined fieldtype %d (parameter %d)", Z_LVAL_PP(args[i]), i+1); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Undefined fieldtype %ld (parameter %d)", Z_LVAL_PP(args[i]), i+1); efree(args); efree(bind); RETURN_FALSE; Index: php-src/ext/odbc/birdstep.c diff -u php-src/ext/odbc/birdstep.c:1.9 php-src/ext/odbc/birdstep.c:1.10 --- php-src/ext/odbc/birdstep.c:1.9 Mon Aug 18 00:41:47 2003 +++ php-src/ext/odbc/birdstep.c Thu Aug 28 17:00:21 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: birdstep.c,v 1.9 2003/08/18 04:41:47 iliaa Exp $ */ +/* $Id: birdstep.c,v 1.10 2003/08/28 21:00:21 andrey Exp $ */ /* * TODO: @@ -103,8 +103,8 @@ THREAD_LS birdstep_module php_birdstep_module; THREAD_LS static HENV henv; -#define PHP_GET_BIRDSTEP_RES_IDX(id) convert_to_long_ex(id); if (!(res = birdstep_find_result(list, Z_LVAL_PP(id)))) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: Not result index (%d)", Z_LVAL_PP(id)); RETURN_FALSE; } -#define PHP_BIRDSTEP_CHK_LNK(id) convert_to_long_ex(id); if (!(conn = birdstep_find_conn(list,Z_LVAL_PP(id)))) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: Not connection index (%d)", Z_LVAL_PP(id)); RETURN_FALSE; } +#define PHP_GET_BIRDSTEP_RES_IDX(id) convert_to_long_ex(id); if (!(res = birdstep_find_result(list, Z_LVAL_PP(id)))) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: Not result index (%ld)", Z_LVAL_PP(id)); RETURN_FALSE; } +#define PHP_BIRDSTEP_CHK_LNK(id) convert_to_long_ex(id); if (!(conn = birdstep_find_conn(list,Z_LVAL_PP(id)))) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: Not connection index (%ld)", Z_LVAL_PP(id)); RETURN_FALSE; } static void _close_birdstep_link(zend_rsrc_list_entry *rsrc TSRMLS_DC) Index: php-src/ext/pgsql/pgsql.c diff -u php-src/ext/pgsql/pgsql.c:1.291 php-src/ext/pgsql/pgsql.c:1.292 --- php-src/ext/pgsql/pgsql.c:1.291 Wed Aug 27 20:31:36 2003 +++ php-src/ext/pgsql/pgsql.c Thu Aug 28 17:00:22 2003 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.291 2003/08/28 00:31:36 iliaa Exp $ */ +/* $Id: pgsql.c,v 1.292 2003/08/28 21:00:22 andrey Exp $ */ #include <stdlib.h> @@ -1364,7 +1364,8 @@ convert_to_long_ex(row); pgsql_row = Z_LVAL_PP(row); if (pgsql_row < 0 || pgsql_row >= PQntuples(pgsql_result)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to jump to row %d on PostgreSQL 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 PostgreSQL result index %ld", + Z_LVAL_PP(row), Z_LVAL_PP(result)); RETURN_FALSE; } } @@ -1447,7 +1448,8 @@ pgsql_row = Z_LVAL_PP(row); pg_result->row = pgsql_row; if (pgsql_row < 0 || pgsql_row >= PQntuples(pgsql_result)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to jump to row %d on PostgreSQL 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 PostgreSQL result index %ld", + Z_LVAL_PP(row), Z_LVAL_PP(result)); RETURN_FALSE; } } else { @@ -1623,7 +1625,8 @@ convert_to_long_ex(row); pgsql_row = Z_LVAL_PP(row); if (pgsql_row < 0 || pgsql_row >= PQntuples(pgsql_result)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to jump to row %d on PostgreSQL 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 PostgreSQL result index %ld", + Z_LVAL_PP(row), Z_LVAL_PP(result)); RETURN_FALSE; } } @@ -2139,11 +2142,12 @@ if (argc > 2) { convert_to_long_ex(z_len); if (Z_LVAL_PP(z_len) > Z_STRLEN_PP(str)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot write more than buffer size %d. Tried to write %d", Z_LVAL_PP(str), Z_LVAL_PP(z_len)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot write more than buffer size %d. Tried to write %ld", + Z_STRLEN_PP(str), Z_LVAL_PP(z_len)); RETURN_FALSE; } if (Z_LVAL_PP(z_len) < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Buffer size must be larger than 0, but %d was specified", Z_LVAL_PP(str), Z_LVAL_PP(z_len)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Buffer size must be larger than 0, but %d was specified", Z_STRLEN_PP(str)); RETURN_FALSE; } len = Z_LVAL_PP(z_len); Index: php-src/ext/pspell/pspell.c diff -u php-src/ext/pspell/pspell.c:1.37 php-src/ext/pspell/pspell.c:1.38 --- php-src/ext/pspell/pspell.c:1.37 Wed Aug 13 17:01:04 2003 +++ php-src/ext/pspell/pspell.c Thu Aug 28 17:00:23 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pspell.c,v 1.37 2003/08/13 21:01:04 vlad Exp $ */ +/* $Id: pspell.c,v 1.38 2003/08/28 21:00:23 andrey 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL config index", Z_LVAL_PP(conf)); + php_error_docref(NULL TSRMLS_CC, 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error_docref(NULL TSRMLS_CC, 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error_docref(NULL TSRMLS_CC, 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error_docref(NULL TSRMLS_CC, 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error_docref(NULL TSRMLS_CC, 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error_docref(NULL TSRMLS_CC, 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error_docref(NULL TSRMLS_CC, 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error_docref(NULL TSRMLS_CC, 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL config index",Z_LVAL_PP(sccin)); + php_error_docref(NULL TSRMLS_CC, 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL config index",Z_LVAL_PP(sccin)); + php_error_docref(NULL TSRMLS_CC, 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL config index",Z_LVAL_PP(sccin)); + php_error_docref(NULL TSRMLS_CC, 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL config index",Z_LVAL_PP(sccin)); + php_error_docref(NULL TSRMLS_CC, 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL config index",Z_LVAL_PP(sccin)); + php_error_docref(NULL TSRMLS_CC, 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL config index",Z_LVAL_PP(sccin)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a PSPELL config index", Z_LVAL_PP(sccin)); RETURN_FALSE; } Index: php-src/ext/sybase/php_sybase_db.c diff -u php-src/ext/sybase/php_sybase_db.c:1.53 php-src/ext/sybase/php_sybase_db.c:1.54 --- php-src/ext/sybase/php_sybase_db.c:1.53 Mon Aug 11 20:55:55 2003 +++ php-src/ext/sybase/php_sybase_db.c Thu Aug 28 17:00:24 2003 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_db.c,v 1.53 2003/08/12 00:55:55 iliaa Exp $ */ +/* $Id: php_sybase_db.c,v 1.54 2003/08/28 21:00:24 andrey Exp $ */ #ifdef HAVE_CONFIG_H @@ -957,7 +957,7 @@ result = (sybase_result *) zend_list_find(Z_LVAL_PP(sybase_result_index),&type); if (type!=php_sybase_module.le_result) { - php_error_docref(NULL TSRMLS_CC, E_WARNING,"%d is not a Sybase result index",Z_LVAL_PP(sybase_result_index)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a Sybase result index", Z_LVAL_PP(sybase_result_index)); RETURN_FALSE; } zend_list_delete(Z_LVAL_PP(sybase_result_index)); @@ -1078,7 +1078,7 @@ result = (sybase_result *) zend_list_find(Z_LVAL_PP(sybase_result_index),&type); if (type!=php_sybase_module.le_result) { - php_error_docref(NULL TSRMLS_CC, E_WARNING,"%d is not a Sybase result index",Z_LVAL_PP(sybase_result_index)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a Sybase result index", Z_LVAL_PP(sybase_result_index)); RETURN_FALSE; } @@ -1314,7 +1314,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,"Sybase: Bad row offset (%d)",Z_LVAL_PP(row)); + php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase: Bad row offset (%ld)", Z_LVAL_PP(row)); RETURN_FALSE; }
Index: php-src/ext/db/db.c diff -u php-src/ext/db/db.c:1.90 php-src/ext/db/db.c:1.91 --- php-src/ext/db/db.c:1.90 Mon Aug 11 20:55:58 2003 +++ php-src/ext/db/db.c Thu Aug 28 17:00:12 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.90 2003/08/12 00:55:58 iliaa Exp $ */ +/* $Id: db.c,v 1.91 2003/08/28 21:00:12 andrey Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -505,7 +505,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; } @@ -531,7 +531,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; } @@ -599,7 +599,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; } @@ -675,7 +675,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; } @@ -724,7 +724,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; } @@ -771,7 +771,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; } @@ -833,7 +833,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/dbase/dbase.c diff -u php-src/ext/dbase/dbase.c:1.67 php-src/ext/dbase/dbase.c:1.68 --- php-src/ext/dbase/dbase.c:1.67 Thu Jul 31 14:28:47 2003 +++ php-src/ext/dbase/dbase.c Thu Aug 28 17:00:13 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbase.c,v 1.67 2003/07/31 18:28:47 sniper Exp $ */ +/* $Id: dbase.c,v 1.68 2003/08/28 21:00:13 andrey Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -163,7 +163,7 @@ convert_to_long_ex(dbh_id); dbh = zend_list_find(Z_LVAL_PP(dbh_id), &dbh_type); if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %d", Z_LVAL_PP(dbh_id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %ld", Z_LVAL_PP(dbh_id)); RETURN_FALSE; } @@ -187,7 +187,7 @@ convert_to_long_ex(dbh_id); dbh = zend_list_find(Z_LVAL_PP(dbh_id), &dbh_type); if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %d", Z_LVAL_PP(dbh_id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %ld", Z_LVAL_PP(dbh_id)); RETURN_FALSE; } @@ -210,7 +210,7 @@ convert_to_long_ex(dbh_id); dbh = zend_list_find(Z_LVAL_PP(dbh_id), &dbh_type); if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %d", Z_LVAL_PP(dbh_id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %ld", Z_LVAL_PP(dbh_id)); RETURN_FALSE; } @@ -233,7 +233,7 @@ convert_to_long_ex(dbh_id); dbh = zend_list_find(Z_LVAL_PP(dbh_id), &dbh_type); if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %d", Z_LVAL_PP(dbh_id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %ld", Z_LVAL_PP(dbh_id)); RETURN_FALSE; } @@ -268,7 +268,7 @@ dbh = zend_list_find(Z_LVAL_PP(dbh_id), &dbh_type); if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %d", Z_LVAL_PP(dbh_id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %ld", Z_LVAL_PP(dbh_id)); RETURN_FALSE; } @@ -339,7 +339,7 @@ dbh = zend_list_find(Z_LVAL_PP(dbh_id), &dbh_type); if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %d", Z_LVAL_PP(dbh_id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %ld", Z_LVAL_PP(dbh_id)); RETURN_FALSE; } @@ -395,15 +395,15 @@ dbh = zend_list_find(Z_LVAL_PP(dbh_id), &dbh_type); if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %d", Z_LVAL_PP(dbh_id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %ld", Z_LVAL_PP(dbh_id)); RETURN_FALSE; } if (del_dbf_record(dbh, Z_LVAL_PP(record)) < 0) { if (Z_LVAL_PP(record) > dbh->db_records) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "record %d out of bounds", Z_LVAL_PP(record)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "record %ld out of bounds", Z_LVAL_PP(record)); } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to delete record %d", Z_LVAL_PP(record)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to delete record %ld", Z_LVAL_PP(record)); } RETURN_FALSE; } @@ -435,12 +435,12 @@ dbh = zend_list_find(Z_LVAL_PP(dbh_id), &dbh_type); if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %d", Z_LVAL_PP(dbh_id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %ld", Z_LVAL_PP(dbh_id)); RETURN_FALSE; } if ((data = get_dbf_record(dbh, Z_LVAL_PP(record))) == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Tried to read bad record %d", Z_LVAL_PP(record)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Tried to read bad record %ld", Z_LVAL_PP(record)); RETURN_FALSE; } @@ -760,7 +760,7 @@ dbh = zend_list_find(Z_LVAL_PP(dbh_id), &dbh_type); if (!dbh || dbh_type != DBase_GLOBAL(le_dbhead)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %d", Z_LVAL_PP(dbh_id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find database for identifier %ld", Z_LVAL_PP(dbh_id)); RETURN_FALSE; } Index: php-src/ext/filepro/filepro.c diff -u php-src/ext/filepro/filepro.c:1.51 php-src/ext/filepro/filepro.c:1.52 --- php-src/ext/filepro/filepro.c:1.51 Tue Jun 10 16:03:28 2003 +++ php-src/ext/filepro/filepro.c Thu Aug 28 17:00:14 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filepro.c,v 1.51 2003/06/10 20:03:28 imajes Exp $ */ +/* $Id: filepro.c,v 1.52 2003/08/28 21:00:14 andrey Exp $ */ /* filePro 4.x support developed by Chad Robinson, chadr@brttech.com @@ -375,7 +375,7 @@ } } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to locate field number %d.", Z_LVAL_PP(fno)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to locate field number %ld.", Z_LVAL_PP(fno)); RETVAL_FALSE; } @@ -412,7 +412,7 @@ RETURN_STRING(lp->format, 1); } } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to locate field number %d.", Z_LVAL_PP(fno)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to locate field number %ld.", Z_LVAL_PP(fno)); RETVAL_FALSE; } /* }}} */ @@ -448,7 +448,7 @@ RETURN_LONG(lp->width); } } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to locate field number %d.", Z_LVAL_PP(fno)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to locate field number %ld.", Z_LVAL_PP(fno)); RETVAL_FALSE; } /* }}} */ Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.276 php-src/ext/gd/gd.c:1.277 --- php-src/ext/gd/gd.c:1.276 Mon Aug 11 20:55:57 2003 +++ php-src/ext/gd/gd.c Thu Aug 28 17:00:15 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.276 2003/08/12 00:55:57 iliaa Exp $ */ +/* $Id: gd.c,v 1.277 2003/08/28 21:00:15 andrey Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -3247,7 +3247,7 @@ of_ind = zend_list_find(Z_LVAL_PP(fnt), &type); if (type != le_ps_font) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a Type 1 font index", Z_LVAL_PP(fnt)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a Type 1 font index", Z_LVAL_PP(fnt)); RETURN_FALSE; } Index: php-src/ext/msql/php_msql.c diff -u php-src/ext/msql/php_msql.c:1.55 php-src/ext/msql/php_msql.c:1.56 --- php-src/ext/msql/php_msql.c:1.55 Mon Jun 16 12:36:41 2003 +++ php-src/ext/msql/php_msql.c Thu Aug 28 17:00:17 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_msql.c,v 1.55 2003/06/16 16:36:41 andrey Exp $ */ +/* $Id: php_msql.c,v 1.56 2003/08/28 21:00:17 andrey Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -786,7 +786,7 @@ convert_to_long(row); if (Z_LVAL_P(row)<0 || Z_LVAL_P(row)>=msqlNumRows(msql_result)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to jump to row %d on mSQL query index %d",Z_LVAL_P(row),Z_LVAL_P(result)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to jump to row %ld on mSQL query index %ld", Z_LVAL_P(row), Z_LVAL_P(result)); RETURN_FALSE; } msqlDataSeek(msql_result,Z_LVAL_P(row)); @@ -818,7 +818,7 @@ i++; } if (!tmp_field) { /* no match found */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s%s%s not found in mSQL query index %d", + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s%s%s not found in mSQL query index %ld", (table_name?table_name:""), (table_name?".":""), field_name, Z_LVAL_P(result)); efree(field_name); if (table_name) { @@ -1010,7 +1010,7 @@ if (!msql_result || Z_LVAL_P(offset)<0 || Z_LVAL_P(offset)>=msqlNumRows(msql_result)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is invalid for mSQL query index %d",Z_LVAL_P(offset),Z_LVAL_P(result)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is invalid for mSQL query index %ld", Z_LVAL_P(offset), Z_LVAL_P(result)); RETURN_FALSE; } msqlDataSeek(msql_result,Z_LVAL_P(offset)); @@ -1128,7 +1128,7 @@ RETURN_FALSE; } if (Z_LVAL_P(offset)<0 || Z_LVAL_P(offset)>=msqlNumFields(msql_result)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING,"Field %d is invalid for mSQL query index %d", + php_error_docref(NULL TSRMLS_CC, E_WARNING,"Field %ld is invalid for mSQL query index %ld", Z_LVAL_P(offset),Z_LVAL_P(result)); RETURN_FALSE; } @@ -1162,7 +1162,7 @@ } convert_to_long(field); if (Z_LVAL_P(field)<0 || Z_LVAL_P(field)>=msqlNumFields(msql_result)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING,"Field %d is invalid for mSQL query index %d",Z_LVAL_P(field),Z_LVAL_P(result)); + php_error_docref(NULL TSRMLS_CC, E_WARNING,"Field %ld is invalid for mSQL query index %ld", Z_LVAL_P(field), Z_LVAL_P(result)); RETURN_FALSE; } msqlFieldSeek(msql_result,Z_LVAL_P(field)); Index: php-src/ext/mssql/php_mssql.c diff -u php-src/ext/mssql/php_mssql.c:1.120 php-src/ext/mssql/php_mssql.c:1.121 --- php-src/ext/mssql/php_mssql.c:1.120 Mon Aug 18 07:18:41 2003 +++ php-src/ext/mssql/php_mssql.c Thu Aug 28 17:00:18 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.120 2003/08/18 11:18:41 iliaa Exp $ */ +/* $Id: php_mssql.c,v 1.121 2003/08/28 21:00:18 andrey Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -1726,7 +1726,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/mysqli/mysqli_api.c diff -u php-src/ext/mysqli/mysqli_api.c:1.40 php-src/ext/mysqli/mysqli_api.c:1.41 --- php-src/ext/mysqli/mysqli_api.c:1.40 Thu Aug 21 10:34:07 2003 +++ php-src/ext/mysqli/mysqli_api.c Thu Aug 28 17:00:19 2003 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli_api.c,v 1.40 2003/08/21 14:34:07 helly Exp $ + $Id: mysqli_api.c,v 1.41 2003/08/28 21:00:19 andrey Exp $ */ #ifdef HAVE_CONFIG_H @@ -173,7 +173,7 @@ break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Undefined fieldtype %d (parameter %d)", Z_LVAL_PP(args[i]), i+1); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Undefined fieldtype %ld (parameter %d)", Z_LVAL_PP(args[i]), i+1); efree(args); efree(bind); RETURN_FALSE; Index: php-src/ext/odbc/birdstep.c diff -u php-src/ext/odbc/birdstep.c:1.9 php-src/ext/odbc/birdstep.c:1.10 --- php-src/ext/odbc/birdstep.c:1.9 Mon Aug 18 00:41:47 2003 +++ php-src/ext/odbc/birdstep.c Thu Aug 28 17:00:21 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: birdstep.c,v 1.9 2003/08/18 04:41:47 iliaa Exp $ */ +/* $Id: birdstep.c,v 1.10 2003/08/28 21:00:21 andrey Exp $ */ /* * TODO: @@ -103,8 +103,8 @@ THREAD_LS birdstep_module php_birdstep_module; THREAD_LS static HENV henv; -#define PHP_GET_BIRDSTEP_RES_IDX(id) convert_to_long_ex(id); if (!(res = birdstep_find_result(list, Z_LVAL_PP(id)))) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: Not result index (%d)", Z_LVAL_PP(id)); RETURN_FALSE; } -#define PHP_BIRDSTEP_CHK_LNK(id) convert_to_long_ex(id); if (!(conn = birdstep_find_conn(list,Z_LVAL_PP(id)))) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: Not connection index (%d)", Z_LVAL_PP(id)); RETURN_FALSE; } +#define PHP_GET_BIRDSTEP_RES_IDX(id) convert_to_long_ex(id); if (!(res = birdstep_find_result(list, Z_LVAL_PP(id)))) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: Not result index (%ld)", Z_LVAL_PP(id)); RETURN_FALSE; } +#define PHP_BIRDSTEP_CHK_LNK(id) convert_to_long_ex(id); if (!(conn = birdstep_find_conn(list,Z_LVAL_PP(id)))) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: Not connection index (%ld)", Z_LVAL_PP(id)); RETURN_FALSE; } static void _close_birdstep_link(zend_rsrc_list_entry *rsrc TSRMLS_DC) Index: php-src/ext/pgsql/pgsql.c diff -u php-src/ext/pgsql/pgsql.c:1.291 php-src/ext/pgsql/pgsql.c:1.292 --- php-src/ext/pgsql/pgsql.c:1.291 Wed Aug 27 20:31:36 2003 +++ php-src/ext/pgsql/pgsql.c Thu Aug 28 17:00:22 2003 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.291 2003/08/28 00:31:36 iliaa Exp $ */ +/* $Id: pgsql.c,v 1.292 2003/08/28 21:00:22 andrey Exp $ */ #include <stdlib.h> @@ -1364,7 +1364,8 @@ convert_to_long_ex(row); pgsql_row = Z_LVAL_PP(row); if (pgsql_row < 0 || pgsql_row >= PQntuples(pgsql_result)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to jump to row %d on PostgreSQL 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 PostgreSQL result index %ld", + Z_LVAL_PP(row), Z_LVAL_PP(result)); RETURN_FALSE; } } @@ -1447,7 +1448,8 @@ pgsql_row = Z_LVAL_PP(row); pg_result->row = pgsql_row; if (pgsql_row < 0 || pgsql_row >= PQntuples(pgsql_result)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to jump to row %d on PostgreSQL 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 PostgreSQL result index %ld", + Z_LVAL_PP(row), Z_LVAL_PP(result)); RETURN_FALSE; } } else { @@ -1623,7 +1625,8 @@ convert_to_long_ex(row); pgsql_row = Z_LVAL_PP(row); if (pgsql_row < 0 || pgsql_row >= PQntuples(pgsql_result)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to jump to row %d on PostgreSQL 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 PostgreSQL result index %ld", + Z_LVAL_PP(row), Z_LVAL_PP(result)); RETURN_FALSE; } } @@ -2139,11 +2142,12 @@ if (argc > 2) { convert_to_long_ex(z_len); if (Z_LVAL_PP(z_len) > Z_STRLEN_PP(str)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot write more than buffer size %d. Tried to write %d", Z_LVAL_PP(str), Z_LVAL_PP(z_len)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot write more than buffer size %d. Tried to write %ld", + Z_STRLEN_PP(str), Z_LVAL_PP(z_len)); RETURN_FALSE; } if (Z_LVAL_PP(z_len) < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Buffer size must be larger than 0, but %d was specified", Z_LVAL_PP(str), Z_LVAL_PP(z_len)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Buffer size must be larger than 0, but %d was specified", Z_STRLEN_PP(str)); RETURN_FALSE; } len = Z_LVAL_PP(z_len); Index: php-src/ext/pspell/pspell.c diff -u php-src/ext/pspell/pspell.c:1.37 php-src/ext/pspell/pspell.c:1.38 --- php-src/ext/pspell/pspell.c:1.37 Wed Aug 13 17:01:04 2003 +++ php-src/ext/pspell/pspell.c Thu Aug 28 17:00:23 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pspell.c,v 1.37 2003/08/13 21:01:04 vlad Exp $ */ +/* $Id: pspell.c,v 1.38 2003/08/28 21:00:23 andrey 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL config index", Z_LVAL_PP(conf)); + php_error_docref(NULL TSRMLS_CC, 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error_docref(NULL TSRMLS_CC, 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error_docref(NULL TSRMLS_CC, 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error_docref(NULL TSRMLS_CC, 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error_docref(NULL TSRMLS_CC, 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error_docref(NULL TSRMLS_CC, 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error_docref(NULL TSRMLS_CC, 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL result index",Z_LVAL_PP(scin)); + php_error_docref(NULL TSRMLS_CC, 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL config index",Z_LVAL_PP(sccin)); + php_error_docref(NULL TSRMLS_CC, 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL config index",Z_LVAL_PP(sccin)); + php_error_docref(NULL TSRMLS_CC, 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL config index",Z_LVAL_PP(sccin)); + php_error_docref(NULL TSRMLS_CC, 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL config index",Z_LVAL_PP(sccin)); + php_error_docref(NULL TSRMLS_CC, 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL config index",Z_LVAL_PP(sccin)); + php_error_docref(NULL TSRMLS_CC, 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_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a PSPELL config index",Z_LVAL_PP(sccin)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a PSPELL config index", Z_LVAL_PP(sccin)); RETURN_FALSE; } Index: php-src/ext/sybase/php_sybase_db.c diff -u php-src/ext/sybase/php_sybase_db.c:1.53 php-src/ext/sybase/php_sybase_db.c:1.54 --- php-src/ext/sybase/php_sybase_db.c:1.53 Mon Aug 11 20:55:55 2003 +++ php-src/ext/sybase/php_sybase_db.c Thu Aug 28 17:00:24 2003 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_db.c,v 1.53 2003/08/12 00:55:55 iliaa Exp $ */ +/* $Id: php_sybase_db.c,v 1.54 2003/08/28 21:00:24 andrey Exp $ */ #ifdef HAVE_CONFIG_H @@ -957,7 +957,7 @@ result = (sybase_result *) zend_list_find(Z_LVAL_PP(sybase_result_index),&type); if (type!=php_sybase_module.le_result) { - php_error_docref(NULL TSRMLS_CC, E_WARNING,"%d is not a Sybase result index",Z_LVAL_PP(sybase_result_index)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a Sybase result index", Z_LVAL_PP(sybase_result_index)); RETURN_FALSE; } zend_list_delete(Z_LVAL_PP(sybase_result_index)); @@ -1078,7 +1078,7 @@ result = (sybase_result *) zend_list_find(Z_LVAL_PP(sybase_result_index),&type); if (type!=php_sybase_module.le_result) { - php_error_docref(NULL TSRMLS_CC, E_WARNING,"%d is not a Sybase result index",Z_LVAL_PP(sybase_result_index)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a Sybase result index", Z_LVAL_PP(sybase_result_index)); RETURN_FALSE; } @@ -1314,7 +1314,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,"Sybase: Bad row offset (%d)",Z_LVAL_PP(row)); + php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase: Bad row offset (%ld)", Z_LVAL_PP(row)); RETURN_FALSE; }