From 05aa53231045543d2732f65ed872d3ca7c2c1288 Mon Sep 17 00:00:00 2001 From: Yasuo Ohgaki Date: Sun, 28 Jul 2002 11:17:57 +0000 Subject: [PATCH] Unify error messages --- ext/pgsql/pgsql.c | 218 +++++++++++++++++++++++----------------------- 1 file changed, 109 insertions(+), 109 deletions(-) diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 018bedc0f7..1cb96a5d4f 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -71,7 +71,7 @@ #define PQ_SETNONBLOCKING(pg_link, flag) 0 #endif -#define CHECK_DEFAULT_LINK(x) if (x == -1) { php_error(E_WARNING, "%s() no PostgreSQL link opened yet", get_active_function_name(TSRMLS_C)); } +#define CHECK_DEFAULT_LINK(x) if (x == -1) { php_error(E_WARNING, "%s(): No PostgreSQL link opened yet", get_active_function_name(TSRMLS_C)); } /* {{{ pgsql_functions[] */ @@ -301,7 +301,7 @@ static int _rollback_transactions(zend_rsrc_list_entry *rsrc TSRMLS_DC) link = (PGconn *) rsrc->ptr; if (PQ_SETNONBLOCKING(link, 0)) { - php_error(E_NOTICE,"PostgreSQL cannot set connection to blocking mode"); + php_error(E_NOTICE,"PostgreSQL: Cannot set connection to blocking mode"); return -1; } @@ -527,12 +527,12 @@ static void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) list_entry new_le; if (PGG(max_links)!=-1 && PGG(num_links)>=PGG(max_links)) { - php_error(E_WARNING,"%s() cannot create new link. Too many open links (%d)", + php_error(E_WARNING,"%s(): Cannot create new link. Too many open links (%d)", get_active_function_name(TSRMLS_C), PGG(num_links)); goto err; } if (PGG(max_persistent)!=-1 && PGG(num_persistent)>=PGG(max_persistent)) { - php_error(E_WARNING,"%s() cannot create new link. Too many open persistent links (%d)", + php_error(E_WARNING,"%s(): Cannot create new link. Too many open persistent links (%d)", get_active_function_name(TSRMLS_C), PGG(num_persistent)); goto err; } @@ -544,7 +544,7 @@ static void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) pgsql=PQsetdb(host,port,options,tty,dbname); } if (pgsql==NULL || PQstatus(pgsql)==CONNECTION_BAD) { - php_error(E_WARNING,"%s() unable to connect to PostgreSQL server: %s", + php_error(E_WARNING,"%s(): Unable to connect to PostgreSQL server: %s", get_active_function_name(TSRMLS_C), PQerrorMessage(pgsql)); if (pgsql) { PQfinish(pgsql); @@ -584,7 +584,7 @@ static void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) PQreset(le->ptr); } if (le->ptr==NULL || PQstatus(le->ptr)==CONNECTION_BAD) { - php_error(E_WARNING,"%s() PostgreSQL link lost, unable to reconnect", + php_error(E_WARNING,"%s(): PostgreSQL link lost, unable to reconnect", get_active_function_name(TSRMLS_C)); zend_hash_del(&EG(persistent_list),str.c,str.len+1); goto err; @@ -621,7 +621,7 @@ static void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) } } if (PGG(max_links)!=-1 && PGG(num_links)>=PGG(max_links)) { - php_error(E_WARNING,"%s() cannot create new link. Too many open links (%d)", + php_error(E_WARNING,"%s(): Cannot create new link. Too many open links (%d)", get_active_function_name(TSRMLS_C), PGG(num_links)); goto err; } @@ -631,7 +631,7 @@ static void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) pgsql = PQsetdb(host,port,options,tty,dbname); } if (pgsql==NULL || PQstatus(pgsql)==CONNECTION_BAD) { - php_error(E_WARNING,"%s() unable to connect to PostgreSQL server: %s", + php_error(E_WARNING,"%s(): Unable to connect to PostgreSQL server: %s", get_active_function_name(TSRMLS_C), PQerrorMessage(pgsql)); goto err; } @@ -876,7 +876,7 @@ PHP_FUNCTION(pg_query) convert_to_string_ex(query); if (PQ_SETNONBLOCKING(pgsql, 0)) { - php_error(E_NOTICE,"%s() cannot set connection to blocking mode", + php_error(E_NOTICE,"%s(): Cannot set connection to blocking mode", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -885,7 +885,7 @@ PHP_FUNCTION(pg_query) leftover = 1; } if (leftover) { - php_error(E_NOTICE,"%s() found results on this connection. Use pg_get_result() to get results", + php_error(E_NOTICE,"%s(): Found results on this connection. Use pg_get_result() to get results", get_active_function_name(TSRMLS_C)); } pgsql_result = PQexec(pgsql, Z_STRVAL_PP(query)); @@ -901,7 +901,7 @@ PHP_FUNCTION(pg_query) case PGRES_BAD_RESPONSE: case PGRES_NONFATAL_ERROR: case PGRES_FATAL_ERROR: - php_error(E_WARNING, "%s() query failed: %s", + php_error(E_WARNING, "%s(): Query failed: %s", get_active_function_name(TSRMLS_C), PQerrorMessage(pgsql)); RETURN_FALSE; break; @@ -952,7 +952,7 @@ static void php_pgsql_get_result_info(INTERNAL_FUNCTION_PARAMETERS, int entry_ty #if HAVE_PQCMDTUPLES Z_LVAL_P(return_value) = atoi(PQcmdTuples(pgsql_result)); #else - php_error(E_WARNING,"This compilation does not support %s()", + php_error(E_WARNING,"%(): Not supportted under this build", get_active_function_name(TSRMLS_C)); Z_LVAL_P(return_value) = 0; #endif @@ -1090,7 +1090,7 @@ static void php_pgsql_get_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_typ convert_to_long_ex(field); if (Z_LVAL_PP(field) < 0 || Z_LVAL_PP(field) >= PQnfields(pgsql_result)) { - php_error(E_WARNING,"%s() bad field offset specified", + php_error(E_WARNING,"%s(): Bad field offset specified", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -1191,7 +1191,7 @@ PHP_FUNCTION(pg_fetch_result) convert_to_long_ex(row); pgsql_row = Z_LVAL_PP(row); if (pgsql_row < 0 || pgsql_row >= PQntuples(pgsql_result)) { - php_error(E_WARNING,"%s() unable to jump to row %d on PostgreSQL result index %d", + php_error(E_WARNING,"%s(): Unable to jump to row %d on PostgreSQL result index %d", get_active_function_name(TSRMLS_C), Z_LVAL_PP(row), Z_LVAL_PP(result)); RETURN_FALSE; } @@ -1206,7 +1206,7 @@ PHP_FUNCTION(pg_fetch_result) break; } if (field_offset<0 || field_offset>=PQnfields(pgsql_result)) { - php_error(E_WARNING,"%s() bad column offset specified", + php_error(E_WARNING,"%s(): Bad column offset specified", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -1256,7 +1256,7 @@ static void php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type) } if (!(result_type & PGSQL_BOTH)) { - php_error(E_WARNING, "%s(): invalid result type", + php_error(E_WARNING, "%s(): Invalid result type", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -1277,7 +1277,7 @@ static void php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type) pgsql_row = Z_LVAL_PP(row); pg_result->row = pgsql_row; if (pgsql_row < 0 || pgsql_row >= PQntuples(pgsql_result)) { - php_error(E_WARNING, "%s() unable to jump to row %d on PostgreSQL result index %d", + php_error(E_WARNING, "%s(): Unable to jump to row %d on PostgreSQL result index %d", get_active_function_name(TSRMLS_C), Z_LVAL_PP(row), Z_LVAL_PP(result)); RETURN_FALSE; } @@ -1412,7 +1412,7 @@ static void php_pgsql_data_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) convert_to_long_ex(row); pgsql_row = Z_LVAL_PP(row); if (pgsql_row < 0 || pgsql_row >= PQntuples(pgsql_result)) { - php_error(E_WARNING,"%s() unable to jump to row %d on PostgreSQL result index %d", + php_error(E_WARNING,"%s(): Unable to jump to row %d on PostgreSQL result index %d", get_active_function_name(TSRMLS_C), Z_LVAL_PP(row), Z_LVAL_PP(result)); RETURN_FALSE; } @@ -1429,7 +1429,7 @@ static void php_pgsql_data_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) break; } if (field_offset < 0 || field_offset >= PQnfields(pgsql_result)) { - php_error(E_WARNING, "%s() bad column offset specified", + php_error(E_WARNING, "%s(): Bad column offset specified", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -1635,7 +1635,7 @@ PHP_FUNCTION(pg_lo_create) */ if ((pgsql_oid = lo_creat(pgsql, INV_READ|INV_WRITE)) == InvalidOid) { - php_error(E_WARNING, "%s() unable to create PostgreSQL large object", + php_error(E_WARNING, "%s(): Unable to create PostgreSQL large object", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -1662,7 +1662,7 @@ PHP_FUNCTION(pg_lo_unlink) oid = (Oid)strtoul(oid_string, &end_ptr, 10); if ((oid_string+oid_strlen) != end_ptr) { /* wrong integer format */ - php_error(E_NOTICE, "%s() wrong OID value passed", + php_error(E_NOTICE, "%s(): Wrong OID value passed", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -1670,7 +1670,7 @@ PHP_FUNCTION(pg_lo_unlink) else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc TSRMLS_CC, "rl", &pgsql_link, &oid_long) == SUCCESS) { if (oid_long <= InvalidOid) { - php_error(E_NOTICE, "%s() invalid OID is specified", + php_error(E_NOTICE, "%s(): Invalid OID is specified", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -1681,7 +1681,7 @@ PHP_FUNCTION(pg_lo_unlink) oid = (Oid)strtoul(oid_string, &end_ptr, 10); if ((oid_string+oid_strlen) != end_ptr) { /* wrong integer format */ - php_error(E_NOTICE, "%s() wrong OID value passed", + php_error(E_NOTICE, "%s(): Wrong OID value passed", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -1691,7 +1691,7 @@ PHP_FUNCTION(pg_lo_unlink) else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc TSRMLS_CC, "l", &oid_long) == SUCCESS) { if (oid_long <= InvalidOid) { - php_error(E_NOTICE, "%s() invalid OID is specified", + php_error(E_NOTICE, "%s(): Invalid OID is specified", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -1700,7 +1700,7 @@ PHP_FUNCTION(pg_lo_unlink) CHECK_DEFAULT_LINK(id); } else { - php_error(E_WARNING, "%s() exptects 1 or 2 arguments", + php_error(E_WARNING, "%s(): Requires 1 or 2 arguments", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -1708,7 +1708,7 @@ PHP_FUNCTION(pg_lo_unlink) ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink); if (lo_unlink(pgsql, oid) == -1) { - php_error(E_WARNING, "%s() unable to delete PostgreSQL large object %u", + php_error(E_WARNING, "%s(): Unable to delete PostgreSQL large object %u", get_active_function_name(TSRMLS_C), oid); RETURN_FALSE; } @@ -1737,7 +1737,7 @@ PHP_FUNCTION(pg_lo_open) oid = (Oid)strtoul(oid_string, &end_ptr, 10); if ((oid_string+oid_strlen) != end_ptr) { /* wrong integer format */ - php_error(E_NOTICE, "%s() wrong OID value passed", + php_error(E_NOTICE, "%s(): Wrong OID value passed", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -1745,7 +1745,7 @@ PHP_FUNCTION(pg_lo_open) else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc TSRMLS_CC, "rls", &pgsql_link, &oid_long, &mode_string, &mode_strlen) == SUCCESS) { if (oid_long <= InvalidOid) { - php_error(E_NOTICE, "%s() invalid OID is specified", + php_error(E_NOTICE, "%s(): Invalid OID is specified", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -1756,7 +1756,7 @@ PHP_FUNCTION(pg_lo_open) oid = (Oid)strtoul(oid_string, &end_ptr, 10); if ((oid_string+oid_strlen) != end_ptr) { /* wrong integer format */ - php_error(E_NOTICE, "%s() wrong OID value passed", + php_error(E_NOTICE, "%s(): Wrong OID value passed", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -1766,7 +1766,7 @@ PHP_FUNCTION(pg_lo_open) else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc TSRMLS_CC, "ls", &oid_long, &mode_string, &mode_strlen) == SUCCESS) { if (oid_long <= InvalidOid) { - php_error(E_NOTICE, "%s() invalid OID is specified", + php_error(E_NOTICE, "%s(): Invalid OID is specified", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -1775,7 +1775,7 @@ PHP_FUNCTION(pg_lo_open) CHECK_DEFAULT_LINK(id); } else { - php_error(E_WARNING, "%s() exptects 1 or 2 arguments", + php_error(E_WARNING, "%s(): Requires 1 or 2 arguments", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -1807,19 +1807,19 @@ PHP_FUNCTION(pg_lo_open) if (create) { if ((oid = lo_creat(pgsql, INV_READ|INV_WRITE)) == 0) { efree(pgsql_lofp); - php_error(E_WARNING, "%s() unable to create PostgreSQL large object", + php_error(E_WARNING, "%s(): Unable to create PostgreSQL large object", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } else { if ((pgsql_lofd = lo_open(pgsql, oid, pgsql_mode)) == -1) { if (lo_unlink(pgsql, oid) == -1) { efree(pgsql_lofp); - php_error(E_WARNING, "%s() Something's really messed up!!! Your database is badly corrupted in a way NOT related to PHP", + php_error(E_WARNING, "%s(): Something's really messed up!!! Your database is badly corrupted in a way NOT related to PHP", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } efree(pgsql_lofp); - php_error(E_WARNING, "%s() unable to open PostgreSQL large object", + php_error(E_WARNING, "%s(): Unable to open PostgreSQL large object", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } else { @@ -1831,7 +1831,7 @@ PHP_FUNCTION(pg_lo_open) } } else { efree(pgsql_lofp); - php_error(E_WARNING,"%s() unable to open PostgreSQL large object", + php_error(E_WARNING,"%s(): Unable to open PostgreSQL large object", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -1864,7 +1864,7 @@ PHP_FUNCTION(pg_lo_close) ZEND_FETCH_RESOURCE(pgsql, pgLofp *, pgsql_lofp, -1, "PostgreSQL large object", le_lofp); if (lo_close((PGconn *)pgsql->conn, pgsql->lofd) < 0) { - php_error(E_WARNING, "%s() unable to close PostgreSQL large object descriptor %d", + php_error(E_WARNING, "%s(): Unable to close PostgreSQL large object descriptor %d", get_active_function_name(TSRMLS_C), pgsql->lofd); RETVAL_FALSE; } else { @@ -1930,12 +1930,12 @@ PHP_FUNCTION(pg_lo_write) if (argc > 2) { convert_to_long_ex(z_len); if (Z_LVAL_PP(z_len) > Z_STRLEN_PP(str)) { - php_error(E_WARNING, "%s() cannot write more than buffer size %d. Tried to wtite %d", + php_error(E_WARNING, "%s(): Cannot write more than buffer size %d. Tried to wtite %d", get_active_function_name(TSRMLS_C), Z_LVAL_PP(str), Z_LVAL_PP(z_len)); RETURN_FALSE; } if (Z_LVAL_PP(z_len) < 0) { - php_error(E_WARNING, "%s() buffer size must be larger than 0. %d specified for buffer size.", + php_error(E_WARNING, "%s(): Buffer size must be larger than 0. %d specified for buffer size", get_active_function_name(TSRMLS_C), Z_LVAL_PP(str), Z_LVAL_PP(z_len)); RETURN_FALSE; } @@ -2009,7 +2009,7 @@ PHP_FUNCTION(pg_lo_import) } else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc TSRMLS_CC, "sr", &file_in, &name_len, &pgsql_link ) == SUCCESS) { - php_error(E_NOTICE, "Old API for %s() is used.", get_active_function_name(TSRMLS_C)); + php_error(E_NOTICE, "%s(): Old API is used.", get_active_function_name(TSRMLS_C)); } else { WRONG_PARAM_COUNT; @@ -2051,7 +2051,7 @@ PHP_FUNCTION(pg_lo_export) if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc TSRMLS_CC, "rls", &pgsql_link, &oid_long, &file_out, &name_len) == SUCCESS) { if (oid_long <= InvalidOid) { - php_error(E_NOTICE, "%s() invalid OID is specified", + php_error(E_NOTICE, "%s(): Invalid OID is specified", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -2062,7 +2062,7 @@ PHP_FUNCTION(pg_lo_export) oid = (Oid)strtoul(oid_string, &end_ptr, 10); if ((oid_string+oid_strlen) != end_ptr) { /* wrong integer format */ - php_error(E_NOTICE, "%s() wrong OID value passed", + php_error(E_NOTICE, "%s(): Wrong OID value passed", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -2070,7 +2070,7 @@ PHP_FUNCTION(pg_lo_export) else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc TSRMLS_CC, "ls", &oid_long, &file_out, &name_len) == SUCCESS) { if (oid_long <= InvalidOid) { - php_error(E_NOTICE, "%s() invalid OID is specified", + php_error(E_NOTICE, "%s(): Invalid OID is specified", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -2083,7 +2083,7 @@ PHP_FUNCTION(pg_lo_export) oid = (Oid)strtoul(oid_string, &end_ptr, 10); if ((oid_string+oid_strlen) != end_ptr) { /* wrong integer format */ - php_error(E_NOTICE, "%s() wrong OID value passed", + php_error(E_NOTICE, "%s(): Wrong OID value passed", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -2095,23 +2095,23 @@ PHP_FUNCTION(pg_lo_export) oid = (Oid)strtoul(oid_string, &end_ptr, 10); if ((oid_string+oid_strlen) != end_ptr) { /* wrong integer format */ - php_error(E_NOTICE, "%s() wrong OID value passed", + php_error(E_NOTICE, "%s(): Wrong OID value passed", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } } 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(E_NOTICE, "Old API for %s() is used.", get_active_function_name(TSRMLS_C)); + php_error(E_NOTICE, " %s(): Old API is used", get_active_function_name(TSRMLS_C)); if (oid_long <= InvalidOid) { - php_error(E_NOTICE, "%s() invalid OID is specified", + php_error(E_NOTICE, "%s(): Invalid OID is specified", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } oid = (Oid)oid_long; } else { - php_error(E_WARNING, "%s() expects 2 or 3 arguments", + php_error(E_WARNING, "%s(): Requires 2 or 3 arguments", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -2146,7 +2146,7 @@ PHP_FUNCTION(pg_lo_seek) return; } if (whence != SEEK_SET && whence != SEEK_CUR && whence != SEEK_END) { - php_error(E_WARNING, "Invalid whence parameter for %s()", + php_error(E_WARNING, " %s(): Invalid whence parameter", get_active_function_name(TSRMLS_C)); return; } @@ -2289,7 +2289,7 @@ PHP_FUNCTION(pg_end_copy) result = PQendcopy(pgsql); if (result!=0) { - php_error(E_WARNING, "%s() PostgreSQL query failed: %s", + php_error(E_WARNING, "%s(): Query failed: %s", get_active_function_name(TSRMLS_C), PQerrorMessage(pgsql)); RETURN_FALSE; } @@ -2331,7 +2331,7 @@ PHP_FUNCTION(pg_put_line) result = PQputline(pgsql, Z_STRVAL_PP(query)); if (result==EOF) { - php_error(E_WARNING, "%s() PostgreSQL query failed: %s", + php_error(E_WARNING, "%s(): Query failed: %s", get_active_function_name(TSRMLS_C), PQerrorMessage(pgsql)); RETURN_FALSE; } @@ -2400,7 +2400,7 @@ PHP_FUNCTION(pg_copy_to) while (!copydone) { if ((ret = PQgetline(pgsql, copybuf, COPYBUFSIZ))) { - php_error(E_WARNING, "%s() query failed: %s", + php_error(E_WARNING, "%s(): Query failed: %s", get_active_function_name(TSRMLS_C), PQerrorMessage(pgsql)); RETURN_FALSE; } @@ -2435,7 +2435,7 @@ PHP_FUNCTION(pg_copy_to) } } if (PQendcopy(pgsql)) { - php_error(E_WARNING, "%s() query failed: %s", + php_error(E_WARNING, "%s(): Query failed: %s", get_active_function_name(TSRMLS_C), PQerrorMessage(pgsql)); RETURN_FALSE; } @@ -2449,7 +2449,7 @@ PHP_FUNCTION(pg_copy_to) break; default: PQclear(pgsql_result); - php_error(E_WARNING, "%s() query failed: %s", + php_error(E_WARNING, "%s(): Query failed: %s", get_active_function_name(TSRMLS_C), PQerrorMessage(pgsql)); RETURN_FALSE; break; @@ -2517,7 +2517,7 @@ PHP_FUNCTION(pg_copy_from) if(*(query+Z_STRLEN_PP(tmp)-1) != '\n') strcat(query, "\n"); if (PQputline(pgsql, query)) { efree(query); - php_error(E_WARNING, "%s() query failed: %s", + php_error(E_WARNING, "%s(): Query failed: %s", get_active_function_name, PQerrorMessage(pgsql)); RETURN_FALSE; } @@ -2525,12 +2525,12 @@ PHP_FUNCTION(pg_copy_from) zend_hash_move_forward_ex(Z_ARRVAL_P(pg_rows), &pos); } if (PQputline(pgsql, "\\.\n")) { - php_error(E_WARNING, "%s() query failed: %s", + php_error(E_WARNING, "%s(): Query failed: %s", get_active_function_name(TSRMLS_C), PQerrorMessage(pgsql)); RETURN_FALSE; } if (PQendcopy(pgsql)) { - php_error(E_WARNING, "%s() query failed: %s", + php_error(E_WARNING, "%s(): Query failed: %s", get_active_function_name(TSRMLS_C), PQerrorMessage(pgsql)); RETURN_FALSE; } @@ -2545,7 +2545,7 @@ PHP_FUNCTION(pg_copy_from) break; default: PQclear(pgsql_result); - php_error(E_WARNING, "%s() query failed: %s", + php_error(E_WARNING, "%s(): Query failed: %s", get_active_function_name(TSRMLS_C), PQerrorMessage(pgsql)); RETURN_FALSE; break; @@ -2669,7 +2669,7 @@ static int php_pgsql_flush_query(PGconn *pgsql TSRMLS_DC) int leftover = 0; if (PQsetnonblocking(pgsql, 1)) { - php_error(E_NOTICE,"%s() cannot set connection to nonblocking mode", + php_error(E_NOTICE,"%s(): Cannot set connection to nonblocking mode", get_active_function_name(TSRMLS_C)); return -1; } @@ -2699,7 +2699,7 @@ static void php_pgsql_do_async(INTERNAL_FUNCTION_PARAMETERS, int entry_type) ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink); if (PQ_SETNONBLOCKING(pgsql, 1)) { - php_error(E_NOTICE,"%s() cannot set connection to nonblocking mode", + php_error(E_NOTICE,"%s(): Cannot set connection to nonblocking mode", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -2717,12 +2717,12 @@ static void php_pgsql_do_async(INTERNAL_FUNCTION_PARAMETERS, int entry_type) } break; default: - php_error(E_ERROR,"%s() PostgreSQL module error. Report this error", + php_error(E_ERROR,"%s(): PostgreSQL module error. Report this error", get_active_function_name(TSRMLS_C)); break; } if (PQ_SETNONBLOCKING(pgsql, 0)) { - php_error(E_NOTICE,"%s() cannot set connection to blocking mode", + php_error(E_NOTICE,"%s(): Cannot set connection to blocking mode", get_active_function_name(TSRMLS_C)); } convert_to_boolean_ex(&return_value); @@ -2765,7 +2765,7 @@ PHP_FUNCTION(pg_send_query) ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink); if (PQ_SETNONBLOCKING(pgsql, 1)) { - php_error(E_NOTICE,"%s() cannot set connection to nonblocking mode", + php_error(E_NOTICE,"%s(): Cannot set connection to nonblocking mode", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -2774,14 +2774,14 @@ PHP_FUNCTION(pg_send_query) leftover = 1; } if (leftover) { - php_error(E_NOTICE,"%s() - There are results on this connection. Call pg_get_result() until it returns FALSE", + php_error(E_NOTICE,"%s(): There are results on this connection. Call pg_get_result() until it returns FALSE", get_active_function_name(TSRMLS_C)); } if (!PQsendQuery(pgsql, query)) { RETURN_FALSE; } if (PQ_SETNONBLOCKING(pgsql, 0)) { - php_error(E_NOTICE,"%s() cannot set connection to blocking mode", + php_error(E_NOTICE,"%s(): Cannot set connection to blocking mode", get_active_function_name(TSRMLS_C)); } RETURN_TRUE; @@ -2845,7 +2845,7 @@ PHP_FUNCTION(pg_result_status) RETURN_STRING(PQcmdStatus(pgsql_result), 1); } else { - php_error(E_WARNING, "%s() expects optional 2nd parameter to be PGSQL_STATUS_LONG or PGSQL_STATUS_STRING", + php_error(E_WARNING, "%s(): Expects optional 2nd parameter to be PGSQL_STATUS_LONG or PGSQL_STATUS_STRING", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -2880,7 +2880,7 @@ PHPAPI int php_pgsql_metadata(PGconn *pg_link, const char *table_name, zval *met pg_result = PQexec(pg_link, querystr.c); if (PQresultStatus(pg_result) != PGRES_TUPLES_OK || (num_rows = PQntuples(pg_result)) == 0) { - php_error(E_NOTICE, "%s() failed to query metadata for '%s' table %s", + php_error(E_NOTICE, "%s(): Dailed to query metadata for '%s' table %s", get_active_function_name(TSRMLS_C), table_name, querystr.c); smart_str_free(&querystr); PQclear(pg_result); @@ -3046,14 +3046,14 @@ static int php_pgsql_convert_match(const char *str, const char *regex , int icas regerr = regcomp(&re, regex, regopt); if (regerr) { - php_error(E_WARNING, "%s() cannot compile regex", + php_error(E_WARNING, "%s(): Cannot compile regex", get_active_function_name(TSRMLS_C)); regfree(&re); return FAILURE; } subs = (regmatch_t *)ecalloc(sizeof(regmatch_t), re.re_nsub+1); if (!subs) { - php_error(E_WARNING, "%s() cannot allocate memory", + php_error(E_WARNING, "%s(): Cannot allocate memory", get_active_function_name(TSRMLS_C)); regfree(&re); return FAILURE; @@ -3067,7 +3067,7 @@ static int php_pgsql_convert_match(const char *str, const char *regex , int icas ret = FAILURE; } else if (regerr) { - php_error(E_WARNING, "%s() cannot exec regex", + php_error(E_WARNING, "%s(): Cannot exec regex", get_active_function_name(TSRMLS_C)); ret = FAILURE; } @@ -3113,7 +3113,7 @@ static int php_pgsql_add_quotes(zval *src, zend_bool should_free TSRMLS_DC) } \ /* raise error if it's not null */ \ else if (Z_BVAL_PP(not_null)) { \ - php_error(E_NOTICE, "%s() detected NULL for 'NOT NULL' field '%s'", \ + php_error(E_NOTICE, "%s(): Detected NULL for 'NOT NULL' field '%s'", \ get_active_function_name(TSRMLS_C), field ); \ err = 1; \ } \ @@ -3155,44 +3155,44 @@ PHPAPI int php_pgsql_convert(PGconn *pg_link, const char *table_name, const zval zend_hash_move_forward_ex(Z_ARRVAL_P(values), &pos)) { skip_field = 0; if ((key_type = zend_hash_get_current_key_ex(Z_ARRVAL_P(values), &field, &field_len, &num_idx, 0, &pos)) == HASH_KEY_NON_EXISTANT) { - php_error(E_WARNING, "%s() failed to get array key type", + php_error(E_WARNING, "%s(): Failed to get array key type", get_active_function_name(TSRMLS_C)); err = 1; } if (!err && key_type == HASH_KEY_IS_LONG) { - php_error(E_WARNING, "%s() accepts only string key for values", + php_error(E_WARNING, "%s(): Accepts only string key for values", get_active_function_name(TSRMLS_C)); err = 1; } if (!err && key_type == HASH_KEY_NON_EXISTANT) { - php_error(E_WARNING, "%s() accepts only string key for values", + php_error(E_WARNING, "%s(): Accepts only string key for values", get_active_function_name(TSRMLS_C)); err = 1; } if (!err && zend_hash_find(Z_ARRVAL_P(meta), field, field_len, (void **)&def) == FAILURE) { - php_error(E_NOTICE, "%s() Invalid field name (%s) in values", + php_error(E_NOTICE, "%s(): Invalid field name (%s) in values", get_active_function_name(TSRMLS_C), field); err = 1; } if (!err && zend_hash_find(Z_ARRVAL_PP(def), "type", sizeof("type"), (void **)&type) == FAILURE) { - php_error(E_NOTICE, "%s() detected broken meta data. Missing 'type'", + php_error(E_NOTICE, "%s(): Detected broken meta data. Missing 'type'", get_active_function_name(TSRMLS_C)); err = 1; } if (!err && zend_hash_find(Z_ARRVAL_PP(def), "not null", sizeof("not null"), (void **)¬_null) == FAILURE) { - php_error(E_NOTICE, "%s() detected broken meta data. Missing 'not null'", + php_error(E_NOTICE, "%s(): Detected broken meta data. Missing 'not null'", get_active_function_name(TSRMLS_C)); err = 1; } if (!err && zend_hash_find(Z_ARRVAL_PP(def), "has default", sizeof("has default"), (void **)&has_default) == FAILURE) { - php_error(E_NOTICE, "%s() detected broken meta data. Missing 'has default'", + php_error(E_NOTICE, "%s(): Detected broken meta data. Missing 'has default'", get_active_function_name(TSRMLS_C)); err = 1; } if (!err && (Z_TYPE_PP(val) == IS_ARRAY || Z_TYPE_PP(val) == IS_OBJECT || Z_TYPE_PP(val) == IS_CONSTANT_ARRAY)) { - php_error(E_NOTICE, "%s() expects scaler values as field values", + php_error(E_NOTICE, "%s(): Expects scaler values as field values", get_active_function_name(TSRMLS_C)); err = 1; } @@ -3225,7 +3225,7 @@ PHPAPI int php_pgsql_convert(PGconn *pg_link, const char *table_name, const zval ZVAL_STRING(new_val, "'f'", 1); } else { - php_error(E_NOTICE, "%s() detected invalid value (%s) for pgsql %s field (%s)", + php_error(E_NOTICE, "%s(): Detected invalid value (%s) for pgsql %s field (%s)", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(val), Z_STRVAL_PP(type), field); err = 1; } @@ -3251,7 +3251,7 @@ PHPAPI int php_pgsql_convert(PGconn *pg_link, const char *table_name, const zval } PGSQL_CONV_CHECK_IGNORE(); if (err) { - php_error(E_NOTICE, "%s() expects string, null, long or boolelan value for pgsql '%s' (%s)", + php_error(E_NOTICE, "%s(): Expects string, null, long or boolelan value for pgsql '%s' (%s)", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(type), field); } break; @@ -3294,7 +3294,7 @@ PHPAPI int php_pgsql_convert(PGconn *pg_link, const char *table_name, const zval } PGSQL_CONV_CHECK_IGNORE(); if (err) { - php_error(E_NOTICE, "%s() expects string, null, long or double value for pgsql '%s' (%s)", + php_error(E_NOTICE, "%s(): Expects string, null, long or double value for pgsql '%s' (%s)", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(type), field); } break; @@ -3336,7 +3336,7 @@ PHPAPI int php_pgsql_convert(PGconn *pg_link, const char *table_name, const zval } PGSQL_CONV_CHECK_IGNORE(); if (err) { - php_error(E_NOTICE, "%s() expects string, null, long or double value for pgsql '%s' (%s)", + php_error(E_NOTICE, "%s(): Expects string, null, long or double value for pgsql '%s' (%s)", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(type), field); } break; @@ -3384,7 +3384,7 @@ PHPAPI int php_pgsql_convert(PGconn *pg_link, const char *table_name, const zval } PGSQL_CONV_CHECK_IGNORE(); if (err) { - php_error(E_NOTICE, "%s() expects string, null, long or double value for pgsql '%s' (%s)", + php_error(E_NOTICE, "%s(): Expects string, null, long or double value for pgsql '%s' (%s)", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(type), field); } break; @@ -3427,7 +3427,7 @@ PHPAPI int php_pgsql_convert(PGconn *pg_link, const char *table_name, const zval } PGSQL_CONV_CHECK_IGNORE(); if (err) { - php_error(E_NOTICE, "%s() expects string, null, long or double value for '%s' (%s)", + php_error(E_NOTICE, "%s(): Expects string, null, long or double value for '%s' (%s)", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(type), field); } break; @@ -3460,7 +3460,7 @@ PHPAPI int php_pgsql_convert(PGconn *pg_link, const char *table_name, const zval } PGSQL_CONV_CHECK_IGNORE(); if (err) { - php_error(E_NOTICE, "%s() expects string or null for '%s' (%s)", + php_error(E_NOTICE, "%s(): Expects string or null for '%s' (%s)", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(type), field); } break; @@ -3493,7 +3493,7 @@ PHPAPI int php_pgsql_convert(PGconn *pg_link, const char *table_name, const zval } PGSQL_CONV_CHECK_IGNORE(); if (err) { - php_error(E_NOTICE, "%s() expects string or null for pgsql %s field (%s)", + php_error(E_NOTICE, "%s(): Expects string or null for pgsql %s field (%s)", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(type), field); } break; @@ -3525,7 +3525,7 @@ PHPAPI int php_pgsql_convert(PGconn *pg_link, const char *table_name, const zval } PGSQL_CONV_CHECK_IGNORE(); if (err) { - php_error(E_NOTICE, "%s() expects string or null for pgsql %s field (%s)", + php_error(E_NOTICE, "%s(): Expects string or null for pgsql %s field (%s)", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(type), field); } break; @@ -3557,7 +3557,7 @@ PHPAPI int php_pgsql_convert(PGconn *pg_link, const char *table_name, const zval } PGSQL_CONV_CHECK_IGNORE(); if (err) { - php_error(E_NOTICE, "%s() expects string or null for pgsql %s field (%s)", + php_error(E_NOTICE, "%s(): Expects string or null for pgsql %s field (%s)", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(type), field); } break; @@ -3590,7 +3590,7 @@ PHPAPI int php_pgsql_convert(PGconn *pg_link, const char *table_name, const zval } PGSQL_CONV_CHECK_IGNORE(); if (err) { - php_error(E_NOTICE, "%s() expects string or null for pgsql %s field (%s)", + php_error(E_NOTICE, "%s(): Expects string or null for pgsql %s field (%s)", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(type), field); } break; @@ -3634,7 +3634,7 @@ PHPAPI int php_pgsql_convert(PGconn *pg_link, const char *table_name, const zval } PGSQL_CONV_CHECK_IGNORE(); if (err) { - php_error(E_NOTICE, "%s() expects string, null, long or double value for pgsql '%s' (%s)", + php_error(E_NOTICE, "%s(): Expects string, null, long or double value for pgsql '%s' (%s)", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(type), field); } break; @@ -3666,7 +3666,7 @@ PHPAPI int php_pgsql_convert(PGconn *pg_link, const char *table_name, const zval } PGSQL_CONV_CHECK_IGNORE(); if (err) { - php_error(E_NOTICE, "%s() expects string or null for pgsql %s field (%s)", + php_error(E_NOTICE, "%s(): Expects string or null for pgsql %s field (%s)", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(type), field); } break; @@ -3682,14 +3682,14 @@ PHPAPI int php_pgsql_convert(PGconn *pg_link, const char *table_name, const zval case PG_PATH: case PG_POLYGON: case PG_CIRCLE: - php_error(E_NOTICE, "%s() does not support pgsql '%s' type (%s)", + php_error(E_NOTICE, "%s(): does not support pgsql '%s' type (%s)", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(type), field); err = 1; break; case PG_UNKNOWN: default: - php_error(E_NOTICE, "%s() unknown or system data type '%s' for '%s'", + php_error(E_NOTICE, "%s(): unknown or system data type '%s' for '%s'", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(type), field); err = 1; break; @@ -3735,12 +3735,12 @@ PHP_FUNCTION(pg_convert) return; } if (option & ~PGSQL_CONV_OPTS) { - php_error(E_WARNING, "%s() invalid option is spedified", + php_error(E_WARNING, "%s(): Invalid option is spedified", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } if (!table_name_len) { - php_error(E_NOTICE, "%s() table name is invalid", + php_error(E_NOTICE, "%s(): Table name is invalid", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -3748,7 +3748,7 @@ PHP_FUNCTION(pg_convert) ZEND_FETCH_RESOURCE2(pg_link, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink); if (php_pgsql_flush_query(pg_link TSRMLS_CC)) { - php_error(E_NOTICE, "%s detected unhandled result(s) in connection", + php_error(E_NOTICE, "%s(): Detected unhandled result(s) in connection", get_active_function_name(TSRMLS_C)); } array_init(return_value); @@ -3773,7 +3773,7 @@ static int do_exec(smart_str *querystr, int expect, PGconn *pg_link, ulong opt T if (PQresultStatus(pg_result) == expect) { return 0; } else { - php_error(E_NOTICE, "%s() failed to execute '%s'", + php_error(E_NOTICE, "%s(): Failed to execute '%s'", get_active_function_name(TSRMLS_C), querystr->c); PQclear(pg_result); } @@ -3820,7 +3820,7 @@ PHPAPI int php_pgsql_insert(PGconn *pg_link, const char *table, zval *var_array, while ((key_type = zend_hash_get_current_key_ex(Z_ARRVAL_P(var_array), &fld, &fld_len, &num_idx, 0, &pos)) != HASH_KEY_NON_EXISTANT) { if (key_type == HASH_KEY_IS_LONG) { - php_error(E_NOTICE,"%s() expects associative array for values to be inserted", + php_error(E_NOTICE,"%s(): Expects associative array for values to be inserted", get_active_function_name(TSRMLS_C)); goto cleanup; } @@ -3900,7 +3900,7 @@ PHP_FUNCTION(pg_insert) return; } if (option & ~(PGSQL_CONV_OPTS|PGSQL_DML_NO_CONV|PGSQL_DML_EXEC|PGSQL_DML_ASYNC|PGSQL_DML_STRING)) { - php_error(E_WARNING, "%s() invalid option is spedified", + php_error(E_WARNING, "%s(): Invalid option is spedified", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -3908,7 +3908,7 @@ PHP_FUNCTION(pg_insert) ZEND_FETCH_RESOURCE2(pg_link, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink); if (php_pgsql_flush_query(pg_link TSRMLS_CC)) { - php_error(E_NOTICE, "%s detected unhandled result(s) in connection", + php_error(E_NOTICE, "%s(): Detected unhandled result(s) in connection", get_active_function_name(TSRMLS_C)); } if (php_pgsql_insert(pg_link, table, values, option, &sql TSRMLS_CC) == FAILURE) { @@ -3936,7 +3936,7 @@ static inline int build_assignment_string(smart_str *querystr, HashTable *ht, co zend_hash_move_forward_ex(ht, &pos)) { key_type = zend_hash_get_current_key_ex(ht, &fld, &fld_len, &num_idx, 0, &pos); if (key_type == HASH_KEY_IS_LONG) { - php_error(E_NOTICE,"%s() expects associative array for values to be inserted", + php_error(E_NOTICE,"%s(): Expects associative array for values to be inserted", get_active_function_name(TSRMLS_C)); return -1; } @@ -3955,7 +3955,7 @@ static inline int build_assignment_string(smart_str *querystr, HashTable *ht, co break; default: /* should not happen */ - php_error(E_NOTICE, "%s() expect scaler values other than null. Need to convert?", + php_error(E_NOTICE, "%s(): Expects scaler values other than null. Need to convert?", get_active_function_name(TSRMLS_C)); return -1; } @@ -4053,7 +4053,7 @@ PHP_FUNCTION(pg_update) return; } if (option & ~(PGSQL_CONV_OPTS|PGSQL_DML_NO_CONV|PGSQL_DML_EXEC|PGSQL_DML_STRING)) { - php_error(E_WARNING, "%s() invalid option is spedified", + php_error(E_WARNING, "%s(): Invalid option is spedified", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -4061,7 +4061,7 @@ PHP_FUNCTION(pg_update) ZEND_FETCH_RESOURCE2(pg_link, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink); if (php_pgsql_flush_query(pg_link TSRMLS_CC)) { - php_error(E_NOTICE, "%s detected unhandled result(s) in connection", + php_error(E_NOTICE, "%s(): Detected unhandled result(s) in connection", get_active_function_name(TSRMLS_C)); } if (php_pgsql_update(pg_link, table, values, ids, option, &sql TSRMLS_CC) == FAILURE) { @@ -4143,7 +4143,7 @@ PHP_FUNCTION(pg_delete) return; } if (option & ~(PGSQL_CONV_FORCE_NULL|PGSQL_DML_NO_CONV|PGSQL_DML_EXEC|PGSQL_DML_STRING)) { - php_error(E_WARNING, "%s() invalid option is spedified", + php_error(E_WARNING, "%s(): Invalid option is spedified", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -4151,7 +4151,7 @@ PHP_FUNCTION(pg_delete) ZEND_FETCH_RESOURCE2(pg_link, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink); if (php_pgsql_flush_query(pg_link TSRMLS_CC)) { - php_error(E_NOTICE, "%s detected unhandled result(s) in connection", + php_error(E_NOTICE, "%s(): Detected unhandled result(s) in connection", get_active_function_name(TSRMLS_C)); } if (php_pgsql_delete(pg_link, table, ids, option, &sql TSRMLS_CC) == FAILURE) { @@ -4248,7 +4248,7 @@ PHPAPI int php_pgsql_select(PGconn *pg_link, const char *table, zval *ids_array, if (PQresultStatus(pg_result) == PGRES_TUPLES_OK) { ret = php_pgsql_result2array(pg_result, ret_array TSRMLS_CC); } else { - php_error(E_NOTICE, "%s() failed to execute '%s'", + php_error(E_NOTICE, "%s(): Failed to execute '%s'", get_active_function_name(TSRMLS_C), querystr.c); PQclear(pg_result); } @@ -4283,7 +4283,7 @@ PHP_FUNCTION(pg_select) return; } if (option & ~(PGSQL_CONV_FORCE_NULL|PGSQL_DML_NO_CONV|PGSQL_DML_EXEC|PGSQL_DML_ASYNC|PGSQL_DML_STRING)) { - php_error(E_WARNING, "%s() invalid option is spedified", + php_error(E_WARNING, "%s(): Invalid option is spedified", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -4291,7 +4291,7 @@ PHP_FUNCTION(pg_select) ZEND_FETCH_RESOURCE2(pg_link, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink); if (php_pgsql_flush_query(pg_link TSRMLS_CC)) { - php_error(E_NOTICE, "%s detected unhandled result(s) in connection", + php_error(E_NOTICE, "%s(): Detected unhandled result(s) in connection", get_active_function_name(TSRMLS_C)); } array_init(return_value); -- 2.40.0