summaryrefslogtreecommitdiff
path: root/ext/pdo_pgsql/pgsql_statement.c
diff options
context:
space:
mode:
authorEdin Kadribasic <edink@php.net>2005-07-01 22:30:55 +0000
committerEdin Kadribasic <edink@php.net>2005-07-01 22:30:55 +0000
commit7ef1a91508ec876a3c79b9e4da42f3dca6c65b3e (patch)
tree8d8277095b7b432f3d7594c9cb851feb4a39b370 /ext/pdo_pgsql/pgsql_statement.c
parent5d6578987767e12479f9440fc90622cd1d23be46 (diff)
downloadphp-git-7ef1a91508ec876a3c79b9e4da42f3dca6c65b3e.tar.gz
Fold PQresultErrorField() into a macro
Diffstat (limited to 'ext/pdo_pgsql/pgsql_statement.c')
-rw-r--r--ext/pdo_pgsql/pgsql_statement.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/ext/pdo_pgsql/pgsql_statement.c b/ext/pdo_pgsql/pgsql_statement.c
index 821a053778..36f11beec0 100644
--- a/ext/pdo_pgsql/pgsql_statement.c
+++ b/ext/pdo_pgsql/pgsql_statement.c
@@ -97,13 +97,7 @@ static int pgsql_stmt_execute(pdo_stmt_t *stmt TSRMLS_DC)
status = PQresultStatus(S->result);
if (status != PGRES_COMMAND_OK && status != PGRES_TUPLES_OK) {
-#if HAVE_PQRESULTERRORFIELD
- char * sqlstate = PQresultErrorField(S->result, PG_DIAG_SQLSTATE);
- pdo_pgsql_error_stmt(stmt, status, (const char *)sqlstate);
-#else
- pdo_pgsql_error_stmt(stmt, status, NULL);
-#endif
-
+ pdo_pgsql_error_stmt(stmt, status, pdo_pgsql_sqlstate(S->result));
return 0;
}
@@ -151,12 +145,7 @@ static int pgsql_stmt_fetch(pdo_stmt_t *stmt,
status = PQresultStatus(S->result);
if (status != PGRES_COMMAND_OK && status != PGRES_TUPLES_OK) {
-#if HAVE_PQRESULTERRORFIELD
- char * sqlstate = PQresultErrorField(S->result, PG_DIAG_SQLSTATE);
- pdo_pgsql_error_stmt(stmt, status, (const char *)sqlstate);
-#else
- pdo_pgsql_error_stmt(stmt, status, NULL);
-#endif
+ pdo_pgsql_error_stmt(stmt, status, pdo_pgsql_sqlstate(S->result));
return 0;
}