Skip to content

Commit

Permalink
using unexpected for blocking mode change
Browse files Browse the repository at this point in the history
  • Loading branch information
@devnexen
devnexen committed May 1, 2024
1 parent af2ce0b commit d00a513
Showing 1 changed file with 19 additions and 19 deletions.
38 changes: 19 additions & 19 deletions ext/pgsql/pgsql.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ char pgsql_libpq_version[16];

#if ZEND_LONG_MAX < UINT_MAX
#define PGSQL_RETURN_OID(oid) do { \
if (oid > ZEND_LONG_MAX) { \
if (UNEXPECTED(oid > ZEND_LONG_MAX)) { \
RETURN_STR(zend_ulong_to_str(oid)); \
} \
RETURN_LONG((zend_long)oid); \
Expand Down Expand Up @@ -354,7 +354,7 @@ static int _rollback_transactions(zval *el)

link = (PGconn *) rsrc->ptr;

if (PQsetnonblocking(link, 0)) {
if (UNEXPECTED(PQsetnonblocking(link, 0))) {
php_error_docref("ref.pgsql", E_NOTICE, "Cannot set connection to blocking mode");
return -1;
}
Expand Down Expand Up @@ -1007,7 +1007,7 @@ PHP_FUNCTION(pg_query)

pgsql = link->conn;

if (PQsetnonblocking(pgsql, 0)) {
if (UNEXPECTED(PQsetnonblocking(pgsql, 0))) {
php_error_docref(NULL, E_NOTICE,"Cannot set connection to blocking mode");
RETURN_FALSE;
}
Expand Down Expand Up @@ -1106,7 +1106,7 @@ PHP_FUNCTION(pg_query_params)

pgsql = link->conn;

if (PQsetnonblocking(pgsql, 0)) {
if (UNEXPECTED(PQsetnonblocking(pgsql, 0))) {
php_error_docref(NULL, E_NOTICE,"Cannot set connection to blocking mode");
RETURN_FALSE;
}
Expand Down Expand Up @@ -1216,7 +1216,7 @@ PHP_FUNCTION(pg_prepare)

pgsql = link->conn;

if (PQsetnonblocking(pgsql, 0)) {
if (UNEXPECTED(PQsetnonblocking(pgsql, 0))) {
php_error_docref(NULL, E_NOTICE,"Cannot set connection to blocking mode");
RETURN_FALSE;
}
Expand Down Expand Up @@ -1302,7 +1302,7 @@ PHP_FUNCTION(pg_execute)

pgsql = link->conn;

if (PQsetnonblocking(pgsql, 0)) {
if (UNEXPECTED(PQsetnonblocking(pgsql, 0))) {
php_error_docref(NULL, E_NOTICE,"Cannot set connection to blocking mode");
RETURN_FALSE;
}
Expand Down Expand Up @@ -3623,7 +3623,7 @@ static int php_pgsql_flush_query(PGconn *pgsql)
PGresult *res;
int leftover = 0;

if (PQsetnonblocking(pgsql, 1)) {
if (UNEXPECTED(PQsetnonblocking(pgsql, 1))) {
php_error_docref(NULL, E_NOTICE,"Cannot set connection to nonblocking mode");
return -1;
}
Expand Down Expand Up @@ -3652,7 +3652,7 @@ static void php_pgsql_do_async(INTERNAL_FUNCTION_PARAMETERS, int entry_type)
CHECK_PGSQL_LINK(link);
pgsql = link->conn;

if (PQsetnonblocking(pgsql, 1)) {
if (UNEXPECTED(PQsetnonblocking(pgsql, 1))) {
php_error_docref(NULL, E_NOTICE, "Cannot set connection to nonblocking mode");
RETURN_FALSE;
}
Expand All @@ -3679,7 +3679,7 @@ static void php_pgsql_do_async(INTERNAL_FUNCTION_PARAMETERS, int entry_type)
}
EMPTY_SWITCH_DEFAULT_CASE()
}
if (PQsetnonblocking(pgsql, 0)) {
if (UNEXPECTED(PQsetnonblocking(pgsql, 0))) {
php_error_docref(NULL, E_NOTICE, "Cannot set connection to blocking mode");
}
convert_to_boolean(return_value);
Expand Down Expand Up @@ -3733,7 +3733,7 @@ PHP_FUNCTION(pg_send_query)

is_non_blocking = PQisnonblocking(pgsql);

if (is_non_blocking == 0 && PQsetnonblocking(pgsql, 1) == -1) {
if (is_non_blocking == 0 && UNEXPECTED(PQsetnonblocking(pgsql, 1) == -1)) {
php_error_docref(NULL, E_NOTICE, "Cannot set connection to nonblocking mode");
RETURN_FALSE;
}
Expand Down Expand Up @@ -3767,7 +3767,7 @@ PHP_FUNCTION(pg_send_query)
usleep(10000);
}

if (PQsetnonblocking(pgsql, 0)) {
if (UNEXPECTED(PQsetnonblocking(pgsql, 0))) {
php_error_docref(NULL, E_NOTICE, "Cannot set connection to blocking mode");
}
}
Expand Down Expand Up @@ -3807,7 +3807,7 @@ PHP_FUNCTION(pg_send_query_params)

is_non_blocking = PQisnonblocking(pgsql);

if (is_non_blocking == 0 && PQsetnonblocking(pgsql, 1) == -1) {
if (is_non_blocking == 0 && UNEXPECTED(PQsetnonblocking(pgsql, 1) == -1)) {
php_error_docref(NULL, E_NOTICE, "Cannot set connection to nonblocking mode");
RETURN_FALSE;
}
Expand Down Expand Up @@ -3865,7 +3865,7 @@ PHP_FUNCTION(pg_send_query_params)
usleep(10000);
}

if (PQsetnonblocking(pgsql, 0) != 0) {
if (UNEXPECTED(PQsetnonblocking(pgsql, 0) != 0)) {
php_error_docref(NULL, E_NOTICE, "Cannot set connection to blocking mode");
}
}
Expand Down Expand Up @@ -3903,7 +3903,7 @@ PHP_FUNCTION(pg_send_prepare)

is_non_blocking = PQisnonblocking(pgsql);

if (is_non_blocking == 0 && PQsetnonblocking(pgsql, 1) == -1) {
if (is_non_blocking == 0 && UNEXPECTED(PQsetnonblocking(pgsql, 1) == -1)) {
php_error_docref(NULL, E_NOTICE, "Cannot set connection to nonblocking mode");
RETURN_FALSE;
}
Expand Down Expand Up @@ -3937,7 +3937,7 @@ PHP_FUNCTION(pg_send_prepare)
}
usleep(10000);
}
if (PQsetnonblocking(pgsql, 0) != 0) {
if (UNEXPECTED(PQsetnonblocking(pgsql, 0) != 0)) {
php_error_docref(NULL, E_NOTICE, "Cannot set connection to blocking mode");
}
}
Expand Down Expand Up @@ -3978,7 +3978,7 @@ PHP_FUNCTION(pg_send_execute)

is_non_blocking = PQisnonblocking(pgsql);

if (is_non_blocking == 0 && PQsetnonblocking(pgsql, 1) == -1) {
if (is_non_blocking == 0 && UNEXPECTED(PQsetnonblocking(pgsql, 1) == -1)) {
php_error_docref(NULL, E_NOTICE, "Cannot set connection to nonblocking mode");
RETURN_FALSE;
}
Expand Down Expand Up @@ -4037,7 +4037,7 @@ PHP_FUNCTION(pg_send_execute)
}
usleep(10000);
}
if (PQsetnonblocking(pgsql, 0) != 0) {
if (UNEXPECTED(PQsetnonblocking(pgsql, 0) != 0)) {
php_error_docref(NULL, E_NOTICE, "Cannot set connection to blocking mode");
}
}
Expand Down Expand Up @@ -4311,14 +4311,14 @@ PHP_FUNCTION(pg_flush)

is_non_blocking = PQisnonblocking(pgsql);

if (is_non_blocking == 0 && PQsetnonblocking(pgsql, 1) == -1) {
if (is_non_blocking == 0 && UNEXPECTED(PQsetnonblocking(pgsql, 1) == -1)) {
php_error_docref(NULL, E_NOTICE, "Cannot set connection to nonblocking mode");
RETURN_FALSE;
}

ret = PQflush(pgsql);

if (is_non_blocking == 0 && PQsetnonblocking(pgsql, 0) == -1) {
if (is_non_blocking == 0 && UNEXPECTED(PQsetnonblocking(pgsql, 0) == -1)) {
php_error_docref(NULL, E_NOTICE, "Failed resetting connection to blocking mode");
}

Expand Down

0 comments on commit d00a513

Please sign in to comment.