diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index 058610af9b..efd7201d61 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -753,7 +753,7 @@ ExplainPrintPlan(ExplainState *es, QueryDesc *queryDesc) * further down in the plan tree. */ ps = queryDesc->planstate; - if (IsA(ps, GatherState) &&((Gather *) ps->plan)->invisible) + if (IsA(ps, GatherState) && ((Gather *) ps->plan)->invisible) { ps = outerPlanState(ps); es->hide_workers = true; @@ -2256,7 +2256,7 @@ show_scan_qual(List *qual, const char *qlabel, { bool useprefix; - useprefix = (IsA(planstate->plan, SubqueryScan) ||es->verbose); + useprefix = (IsA(planstate->plan, SubqueryScan) || es->verbose); show_qual(qual, qlabel, planstate, ancestors, useprefix, es); } diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 8d2ed986d1..8801af589c 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -11136,7 +11136,7 @@ ATColumnChangeRequiresRewrite(Node *expr, AttrNumber varattno) for (;;) { /* only one varno, so no need to check that */ - if (IsA(expr, Var) &&((Var *) expr)->varattno == varattno) + if (IsA(expr, Var) && ((Var *) expr)->varattno == varattno) return false; else if (IsA(expr, RelabelType)) expr = (Node *) ((RelabelType *) expr)->arg; diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c index 8891b1d564..9e5938b10e 100644 --- a/src/backend/commands/typecmds.c +++ b/src/backend/commands/typecmds.c @@ -2176,7 +2176,7 @@ AlterDomainDefault(List *names, Node *defaultRaw) * DefineDomain.) */ if (defaultExpr == NULL || - (IsA(defaultExpr, Const) &&((Const *) defaultExpr)->constisnull)) + (IsA(defaultExpr, Const) && ((Const *) defaultExpr)->constisnull)) { /* Default is NULL, drop it */ defaultExpr = NULL; diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index 8553db0dd0..26111327ca 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -1410,7 +1410,7 @@ find_unaggregated_cols_walker(Node *node, Bitmapset **colnos) *colnos = bms_add_member(*colnos, var->varattno); return false; } - if (IsA(node, Aggref) ||IsA(node, GroupingFunc)) + if (IsA(node, Aggref) || IsA(node, GroupingFunc)) { /* do not descend into aggregate exprs */ return false; diff --git a/src/backend/executor/nodeProjectSet.c b/src/backend/executor/nodeProjectSet.c index 4a1b060fde..e8da6eaec9 100644 --- a/src/backend/executor/nodeProjectSet.c +++ b/src/backend/executor/nodeProjectSet.c @@ -277,8 +277,8 @@ ExecInitProjectSet(ProjectSet *node, EState *estate, int eflags) TargetEntry *te = (TargetEntry *) lfirst(lc); Expr *expr = te->expr; - if ((IsA(expr, FuncExpr) &&((FuncExpr *) expr)->funcretset) || - (IsA(expr, OpExpr) &&((OpExpr *) expr)->opretset)) + if ((IsA(expr, FuncExpr) && ((FuncExpr *) expr)->funcretset) || + (IsA(expr, OpExpr) && ((OpExpr *) expr)->opretset)) { state->elems[off] = (Node *) ExecInitFunctionResultSet(expr, state->ps.ps_ExprContext, diff --git a/src/backend/libpq/be-secure-openssl.c b/src/backend/libpq/be-secure-openssl.c index 7e15778da5..78a865d23b 100644 --- a/src/backend/libpq/be-secure-openssl.c +++ b/src/backend/libpq/be-secure-openssl.c @@ -80,7 +80,7 @@ static int ssl_protocol_version_to_openssl(int v); int be_tls_init(bool isServerStart) { - STACK_OF(X509_NAME) *root_cert_list = NULL; + STACK_OF(X509_NAME) * root_cert_list = NULL; SSL_CTX *context; int ssl_ver_min = -1; int ssl_ver_max = -1; diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c index bb1565467d..ebf3ce37aa 100644 --- a/src/backend/nodes/outfuncs.c +++ b/src/backend/nodes/outfuncs.c @@ -3682,7 +3682,7 @@ outNode(StringInfo str, const void *obj) if (obj == NULL) appendStringInfoString(str, "<>"); - else if (IsA(obj, List) ||IsA(obj, IntList) || IsA(obj, OidList)) + else if (IsA(obj, List) || IsA(obj, IntList) || IsA(obj, OidList)) _outList(str, obj); else if (IsA(obj, Integer) || IsA(obj, Float) || diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c index f4d4a4df66..b976afb69d 100644 --- a/src/backend/optimizer/path/costsize.c +++ b/src/backend/optimizer/path/costsize.c @@ -3257,7 +3257,7 @@ final_cost_mergejoin(PlannerInfo *root, MergePath *path, * The whole issue is moot if we are working from a unique-ified outer * input, or if we know we don't need to mark/restore at all. */ - if (IsA(outer_path, UniquePath) ||path->skip_mark_restore) + if (IsA(outer_path, UniquePath) || path->skip_mark_restore) rescannedtuples = 0; else { diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c index 2b676bf406..baefe0e946 100644 --- a/src/backend/optimizer/plan/setrefs.c +++ b/src/backend/optimizer/plan/setrefs.c @@ -1960,7 +1960,7 @@ set_upper_references(PlannerInfo *root, Plan *plan, int rtoffset) static void set_param_references(PlannerInfo *root, Plan *plan) { - Assert(IsA(plan, Gather) ||IsA(plan, GatherMerge)); + Assert(IsA(plan, Gather) || IsA(plan, GatherMerge)); if (plan->lefttree->extParam) { diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c index d09bc6d291..e845a4b1ae 100644 --- a/src/backend/optimizer/util/pathnode.c +++ b/src/backend/optimizer/util/pathnode.c @@ -2639,7 +2639,7 @@ apply_projection_to_path(PlannerInfo *root, * workers can help project. But if there is something that is not * parallel-safe in the target expressions, then we can't. */ - if ((IsA(path, GatherPath) ||IsA(path, GatherMergePath)) && + if ((IsA(path, GatherPath) || IsA(path, GatherMergePath)) && is_parallel_safe(root, (Node *) target->exprs)) { /* diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c index eee9c33637..401da5dedf 100644 --- a/src/backend/parser/analyze.c +++ b/src/backend/parser/analyze.c @@ -221,7 +221,7 @@ transformOptionalSelectInto(ParseState *pstate, Node *parseTree) /* If it's a set-operation tree, drill down to leftmost SelectStmt */ while (stmt && stmt->op != SETOP_NONE) stmt = stmt->larg; - Assert(stmt && IsA(stmt, SelectStmt) &&stmt->larg == NULL); + Assert(stmt && IsA(stmt, SelectStmt) && stmt->larg == NULL); if (stmt->intoClause) { @@ -641,7 +641,7 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt) if (tle->resjunk) continue; if (tle->expr && - (IsA(tle->expr, Const) ||IsA(tle->expr, Param)) && + (IsA(tle->expr, Const) || IsA(tle->expr, Param)) && exprType((Node *) tle->expr) == UNKNOWNOID) expr = tle->expr; else diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c index f1cc5479e4..f813b587f1 100644 --- a/src/backend/parser/parse_agg.c +++ b/src/backend/parser/parse_agg.c @@ -750,8 +750,8 @@ check_agg_arguments_walker(Node *node, */ if (context->sublevels_up == 0) { - if ((IsA(node, FuncExpr) &&((FuncExpr *) node)->funcretset) || - (IsA(node, OpExpr) &&((OpExpr *) node)->opretset)) + if ((IsA(node, FuncExpr) && ((FuncExpr *) node)->funcretset) || + (IsA(node, OpExpr) && ((OpExpr *) node)->opretset)) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("aggregate function calls cannot contain set-returning function calls"), diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index 96ae3a7e64..6fff13479e 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -1767,7 +1767,7 @@ transformLimitClause(ParseState *pstate, Node *clause, * unadorned NULL that's not accepted back by the grammar. */ if (exprKind == EXPR_KIND_LIMIT && limitOption == LIMIT_OPTION_WITH_TIES && - IsA(clause, A_Const) &&((A_Const *) clause)->val.type == T_Null) + IsA(clause, A_Const) && ((A_Const *) clause)->val.type == T_Null) ereport(ERROR, (errcode(ERRCODE_INVALID_ROW_COUNT_IN_LIMIT_CLAUSE), errmsg("row count cannot be NULL in FETCH FIRST ... WITH TIES clause"))); diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c index 831db4af95..f69976cc8c 100644 --- a/src/backend/parser/parse_expr.c +++ b/src/backend/parser/parse_expr.c @@ -961,7 +961,7 @@ transformAExprOp(ParseState *pstate, A_Expr *a) list_length(a->name) == 1 && strcmp(strVal(linitial(a->name)), "=") == 0 && (exprIsNullConstant(lexpr) || exprIsNullConstant(rexpr)) && - (!IsA(lexpr, CaseTestExpr) &&!IsA(rexpr, CaseTestExpr))) + (!IsA(lexpr, CaseTestExpr) && !IsA(rexpr, CaseTestExpr))) { NullTest *n = makeNode(NullTest); diff --git a/src/backend/statistics/extended_stats.c b/src/backend/statistics/extended_stats.c index c7e16f2f21..ab6f1e1c9d 100644 --- a/src/backend/statistics/extended_stats.c +++ b/src/backend/statistics/extended_stats.c @@ -1479,13 +1479,13 @@ examine_clause_args(List *args, Var **varp, Const **cstp, bool *varonleftp) if (IsA(rightop, RelabelType)) rightop = (Node *) ((RelabelType *) rightop)->arg; - if (IsA(leftop, Var) &&IsA(rightop, Const)) + if (IsA(leftop, Var) && IsA(rightop, Const)) { var = (Var *) leftop; cst = (Const *) rightop; varonleft = true; } - else if (IsA(leftop, Const) &&IsA(rightop, Var)) + else if (IsA(leftop, Const) && IsA(rightop, Var)) { var = (Var *) rightop; cst = (Const *) leftop; diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 7a965973cd..1914138a24 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -4471,7 +4471,7 @@ TemporalSimplify(int32 max_precis, Node *node) typmod = (Node *) lsecond(expr->args); - if (IsA(typmod, Const) &&!((Const *) typmod)->constisnull) + if (IsA(typmod, Const) && !((Const *) typmod)->constisnull) { Node *source = (Node *) linitial(expr->args); int32 old_precis = exprTypmod(source); diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c index aab5802edb..16768b28c3 100644 --- a/src/backend/utils/adt/formatting.c +++ b/src/backend/utils/adt/formatting.c @@ -5025,7 +5025,7 @@ NUM_prepare_locale(NUMProc *Np) if (lconv->thousands_sep && *lconv->thousands_sep) Np->L_thousands_sep = lconv->thousands_sep; /* Make sure thousands separator doesn't match decimal point symbol. */ - else if (strcmp(Np->decimal, ",") !=0) + else if (strcmp(Np->decimal, ",") != 0) Np->L_thousands_sep = ","; else Np->L_thousands_sep = "."; diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c index 9986132b45..f3a725271e 100644 --- a/src/backend/utils/adt/numeric.c +++ b/src/backend/utils/adt/numeric.c @@ -911,7 +911,7 @@ numeric_support(PG_FUNCTION_ARGS) typmod = (Node *) lsecond(expr->args); - if (IsA(typmod, Const) &&!((Const *) typmod)->constisnull) + if (IsA(typmod, Const) && !((Const *) typmod)->constisnull) { Node *source = (Node *) linitial(expr->args); int32 old_typmod = exprTypmod(source); diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 723a8fa48c..076c3c019f 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -5829,8 +5829,8 @@ get_rule_sortgroupclause(Index ref, List *tlist, bool force_colno, */ bool need_paren = (PRETTY_PAREN(context) || IsA(expr, FuncExpr) - ||IsA(expr, Aggref) - ||IsA(expr, WindowFunc)); + || IsA(expr, Aggref) + || IsA(expr, WindowFunc)); if (need_paren) appendStringInfoChar(context->buf, '('); @@ -10317,7 +10317,7 @@ get_from_clause_item(Node *jtnode, Query *query, deparse_context *context) need_paren_on_right = PRETTY_PAREN(context) && !IsA(j->rarg, RangeTblRef) && - !(IsA(j->rarg, JoinExpr) &&((JoinExpr *) j->rarg)->alias != NULL); + !(IsA(j->rarg, JoinExpr) && ((JoinExpr *) j->rarg)->alias != NULL); if (!PRETTY_PAREN(context) || j->alias != NULL) appendStringInfoChar(buf, '('); diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c index 876605573c..7ea97d0c8e 100644 --- a/src/backend/utils/adt/timestamp.c +++ b/src/backend/utils/adt/timestamp.c @@ -1263,7 +1263,7 @@ interval_support(PG_FUNCTION_ARGS) typmod = (Node *) lsecond(expr->args); - if (IsA(typmod, Const) &&!((Const *) typmod)->constisnull) + if (IsA(typmod, Const) && !((Const *) typmod)->constisnull) { Node *source = (Node *) linitial(expr->args); int32 new_typmod = DatumGetInt32(((Const *) typmod)->constvalue); diff --git a/src/backend/utils/adt/varbit.c b/src/backend/utils/adt/varbit.c index c3257553bd..f0c6a44b84 100644 --- a/src/backend/utils/adt/varbit.c +++ b/src/backend/utils/adt/varbit.c @@ -713,7 +713,7 @@ varbit_support(PG_FUNCTION_ARGS) typmod = (Node *) lsecond(expr->args); - if (IsA(typmod, Const) &&!((Const *) typmod)->constisnull) + if (IsA(typmod, Const) && !((Const *) typmod)->constisnull) { Node *source = (Node *) linitial(expr->args); int32 new_typmod = DatumGetInt32(((Const *) typmod)->constvalue); diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c index 39acfdff6c..b595ab9569 100644 --- a/src/backend/utils/adt/varchar.c +++ b/src/backend/utils/adt/varchar.c @@ -572,7 +572,7 @@ varchar_support(PG_FUNCTION_ARGS) typmod = (Node *) lsecond(expr->args); - if (IsA(typmod, Const) &&!((Const *) typmod)->constisnull) + if (IsA(typmod, Const) && !((Const *) typmod)->constisnull) { Node *source = (Node *) linitial(expr->args); int32 old_typmod = exprTypmod(source); diff --git a/src/bin/pg_dump/pg_backup_directory.c b/src/bin/pg_dump/pg_backup_directory.c index f178d6ac21..ac81151acc 100644 --- a/src/bin/pg_dump/pg_backup_directory.c +++ b/src/bin/pg_dump/pg_backup_directory.c @@ -396,7 +396,7 @@ _PrintFileData(ArchiveHandle *AH, char *filename) } free(buf); - if (cfclose(cfp) !=0) + if (cfclose(cfp) != 0) fatal("could not close data file \"%s\": %m", filename); } diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c index 1e931a56cb..eb018854a5 100644 --- a/src/bin/psql/tab-complete.c +++ b/src/bin/psql/tab-complete.c @@ -4191,7 +4191,7 @@ _complete_from_query(const char *simple_query, */ if (strcmp(schema_query->catname, "pg_catalog.pg_class c") == 0 && - strncmp(text, "pg_", 3) !=0) + strncmp(text, "pg_", 3) != 0) { appendPQExpBufferStr(&query_buffer, " AND c.relnamespace <> (SELECT oid FROM" diff --git a/src/common/jsonapi.c b/src/common/jsonapi.c index aa917d0fc9..9326f80536 100644 --- a/src/common/jsonapi.c +++ b/src/common/jsonapi.c @@ -129,7 +129,7 @@ IsValidJsonNumber(const char *str, int len) */ if (*str == '-') { - dummy_lex.input = unconstify(char *, str) +1; + dummy_lex.input = unconstify(char *, str) + 1; dummy_lex.input_length = len - 1; } else diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c index 59e8e3a825..6961d7c75b 100644 --- a/src/interfaces/ecpg/ecpglib/execute.c +++ b/src/interfaces/ecpg/ecpglib/execute.c @@ -132,7 +132,7 @@ next_insert(char *text, int pos, bool questionmarks, bool std_strings) for (i = p + 1; isdigit((unsigned char) text[i]); i++) /* empty loop body */ ; if (!isalpha((unsigned char) text[i]) && - isascii((unsigned char) text[i]) &&text[i] != '_') + isascii((unsigned char) text[i]) && text[i] != '_') /* not dollar delimited quote */ return p; } diff --git a/src/interfaces/ecpg/ecpglib/prepare.c b/src/interfaces/ecpg/ecpglib/prepare.c index b9653c01fe..ea1146f520 100644 --- a/src/interfaces/ecpg/ecpglib/prepare.c +++ b/src/interfaces/ecpg/ecpglib/prepare.c @@ -132,7 +132,7 @@ replace_variables(char **text, int lineno) for (len = 1; (*text)[ptr + len] && isvarchar((*text)[ptr + len]); len++) /* skip */ ; - if (!(newcopy = (char *) ecpg_alloc(strlen(*text) -len + strlen(buffer) + 1, lineno))) + if (!(newcopy = (char *) ecpg_alloc(strlen(*text) - len + strlen(buffer) + 1, lineno))) { ecpg_free(buffer); return false; diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c index df1ac209f9..34634da1ed 100644 --- a/src/interfaces/libpq/fe-secure-openssl.c +++ b/src/interfaces/libpq/fe-secure-openssl.c @@ -513,7 +513,7 @@ pgtls_verify_peer_name_matches_certificate_guts(PGconn *conn, int *names_examined, char **first_name) { - STACK_OF(GENERAL_NAME) *peer_san; + STACK_OF(GENERAL_NAME) * peer_san; int i; int rc = 0; diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c index aeb6c8fefc..9a87cd70f1 100644 --- a/src/pl/plpgsql/src/pl_exec.c +++ b/src/pl/plpgsql/src/pl_exec.c @@ -8164,8 +8164,8 @@ exec_save_simple_expr(PLpgSQL_expr *expr, CachedPlan *cplan) if (IsA(tle_expr, Const)) break; /* Otherwise, it had better be a Param or an outer Var */ - Assert(IsA(tle_expr, Param) ||(IsA(tle_expr, Var) && - ((Var *) tle_expr)->varno == OUTER_VAR)); + Assert(IsA(tle_expr, Param) || (IsA(tle_expr, Var) && + ((Var *) tle_expr)->varno == OUTER_VAR)); /* Descend to the child node */ plan = plan->lefttree; } diff --git a/src/timezone/localtime.c b/src/timezone/localtime.c index 333f27300a..787f0b69d6 100644 --- a/src/timezone/localtime.c +++ b/src/timezone/localtime.c @@ -138,7 +138,7 @@ detzcode(const char *const codep) * Do two's-complement negation even on non-two's-complement machines. * If the result would be minval - 1, return minval. */ - result -= !TWOS_COMPLEMENT(int32) &&result != 0; + result -= !TWOS_COMPLEMENT(int32) && result != 0; result += minval; } return result; @@ -152,7 +152,7 @@ detzcode64(const char *const codep) int64 one = 1; int64 halfmaxval = one << (64 - 2); int64 maxval = halfmaxval - 1 + halfmaxval; - int64 minval = -TWOS_COMPLEMENT(int64) -maxval; + int64 minval = -TWOS_COMPLEMENT(int64) - maxval; result = codep[0] & 0x7f; for (i = 1; i < 8; ++i) @@ -164,7 +164,7 @@ detzcode64(const char *const codep) * Do two's-complement negation even on non-two's-complement machines. * If the result would be minval - 1, return minval. */ - result -= !TWOS_COMPLEMENT(int64) &&result != 0; + result -= !TWOS_COMPLEMENT(int64) && result != 0; result += minval; } return result; @@ -173,7 +173,7 @@ detzcode64(const char *const codep) static bool differ_by_repeat(const pg_time_t t1, const pg_time_t t0) { - if (TYPE_BIT(pg_time_t) -TYPE_SIGNED(pg_time_t)