helly Sat Dec 6 16:28:08 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/pgsql pgsql.c
Log:
Update error/warning messages
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.244.2.27 php-src/ext/pgsql/pgsql.c:1.244.2.28
--- php-src/ext/pgsql/pgsql.c:1.244.2.27 Tue Nov 25 17:23:54 2003
+++ php-src/ext/pgsql/pgsql.c Sat Dec 6 16:28:07 2003
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql.c,v 1.244.2.27 2003/11/25 22:23:54 iliaa Exp $ */
+/* $Id: pgsql.c,v 1.244.2.28 2003/12/06 21:28:07 helly Exp $ */
#include <stdlib.h>
@@ -71,7 +71,7 @@
#define PQ_SETNONBLOCKING(pg_link, flag) 0
#endif
-#define CHECK_DEFAULT_LINK(x) if ((x) == -1) { php_error_docref(NULL TSRMLS_CC,
E_WARNING, "No PostgreSQL link opened yet."); }
+#define CHECK_DEFAULT_LINK(x) if ((x) == -1) { php_error_docref(NULL TSRMLS_CC,
E_WARNING, "No PostgreSQL link opened yet"); }
/* {{{ pgsql_functions[]
*/
@@ -233,6 +233,15 @@
}
/* }}} */
+/* {{{ _php_pgsql_trim_result */
+static inline char * _php_pgsql_trim_result(PGconn * pgsql, char **buf)
+{
+ return *buf = _php_pgsql_trim_message(PQerrorMessage(pgsql), NULL);
+}
+/* }}} */
+
+#define PQErrorMessageTrim(pgsql, buf) _php_pgsql_trim_result(pgsql, buf)
+
#define PHP_PQ_ERROR(text, pgsql) { \
char *msgbuf = _php_pgsql_trim_message(PQerrorMessage(pgsql), NULL); \
php_error_docref(NULL TSRMLS_CC, E_WARNING, text, msgbuf); \
@@ -289,18 +298,11 @@
static void _php_pgsql_notice_handler(void *resource_id, const char *message)
{
php_pgsql_notice *notice;
- int i;
TSRMLS_FETCH();
if (! PGG(ignore_notices)) {
notice = (php_pgsql_notice *)emalloc(sizeof(php_pgsql_notice));
- i = strlen(message)-1;
- while (i && (message[i] == '\r' || message[i] == '\n')) {
- i--;
- }
- i++;
- notice->message = estrndup(message, i);
- notice->len = i;
+ notice->message = _php_pgsql_trim_message(message, ¬ice->len);
if (PGG(log_notices)) {
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s",
notice->message);
}
@@ -335,7 +337,7 @@
link = (PGconn *) rsrc->ptr;
if (PQ_SETNONBLOCKING(link, 0)) {
- php_error_docref("ref.pgsql" TSRMLS_CC, E_NOTICE, "Cannot set
connection to blocking mode.");
+ php_error_docref("ref.pgsql" TSRMLS_CC, E_NOTICE, "Cannot set
connection to blocking mode");
return -1;
}
@@ -521,6 +523,8 @@
smart_str str = {0};
zval **args[5];
int i, connect_type = 0;
+ char *msgbuf;
+ PGresult *pg_result;
if (ZEND_NUM_ARGS() < 1 || ZEND_NUM_ARGS() > 5
|| zend_get_parameters_array_ex(ZEND_NUM_ARGS(), args) ==
FAILURE) {
@@ -567,12 +571,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 (%ld).", 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 (%ld).", PGG(num_persistent));
+ "Cannot create new
link. Too many open persistent links (%ld)", PGG(num_persistent));
goto err;
}
@@ -583,7 +587,7 @@
pgsql=PQsetdb(host,port,options,tty,dbname);
}
if (pgsql==NULL || PQstatus(pgsql)==CONNECTION_BAD) {
- PHP_PQ_ERROR("Unable to connect to PostgreSQL server:
%s.", pgsql)
+ PHP_PQ_ERROR("Unable to connect to PostgreSQL server:
%s", pgsql)
if (pgsql) {
PQfinish(pgsql);
}
@@ -622,7 +626,7 @@
PQreset(le->ptr);
}
if (le->ptr==NULL ||
PQstatus(le->ptr)==CONNECTION_BAD) {
- php_error_docref(NULL TSRMLS_CC,
E_WARNING,"PostgreSQL link lost, unable to reconnect.");
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING,"PostgreSQL link lost, unable to reconnect");
zend_hash_del(&EG(persistent_list),str.c,str.len+1);
goto err;
}
@@ -659,7 +663,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 (%ld).", 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) {
@@ -668,7 +672,7 @@
pgsql = PQsetdb(host,port,options,tty,dbname);
}
if (pgsql==NULL || PQstatus(pgsql)==CONNECTION_BAD) {
- PHP_PQ_ERROR("Unable to connect to PostgreSQL server: %s.",
pgsql);
+ PHP_PQ_ERROR("Unable to connect to PostgreSQL server: %s",
pgsql);
goto err;
}
@@ -787,6 +791,7 @@
zval **pgsql_link = NULL;
int id = -1;
PGconn *pgsql;
+ char *msgbuf;
switch(ZEND_NUM_ARGS()) {
case 0:
@@ -813,9 +818,8 @@
Z_STRVAL_P(return_value) = PQdb(pgsql);
break;
case PHP_PG_ERROR_MESSAGE:
- Z_STRVAL_P(return_value) =
_php_pgsql_trim_message(PQerrorMessage(pgsql), &(Z_STRLEN_P(return_value)));
- goto done;
- break;
+ RETURN_STRING(PQErrorMessageTrim(pgsql, &msgbuf), 0);
+ return;
case PHP_PG_OPTIONS:
Z_STRVAL_P(return_value) = PQoptions(pgsql);
break;
@@ -838,7 +842,6 @@
Z_STRLEN_P(return_value) = 0;
Z_STRVAL_P(return_value) = (char *) estrdup("");
}
-done:
Z_TYPE_P(return_value) = IS_STRING;
}
/* }}} */
@@ -895,13 +898,18 @@
Ping database. If connection is bad, try to reconnect. */
PHP_FUNCTION(pg_ping)
{
- zval *pgsql_link = NULL;
- int id = -1;
+ zval *pgsql_link;
+ int id;
PGconn *pgsql;
PGresult *res;
- if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS()
TSRMLS_CC, "r",
- &pgsql_link) ==
FAILURE) {
+ if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS()
TSRMLS_CC, "r", &pgsql_link) == SUCCESS) {
+ id = -1;
+ } else {
+ pgsql_link = NULL;
+ id = PGG(default_link);
+ }
+ if (pgsql_link == NULL && id == -1) {
RETURN_FALSE;
}
@@ -935,6 +943,7 @@
PGresult *pgsql_result;
ExecStatusType status;
pgsql_result_handle *pg_result;
+ char *msgbuf;
switch(ZEND_NUM_ARGS()) {
case 1:
@@ -961,7 +970,7 @@
convert_to_string_ex(query);
if (PQ_SETNONBLOCKING(pgsql, 0)) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE,"Cannot set connection to
blocking mode.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE,"Cannot set connection to
blocking mode");
RETURN_FALSE;
}
while ((pgsql_result = PQgetResult(pgsql))) {
@@ -969,7 +978,7 @@
leftover = 1;
}
if (leftover) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Found results on this
connection. Use pg_get_result() to get these results first.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Found results on this
connection. Use pg_get_result() to get these results first");
}
pgsql_result = PQexec(pgsql, Z_STRVAL_PP(query));
if ((PGG(auto_reset_persistent) & 2) && PQstatus(pgsql) != CONNECTION_OK) {
@@ -989,7 +998,7 @@
case PGRES_BAD_RESPONSE:
case PGRES_NONFATAL_ERROR:
case PGRES_FATAL_ERROR:
- PHP_PQ_ERROR("Query failed: %s.", pgsql);
+ PHP_PQ_ERROR("Query failed: %s", pgsql);
PQclear(pgsql_result);
RETURN_FALSE;
break;
@@ -1041,7 +1050,7 @@
#if HAVE_PQCMDTUPLES
Z_LVAL_P(return_value) = atoi(PQcmdTuples(pgsql_result));
#else
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not supported
under this build.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not supported
under this build");
Z_LVAL_P(return_value) = 0;
#endif
break;
@@ -1182,7 +1191,7 @@
convert_to_long_ex(field);
if (Z_LVAL_PP(field) < 0 || Z_LVAL_PP(field) >= PQnfields(pgsql_result)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad field offset
specified.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad field offset
specified");
RETURN_FALSE;
}
@@ -1282,7 +1291,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 %ld on PostgreSQL result index %ld.", 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;
}
}
@@ -1296,7 +1305,7 @@
break;
}
if (field_offset<0 || field_offset>=PQnfields(pgsql_result)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad column offset
specified.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad column offset
specified");
RETURN_FALSE;
}
@@ -1345,7 +1354,7 @@
}
if (!(result_type & PGSQL_BOTH)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid result type.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid result type");
RETURN_FALSE;
}
@@ -1365,7 +1374,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 %ld on PostgreSQL result index %ld.", 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 {
@@ -1482,7 +1491,7 @@
}
/* }}} */
-/* {{{ proto mixed pg_result_seek(resource result, int offset)
+/* {{{ proto bool pg_result_seek(resource result, int offset)
Set internal row offset */
PHP_FUNCTION(pg_result_seek)
{
@@ -1538,7 +1547,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 %ld on PostgreSQL result index %ld.", 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;
}
}
@@ -1554,7 +1563,7 @@
break;
}
if (field_offset < 0 || field_offset >= PQnfields(pgsql_result)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad column offset
specified.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad column offset
specified");
RETURN_FALSE;
}
@@ -1770,7 +1779,7 @@
*/
if ((pgsql_oid = lo_creat(pgsql, INV_READ|INV_WRITE)) == InvalidOid) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to create
PostgreSQL large object.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to create
PostgreSQL large object");
RETURN_FALSE;
}
PGSQL_RETURN_OID(pgsql_oid);
@@ -1796,14 +1805,14 @@
oid = (Oid)strtoul(oid_string, &end_ptr, 10);
if ((oid_string+oid_strlen) != end_ptr) {
/* wrong integer format */
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Wrong OID value
passed.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Wrong OID value
passed");
RETURN_FALSE;
}
}
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_docref(NULL TSRMLS_CC, E_NOTICE, "Invalid OID
specified.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Invalid OID
specified");
RETURN_FALSE;
}
oid = (Oid)oid_long;
@@ -1813,7 +1822,7 @@
oid = (Oid)strtoul(oid_string, &end_ptr, 10);
if ((oid_string+oid_strlen) != end_ptr) {
/* wrong integer format */
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Wrong OID value
passed.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Wrong OID value
passed");
RETURN_FALSE;
}
id = PGG(default_link);
@@ -1822,7 +1831,7 @@
else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc TSRMLS_CC,
"l", &oid_long) ==
SUCCESS) {
if (oid_long <= InvalidOid) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Invalid OID is
specified.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Invalid OID is
specified");
RETURN_FALSE;
}
oid = (Oid)oid_long;
@@ -1830,7 +1839,7 @@
CHECK_DEFAULT_LINK(id);
}
else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Requires 1 or 2
arguments.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Requires 1 or 2
arguments");
RETURN_FALSE;
}
if (pgsql_link == NULL && id == -1) {
@@ -1840,7 +1849,7 @@
ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link",
le_link, le_plink);
if (lo_unlink(pgsql, oid) == -1) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to delete
PostgreSQL large object %u.", oid);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to delete
PostgreSQL large object %u", oid);
RETURN_FALSE;
}
RETURN_TRUE;
@@ -1868,14 +1877,14 @@
oid = (Oid)strtoul(oid_string, &end_ptr, 10);
if ((oid_string+oid_strlen) != end_ptr) {
/* wrong integer format */
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Wrong OID value
passed.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Wrong OID value
passed");
RETURN_FALSE;
}
}
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_docref(NULL TSRMLS_CC, E_NOTICE, "Invalid OID
specified.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Invalid OID
specified");
RETURN_FALSE;
}
oid = (Oid)oid_long;
@@ -1885,7 +1894,7 @@
oid = (Oid)strtoul(oid_string, &end_ptr, 10);
if ((oid_string+oid_strlen) != end_ptr) {
/* wrong integer format */
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Wrong OID value
passed.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Wrong OID value
passed");
RETURN_FALSE;
}
id = PGG(default_link);
@@ -1894,7 +1903,7 @@
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_docref(NULL TSRMLS_CC, E_NOTICE, "Invalid OID
specified.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Invalid OID
specified");
RETURN_FALSE;
}
oid = (Oid)oid_long;
@@ -1902,7 +1911,7 @@
CHECK_DEFAULT_LINK(id);
}
else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Requires 1 or 2
arguments.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Requires 1 or 2
arguments");
RETURN_FALSE;
}
if (pgsql_link == NULL && id == -1) {
@@ -1936,17 +1945,17 @@
if (create) {
if ((oid = lo_creat(pgsql, INV_READ|INV_WRITE)) == 0) {
efree(pgsql_lofp);
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to
create PostgreSQL large object.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to
create PostgreSQL large object");
RETURN_FALSE;
} else {
if ((pgsql_lofd = lo_open(pgsql, oid, pgsql_mode)) ==
-1) {
if (lo_unlink(pgsql, oid) == -1) {
efree(pgsql_lofp);
- php_error_docref(NULL TSRMLS_CC,
E_WARNING, "Something is really messed up! Your database is badly corrupted in a way
NOT related to PHP.");
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING, "Something is really messed up! Your database is badly corrupted in a way
NOT related to PHP");
RETURN_FALSE;
}
efree(pgsql_lofp);
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Unable to open PostgreSQL large object.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Unable to open PostgreSQL large object");
RETURN_FALSE;
} else {
pgsql_lofp->conn = pgsql;
@@ -1957,7 +1966,7 @@
}
} else {
efree(pgsql_lofp);
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to open
PostgreSQL large object.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to open
PostgreSQL large object");
RETURN_FALSE;
}
} else {
@@ -1989,7 +1998,7 @@
ZEND_FETCH_RESOURCE(pgsql, pgLofp *, pgsql_lofp, -1, "PostgreSQL large
object", le_lofp);
if (lo_close((PGconn *)pgsql->conn, pgsql->lofd) < 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to close
PostgreSQL large object descriptor %d.", pgsql->lofd);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to close
PostgreSQL large object descriptor %d", pgsql->lofd);
RETVAL_FALSE;
} else {
RETVAL_TRUE;
@@ -2054,12 +2063,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 %ld.",
+ 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 %ld was specified.", 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);
@@ -2132,7 +2141,7 @@
}
else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc TSRMLS_CC,
"sr",
&file_in, &name_len, &pgsql_link ) == SUCCESS) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Old API is used.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Old API is used");
}
else {
WRONG_PARAM_COUNT;
@@ -2178,7 +2187,7 @@
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_docref(NULL TSRMLS_CC, E_NOTICE, "Invalid OID
specified.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Invalid OID
specified");
RETURN_FALSE;
}
oid = (Oid)oid_long;
@@ -2188,14 +2197,14 @@
oid = (Oid)strtoul(oid_string, &end_ptr, 10);
if ((oid_string+oid_strlen) != end_ptr) {
/* wrong integer format */
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Wrong OID value
passed.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Wrong OID value
passed");
RETURN_FALSE;
}
}
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_docref(NULL TSRMLS_CC, E_NOTICE, "Invalid OID
specified.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Invalid OID
specified");
RETURN_FALSE;
}
oid = (Oid)oid_long;
@@ -2207,7 +2216,7 @@
oid = (Oid)strtoul(oid_string, &end_ptr, 10);
if ((oid_string+oid_strlen) != end_ptr) {
/* wrong integer format */
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Wrong OID value
passed.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Wrong OID value
passed");
RETURN_FALSE;
}
id = PGG(default_link);
@@ -2218,7 +2227,7 @@
oid = (Oid)strtoul(oid_string, &end_ptr, 10);
if ((oid_string+oid_strlen) != end_ptr) {
/* wrong integer format */
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Wrong OID value
passed.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Wrong OID value
passed");
RETURN_FALSE;
}
}
@@ -2226,13 +2235,13 @@
"lsr",
&oid_long, &file_out, &name_len, &pgsql_link) == SUCCESS) {
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.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Invalid OID
specified");
RETURN_FALSE;
}
oid = (Oid)oid_long;
}
else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Requires 2 or 3
arguments.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Requires 2 or 3
arguments");
RETURN_FALSE;
}
@@ -2270,7 +2279,7 @@
return;
}
if (whence != SEEK_SET && whence != SEEK_CUR && whence != SEEK_END) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid whence
parameter.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid whence
parameter");
return;
}
@@ -2397,6 +2406,7 @@
int id = -1;
PGconn *pgsql;
int result = 0;
+ char *msgbuf;
switch(ZEND_NUM_ARGS()) {
case 0:
@@ -2421,7 +2431,7 @@
result = PQendcopy(pgsql);
if (result!=0) {
- PHP_PQ_ERROR("Query failed: %s.", pgsql);
+ PHP_PQ_ERROR("Query failed: %s", pgsql);
RETURN_FALSE;
}
RETURN_TRUE;
@@ -2437,6 +2447,7 @@
int id = -1;
PGconn *pgsql;
int result = 0;
+ char *msgbuf;
switch(ZEND_NUM_ARGS()) {
case 1:
@@ -2465,7 +2476,7 @@
result = PQputline(pgsql, Z_STRVAL_PP(query));
if (result==EOF) {
- PHP_PQ_ERROR("Query failed: %s.", pgsql);
+ PHP_PQ_ERROR("Query failed: %s", pgsql);
RETURN_FALSE;
}
RETURN_TRUE;
@@ -2490,6 +2501,7 @@
char *csv = (char *)NULL;
int ret;
int argc = ZEND_NUM_ARGS();
+ char *msgbuf;
if (zend_parse_parameters(argc TSRMLS_CC, "rs|ss",
&pgsql_link, &table_name,
&table_name_len,
@@ -2530,7 +2542,7 @@
while (!copydone)
{
if ((ret = PQgetline(pgsql, copybuf,
COPYBUFSIZ))) {
- PHP_PQ_ERROR("getline failed: %s.",
pgsql);
+ PHP_PQ_ERROR("getline failed: %s",
pgsql);
RETURN_FALSE;
}
@@ -2564,7 +2576,7 @@
}
}
if (PQendcopy(pgsql)) {
- PHP_PQ_ERROR("endcopy failed: %s.", pgsql);
+ PHP_PQ_ERROR("endcopy failed: %s", pgsql);
RETURN_FALSE;
}
while ((pgsql_result = PQgetResult(pgsql))) {
@@ -2577,7 +2589,7 @@
break;
default:
PQclear(pgsql_result);
- PHP_PQ_ERROR("Copy command failed: %s.", pgsql);
+ PHP_PQ_ERROR("Copy command failed: %s", pgsql);
RETURN_FALSE;
break;
}
@@ -2600,6 +2612,7 @@
PGresult *pgsql_result;
ExecStatusType status;
int argc = ZEND_NUM_ARGS();
+ char *msgbuf;
if (zend_parse_parameters(argc TSRMLS_CC, "rs/a|ss",
&pgsql_link, &table_name,
&table_name_len, &pg_rows,
@@ -2645,18 +2658,18 @@
strcat(query, "\n");
if (PQputline(pgsql, query)) {
efree(query);
- PHP_PQ_ERROR("copy failed: %s.",
pgsql);
+ PHP_PQ_ERROR("copy failed: %s", pgsql);
RETURN_FALSE;
}
efree(query);
zend_hash_move_forward_ex(Z_ARRVAL_P(pg_rows),
&pos);
}
if (PQputline(pgsql, "\\.\n") == EOF) {
- PHP_PQ_ERROR("putline failed: %s.", pgsql);
+ PHP_PQ_ERROR("putline failed: %s", pgsql);
RETURN_FALSE;
}
if (PQendcopy(pgsql)) {
- PHP_PQ_ERROR("endcopy failed: %s.", pgsql);
+ PHP_PQ_ERROR("endcopy failed: %s", pgsql);
RETURN_FALSE;
}
while ((pgsql_result = PQgetResult(pgsql))) {
@@ -2670,7 +2683,7 @@
break;
default:
PQclear(pgsql_result);
- PHP_PQ_ERROR("Copy command failed: %s.", pgsql);
+ PHP_PQ_ERROR("Copy command failed: %s", pgsql);
RETURN_FALSE;
break;
}
@@ -2919,7 +2932,7 @@
int leftover = 0;
if (PQ_SETNONBLOCKING(pgsql, 1)) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE,"Cannot set connection to
nonblocking mode.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE,"Cannot set connection to
nonblocking mode");
return -1;
}
while ((res = PQgetResult(pgsql))) {
@@ -2948,7 +2961,7 @@
ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link",
le_link, le_plink);
if (PQ_SETNONBLOCKING(pgsql, 1)) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Cannot set connection to
nonblocking mode.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Cannot set connection to
nonblocking mode");
RETURN_FALSE;
}
switch(entry_type) {
@@ -2965,11 +2978,11 @@
}
break;
default:
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "PostgreSQL module
error, please report this error.");
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "PostgreSQL module
error, please report this error");
break;
}
if (PQ_SETNONBLOCKING(pgsql, 0)) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Cannot set connection to
blocking mode.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Cannot set connection to
blocking mode");
}
convert_to_boolean_ex(&return_value);
}
@@ -3011,7 +3024,7 @@
ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link",
le_link, le_plink);
if (PQ_SETNONBLOCKING(pgsql, 1)) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Cannot set connection to
nonblocking mode.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Cannot set connection to
nonblocking mode");
RETURN_FALSE;
}
while ((res = PQgetResult(pgsql))) {
@@ -3019,7 +3032,7 @@
leftover = 1;
}
if (leftover) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "There are results on this
connection. Call pg_get_result() until it returns FALSE.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "There are results on this
connection. Call pg_get_result() until it returns FALSE");
}
if (!PQsendQuery(pgsql, query)) {
if ((PGG(auto_reset_persistent) & 2) && PQstatus(pgsql) !=
CONNECTION_OK) {
@@ -3030,7 +3043,7 @@
}
}
if (PQ_SETNONBLOCKING(pgsql, 0)) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Cannot set connection to
blocking mode.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Cannot set connection to
blocking mode");
}
RETURN_TRUE;
}
@@ -3093,14 +3106,14 @@
RETURN_STRING(PQcmdStatus(pgsql_result), 1);
}
else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Optional 2nd parameter
should be PGSQL_STATUS_LONG or PGSQL_STATUS_STRING.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Optional 2nd parameter
should be PGSQL_STATUS_LONG or PGSQL_STATUS_STRING");
RETURN_FALSE;
}
}
/* }}} */
-/* {{{ proto resource pg_get_notify([resource connection[, result_type]])
+/* {{{ proto array pg_get_notify([resource connection[, result_type]])
Get asynchronous notification */
PHP_FUNCTION(pg_get_notify)
{
@@ -3134,7 +3147,7 @@
}
/* }}} */
-/* {{{ proto resource pg_get_pid([resource connection)
+/* {{{ proto int pg_get_pid([resource connection)
Get backend(server) pid */
PHP_FUNCTION(pg_get_pid)
{
@@ -3179,7 +3192,7 @@
pg_result = PQexec(pg_link, querystr.c);
if (PQresultStatus(pg_result) != PGRES_TUPLES_OK || (num_rows =
PQntuples(pg_result)) == 0) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Failed to query meta_data
for '%s' table %s.", table_name, querystr.c);
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Failed to query meta_data
for '%s' table %s", table_name, querystr.c);
smart_str_free(&querystr);
PQclear(pg_result);
return FAILURE;
@@ -3347,7 +3360,7 @@
regerr = regcomp(&re, regex, regopt);
if (regerr) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot compile regex.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot compile regex");
regfree(&re);
return FAILURE;
}
@@ -3356,12 +3369,12 @@
regerr = regexec(&re, str, re.re_nsub+1, subs, 0);
if (regerr == REG_NOMATCH) {
#ifdef PHP_DEBUG
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "'%s' does not match with
'%s'.", str, regex);
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "'%s' does not match with
'%s'", str, regex);
#endif
ret = FAILURE;
}
else if (regerr) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot exec regex.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot exec regex");
ret = FAILURE;
}
regfree(&re);
@@ -3406,7 +3419,7 @@
} \
/* raise error if it's not null and cannot be
ignored */ \
else if (!(opt & PGSQL_CONV_IGNORE_NOT_NULL)
&& Z_BVAL_PP(not_null)) { \
- php_error_docref(NULL TSRMLS_CC,
E_NOTICE, "Detected NULL for 'NOT NULL' field '%s'.", field ); \
+ php_error_docref(NULL TSRMLS_CC,
E_NOTICE, "Detected NULL for 'NOT NULL' field '%s'", field ); \
err = 1; \
} \
}
@@ -3444,37 +3457,37 @@
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_docref(NULL TSRMLS_CC, E_WARNING, "Failed to get
array key type.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to get
array key type");
err = 1;
}
if (!err && key_type == HASH_KEY_IS_LONG) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Accepts only
string key for values.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Accepts only
string key for values");
err = 1;
}
if (!err && key_type == HASH_KEY_NON_EXISTANT) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Accepts only
string key for values.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Accepts only
string key for values");
err = 1;
}
if (!err && zend_hash_find(Z_ARRVAL_P(meta), field, field_len, (void
**)&def) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Invalid field name
(%s) in values.", field);
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Invalid field name
(%s) in values", field);
err = 1;
}
if (!err && zend_hash_find(Z_ARRVAL_PP(def), "type", sizeof("type"),
(void **)&type) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Detected broken
meta data. Missing 'type'.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Detected broken
meta data. Missing 'type'");
err = 1;
}
if (!err && zend_hash_find(Z_ARRVAL_PP(def), "not null", sizeof("not
null"), (void **)¬_null) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Detected broken
meta data. Missing 'not null'.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Detected broken
meta data. Missing 'not null'");
err = 1;
}
if (!err && zend_hash_find(Z_ARRVAL_PP(def), "has default",
sizeof("has default"), (void **)&has_default) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Detected broken
meta data. Missing 'has default'.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Detected broken
meta data. Missing 'has default'");
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_docref(NULL TSRMLS_CC, E_NOTICE, "Expects scaler
values as field values.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Expects scaler
values as field values");
err = 1;
}
if (err) {
@@ -3505,7 +3518,7 @@
ZVAL_STRING(new_val,
"'f'", 1);
}
else {
- php_error_docref(NULL
TSRMLS_CC, E_NOTICE, "Detected invalid value (%s) for PostgreSQL %s field (%s).",
Z_STRVAL_PP(val), Z_STRVAL_PP(type), field);
+ php_error_docref(NULL
TSRMLS_CC, E_NOTICE, "Detected invalid value (%s) for PostgreSQL %s field (%s)",
Z_STRVAL_PP(val), Z_STRVAL_PP(type), field);
err = 1;
}
}
@@ -3530,7 +3543,7 @@
}
PGSQL_CONV_CHECK_IGNORE();
if (err) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Expects string, null, long or boolelan value for PostgreSQL '%s' (%s).",
Z_STRVAL_PP(type), field);
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Expects string, null, long or boolelan value for PostgreSQL '%s' (%s)",
Z_STRVAL_PP(type), field);
}
break;
@@ -3572,7 +3585,7 @@
}
PGSQL_CONV_CHECK_IGNORE();
if (err) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Expects NULL, string, long or double value for pgsql '%s' (%s).", Z_STRVAL_PP(type),
field);
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Expects NULL, string, long or double value for pgsql '%s' (%s)", Z_STRVAL_PP(type),
field);
}
break;
@@ -3613,7 +3626,7 @@
}
PGSQL_CONV_CHECK_IGNORE();
if (err) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Expects NULL, string, long or double value for PostgreSQL '%s' (%s).",
Z_STRVAL_PP(type), field);
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Expects NULL, string, long or double value for PostgreSQL '%s' (%s)",
Z_STRVAL_PP(type), field);
}
break;
@@ -3665,7 +3678,7 @@
}
PGSQL_CONV_CHECK_IGNORE();
if (err) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Expects NULL, string, long or double value for PostgreSQL '%s' (%s).",
Z_STRVAL_PP(type), field);
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Expects NULL, string, long or double value for PostgreSQL '%s' (%s)",
Z_STRVAL_PP(type), field);
}
break;
@@ -3707,7 +3720,7 @@
}
PGSQL_CONV_CHECK_IGNORE();
if (err) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Expects NULL, string, long or double value for '%s' (%s).", Z_STRVAL_PP(type), field);
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Expects NULL, string, long or double value for '%s' (%s)", Z_STRVAL_PP(type), field);
}
break;
@@ -3739,7 +3752,7 @@
}
PGSQL_CONV_CHECK_IGNORE();
if (err) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Expects NULL or string for '%s' (%s).", Z_STRVAL_PP(type), field);
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Expects NULL or string for '%s' (%s)", Z_STRVAL_PP(type), field);
}
break;
@@ -3772,7 +3785,7 @@
}
PGSQL_CONV_CHECK_IGNORE();
if (err) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Expects NULL or string for PostgreSQL %s field (%s).", Z_STRVAL_PP(type), field);
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Expects NULL or string for PostgreSQL %s field (%s)", Z_STRVAL_PP(type), field);
}
break;
@@ -3803,7 +3816,7 @@
}
PGSQL_CONV_CHECK_IGNORE();
if (err) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Expects NULL or string for PostgreSQL %s field (%s).", Z_STRVAL_PP(type), field);
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Expects NULL or string for PostgreSQL %s field (%s)", Z_STRVAL_PP(type), field);
}
break;
@@ -3834,7 +3847,7 @@
}
PGSQL_CONV_CHECK_IGNORE();
if (err) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Expects NULL or string for PostgreSQL %s field (%s).", Z_STRVAL_PP(type), field);
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Expects NULL or string for PostgreSQL %s field (%s)", Z_STRVAL_PP(type), field);
}
break;
@@ -3866,7 +3879,7 @@
}
PGSQL_CONV_CHECK_IGNORE();
if (err) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Expects NULL or string for PostgreSQL %s field (%s).", Z_STRVAL_PP(type), field);
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Expects NULL or string for PostgreSQL %s field (%s)", Z_STRVAL_PP(type), field);
}
break;
#ifdef HAVE_PQESCAPE
@@ -3909,7 +3922,7 @@
}
PGSQL_CONV_CHECK_IGNORE();
if (err) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Expects NULL, string, long or double value for PostgreSQL '%s' (%s).",
Z_STRVAL_PP(type), field);
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Expects NULL, string, long or double value for PostgreSQL '%s' (%s)",
Z_STRVAL_PP(type), field);
}
break;
@@ -3940,7 +3953,7 @@
}
PGSQL_CONV_CHECK_IGNORE();
if (err) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Expects NULL or string for PostgreSQL %s field (%s).", Z_STRVAL_PP(type), field);
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Expects NULL or string for PostgreSQL %s field (%s)", Z_STRVAL_PP(type), field);
}
break;
@@ -3955,13 +3968,13 @@
case PG_PATH:
case PG_POLYGON:
case PG_CIRCLE:
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "PostgreSQL
'%s' type (%s) is not supported.", Z_STRVAL_PP(type), field);
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "PostgreSQL
'%s' type (%s) is not supported", Z_STRVAL_PP(type), field);
err = 1;
break;
case PG_UNKNOWN:
default:
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unknown or
system data type '%s' for '%s'.", Z_STRVAL_PP(type), field);
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unknown or
system data type '%s' for '%s'", Z_STRVAL_PP(type), field);
err = 1;
break;
} /* switch */
@@ -4006,18 +4019,18 @@
return;
}
if (option & ~PGSQL_CONV_OPTS) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid option is
specified.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid option is
specified");
RETURN_FALSE;
}
if (!table_name_len) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Table name is invalid.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Table name is invalid");
RETURN_FALSE;
}
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_docref(NULL TSRMLS_CC, E_NOTICE, "Detected unhandled
result(s) in connection.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Detected unhandled
result(s) in connection");
}
array_init(return_value);
if (php_pgsql_convert(pg_link, table_name, values, return_value, option
TSRMLS_CC) == FAILURE) {
@@ -4042,7 +4055,7 @@
PQclear(pg_result);
return 0;
} else {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Failed to execute
'%s'.", querystr->c);
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Failed to execute
'%s'", querystr->c);
PQclear(pg_result);
}
}
@@ -4089,7 +4102,7 @@
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_docref(NULL TSRMLS_CC, E_NOTICE, "Expects
associative array for values to be inserted.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Expects
associative array for values to be inserted");
goto cleanup;
}
smart_str_appendl(&querystr, fld, fld_len - 1);
@@ -4117,7 +4130,7 @@
break;
default:
/* should not happen */
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Report
this error to [EMAIL PROTECTED], type = %d.", Z_TYPE_PP(val));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Report
this error to [EMAIL PROTECTED], type = %d", Z_TYPE_PP(val));
goto cleanup;
break;
}
@@ -4167,14 +4180,14 @@
return;
}
if (option &
~(PGSQL_CONV_OPTS|PGSQL_DML_NO_CONV|PGSQL_DML_EXEC|PGSQL_DML_ASYNC|PGSQL_DML_STRING)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid option is
specified.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid option is
specified");
RETURN_FALSE;
}
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_docref(NULL TSRMLS_CC, E_NOTICE, "Detected unhandled
result(s) in connection.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Detected unhandled
result(s) in connection");
}
if (php_pgsql_insert(pg_link, table, values, option, &sql TSRMLS_CC) ==
FAILURE) {
RETURN_FALSE;
@@ -4201,7 +4214,7 @@
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_docref(NULL TSRMLS_CC, E_NOTICE, "Expects
associative array for values to be inserted.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Expects
associative array for values to be inserted");
return -1;
}
smart_str_appendl(querystr, fld, fld_len - 1);
@@ -4316,14 +4329,14 @@
return;
}
if (option &
~(PGSQL_CONV_OPTS|PGSQL_DML_NO_CONV|PGSQL_DML_EXEC|PGSQL_DML_STRING)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid option is
specified.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid option is
specified");
RETURN_FALSE;
}
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_docref(NULL TSRMLS_CC, E_NOTICE, "Detected unhandled
result(s) in connection.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Detected unhandled
result(s) in connection");
}
if (php_pgsql_update(pg_link, table, values, ids, option, &sql TSRMLS_CC) ==
FAILURE) {
RETURN_FALSE;
@@ -4405,14 +4418,14 @@
return;
}
if (option &
~(PGSQL_CONV_FORCE_NULL|PGSQL_DML_NO_CONV|PGSQL_DML_EXEC|PGSQL_DML_STRING)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid option is
specified.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid option is
specified");
RETURN_FALSE;
}
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_docref(NULL TSRMLS_CC, E_NOTICE, "Detected unhandled
result(s) in connection.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Detected unhandled
result(s) in connection");
}
if (php_pgsql_delete(pg_link, table, ids, option, &sql TSRMLS_CC) == FAILURE) {
RETURN_FALSE;
@@ -4508,7 +4521,7 @@
if (PQresultStatus(pg_result) == PGRES_TUPLES_OK) {
ret = php_pgsql_result2array(pg_result, ret_array TSRMLS_CC);
} else {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Failed to execute '%s'.",
querystr.c);
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Failed to execute '%s'",
querystr.c);
}
PQclear(pg_result);
@@ -4543,14 +4556,14 @@
return;
}
if (option &
~(PGSQL_CONV_FORCE_NULL|PGSQL_DML_NO_CONV|PGSQL_DML_EXEC|PGSQL_DML_ASYNC|PGSQL_DML_STRING))
{
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid option is
specified.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid option is
specified");
RETURN_FALSE;
}
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_docref(NULL TSRMLS_CC, E_NOTICE, "Detected unhandled
result(s) in connection.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Detected unhandled
result(s) in connection");
}
array_init(return_value);
if (php_pgsql_select(pg_link, table, ids, return_value, option, &sql
TSRMLS_CC) == FAILURE) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
