mirror of
https://github.com/postgres/postgres.git
synced 2025-07-08 11:42:09 +03:00
Remove unnecessary parentheses in return statements
The parenthesized style has only been used in a few modules. Change that to use the style that is predominant across the whole tree. Reviewed-by: Michael Paquier <michael.paquier@gmail.com> Reviewed-by: Ryan Murphy <ryanfmurphy@gmail.com>
This commit is contained in:
@ -58,7 +58,7 @@ quote_postgres(char *arg, bool quote, int lineno)
|
||||
buffer_len = 2 * length + 1;
|
||||
res = (char *) ecpg_alloc(buffer_len + 3, lineno);
|
||||
if (!res)
|
||||
return (res);
|
||||
return res;
|
||||
escaped_len = PQescapeString(res + 1, arg, buffer_len);
|
||||
if (length == escaped_len)
|
||||
{
|
||||
@ -151,13 +151,13 @@ ecpg_type_infocache_push(struct ECPGtype_information_cache **cache, int oid, enu
|
||||
= (struct ECPGtype_information_cache *) ecpg_alloc(sizeof(struct ECPGtype_information_cache), lineno);
|
||||
|
||||
if (new_entry == NULL)
|
||||
return (false);
|
||||
return false;
|
||||
|
||||
new_entry->oid = oid;
|
||||
new_entry->isarray = isarray;
|
||||
new_entry->next = *cache;
|
||||
*cache = new_entry;
|
||||
return (true);
|
||||
return true;
|
||||
}
|
||||
|
||||
static enum ARRAY_TYPE
|
||||
@ -178,89 +178,89 @@ ecpg_is_type_an_array(int type, const struct statement *stmt, const struct varia
|
||||
|
||||
/* populate cache with well known types to speed things up */
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), BOOLOID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), BYTEAOID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), CHAROID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), NAMEOID, not_an_array_in_ecpg, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), INT8OID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), INT2OID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), INT2VECTOROID, ECPG_ARRAY_VECTOR, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), INT4OID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), REGPROCOID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), TEXTOID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), OIDOID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), TIDOID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), XIDOID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), CIDOID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), OIDVECTOROID, ECPG_ARRAY_VECTOR, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), POINTOID, ECPG_ARRAY_VECTOR, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), LSEGOID, ECPG_ARRAY_VECTOR, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), PATHOID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), BOXOID, ECPG_ARRAY_VECTOR, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), POLYGONOID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), LINEOID, ECPG_ARRAY_VECTOR, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), FLOAT4OID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), FLOAT8OID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), ABSTIMEOID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), RELTIMEOID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), TINTERVALOID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), UNKNOWNOID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), CIRCLEOID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), CASHOID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), INETOID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), CIDROID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), BPCHAROID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), VARCHAROID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), DATEOID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), TIMEOID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), TIMESTAMPOID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), TIMESTAMPTZOID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), INTERVALOID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), TIMETZOID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), ZPBITOID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), VARBITOID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), NUMERICOID, ECPG_ARRAY_NONE, stmt->lineno))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
}
|
||||
|
||||
for (cache_entry = (stmt->connection->cache_head); cache_entry != NULL; cache_entry = cache_entry->next)
|
||||
@ -271,13 +271,13 @@ ecpg_is_type_an_array(int type, const struct statement *stmt, const struct varia
|
||||
|
||||
array_query = (char *) ecpg_alloc(strlen("select typlen from pg_type where oid= and typelem<>0") + 11, stmt->lineno);
|
||||
if (array_query == NULL)
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
|
||||
sprintf(array_query, "select typlen from pg_type where oid=%d and typelem<>0", type);
|
||||
query = PQexec(stmt->connection->connection, array_query);
|
||||
ecpg_free(array_query);
|
||||
if (!ecpg_check_PQresult(query, stmt->lineno, stmt->connection->connection, stmt->compat))
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
else if (PQresultStatus(query) == PGRES_TUPLES_OK)
|
||||
{
|
||||
if (PQntuples(query) == 0)
|
||||
@ -297,7 +297,7 @@ ecpg_is_type_an_array(int type, const struct statement *stmt, const struct varia
|
||||
PQclear(query);
|
||||
}
|
||||
else
|
||||
return (ECPG_ARRAY_ERROR);
|
||||
return ECPG_ARRAY_ERROR;
|
||||
|
||||
ecpg_type_infocache_push(&(stmt->connection->cache_head), type, isarray, stmt->lineno);
|
||||
ecpg_log("ecpg_is_type_an_array on line %d: type (%d); C (%d); array (%s)\n", stmt->lineno, type, var->type, ECPG_IS_ARRAY(isarray) ? "yes" : "no");
|
||||
@ -1486,7 +1486,7 @@ ecpg_process_output(struct statement *stmt, bool clear_result)
|
||||
{
|
||||
ecpg_raise(stmt->lineno, ECPG_OUT_OF_MEMORY,
|
||||
ECPG_SQLSTATE_ECPG_OUT_OF_MEMORY, NULL);
|
||||
return (false);
|
||||
return false;
|
||||
}
|
||||
|
||||
var = stmt->outlist;
|
||||
@ -1654,7 +1654,7 @@ ecpg_process_output(struct statement *stmt, bool clear_result)
|
||||
else if (!INFORMIX_MODE(stmt->compat))
|
||||
{
|
||||
ecpg_raise(stmt->lineno, ECPG_TOO_FEW_ARGUMENTS, ECPG_SQLSTATE_USING_CLAUSE_DOES_NOT_MATCH_TARGETS, NULL);
|
||||
return (false);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1830,7 +1830,7 @@ ecpg_do_prologue(int lineno, const int compat, const int force_indicator,
|
||||
{
|
||||
ecpg_raise(lineno, ECPG_INVALID_STMT, ECPG_SQLSTATE_INVALID_SQL_STATEMENT_NAME, stmt->command);
|
||||
ecpg_do_epilogue(stmt);
|
||||
return (false);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user