cvs: php-src(PHP_4_3) /ext/pgsql pgsql.c

iliaa Thu Aug 28 13:54:04 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/pgsql pgsql.c Log: Fixed format errors & warning. Index: php-src/ext/pgsql/pgsql.c diff -u php-src/ext/pgsql/pgsql.c:1.244.2.23 php-src/ext/pgsql/pgsql.c:1.244.2.24 --- php-src/ext/pgsql/pgsql.c:1.244.2.23 Wed Aug 27 20:33:48 2003 +++ php-src/ext/pgsql/pgsql.c Thu Aug 28 13:54:03 2003 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.244.2.23 2003/08/28 00:33:48 iliaa Exp $ */ +/* $Id: pgsql.c,v 1.244.2.24 2003/08/28 17:54:03 iliaa Exp $ */ #include <stdlib.h> @@ -540,12 +540,12 @@ if (PGG(max_links)!=-1 && PGG(num_links)>=PGG(max_links)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, - "Cannot create new link. Too many open links (%d).", PGG(num_links)); + "Cannot create new link. Too many open links (%ld).", PGG(num_links)); goto err; } if (PGG(max_persistent)!=-1 && PGG(num_persistent)>=PGG(max_persistent)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, - "Cannot create new link. Too many open persistent links (%d).", PGG(num_persistent)); + "Cannot create new link. Too many open persistent links (%ld).", PGG(num_persistent)); goto err; } @@ -633,7 +633,7 @@ } } if (PGG(max_links)!=-1 && PGG(num_links)>=PGG(max_links)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create new link. Too many open links (%d).", PGG(num_links)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create new link. Too many open links (%ld).", PGG(num_links)); goto err; } if (connstring) { @@ -1254,7 +1254,7 @@ 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; } } @@ -1337,7 +1337,7 @@ 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 { @@ -1510,7 +1510,7 @@ 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; } } @@ -2026,11 +2026,11 @@ 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 %ld. Tried to write %ld.", Z_LVAL_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 %ld was specified.", Z_LVAL_PP(z_len)); RETURN_FALSE; } len = Z_LVAL_PP(z_len); @@ -2195,7 +2195,7 @@ } else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc TSRMLS_CC, "lsr", &oid_long, &file_out, &name_len, &pgsql_link) == SUCCESS) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, " %s(): Old API is used"); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Old API is used"); if (oid_long <= InvalidOid) { php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Invalid OID specified."); RETURN_FALSE;