archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fold PQresultErrorField() into a macro

Browse source
This commit is contained in:
Edin Kadribasic 2005-07-01 22:30:55 +00:00
parent 5d65789877
commit 7ef1a91508
3 changed files with 11 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ext/pdo_pgsql/pgsql_statement.c
View file

@ -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;
}