From bdf43db38441c8834d2c31a90513db120a6797a3 Mon Sep 17 00:00:00 2001 From: Marina Polyakova Date: Wed, 23 Nov 2022 22:20:29 +0300 Subject: [PATCH] Fix compiler warnings due to new checks in PostgreSQL 16 See the commit 0fe954c28584169938e5c0738cfaa9930ce77577 (Add -Wshadow=compatible-local to the standard compilation flags) in PostgreSQL 16. --- vops.c | 2 +- vops_fdw.c | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/vops.c b/vops.c index 23cea99..fc63ad4 100644 --- a/vops.c +++ b/vops.c @@ -2970,7 +2970,7 @@ Datum vops_import(PG_FUNCTION_ARGS) text* t = DatumGetTextP(val); int elem_size = types[i].len; int len = VARSIZE(t) - VARHDRSZ; - char* dst = (char*)(tile + 1); + dst = (char*)(tile + 1); if (len < elem_size) { memcpy(dst + j*elem_size, VARDATA(t), len); memset(dst + j*elem_size + len, 0, elem_size - len); diff --git a/vops_fdw.c b/vops_fdw.c index ea12f23..d41c8c9 100644 --- a/vops_fdw.c +++ b/vops_fdw.c @@ -1215,10 +1215,11 @@ foreign_grouping_ok(PlannerInfo *root, RelOptInfo *grouped_rel) */ foreach(l, aggvars) { - Expr *expr = (Expr *) lfirst(l); + Expr *current_expr = (Expr *) lfirst(l); - if (IsA(expr, Aggref)) - tlist = add_to_flat_tlist(tlist, list_make1(expr)); + if (IsA(current_expr, Aggref)) + tlist = add_to_flat_tlist(tlist, + list_make1(current_expr)); } } } @@ -1240,8 +1241,6 @@ foreign_grouping_ok(PlannerInfo *root, RelOptInfo *grouped_rel) */ if (root->hasHavingQual && query->havingQual) { - ListCell *lc; - foreach(lc, (List *) query->havingQual) { Expr *expr = (Expr *) lfirst(lc); @@ -1259,9 +1258,8 @@ foreign_grouping_ok(PlannerInfo *root, RelOptInfo *grouped_rel) */ if (fpinfo->local_conds) { - ListCell *lc; - List *aggvars = pull_var_clause((Node *) fpinfo->local_conds, - PVC_INCLUDE_AGGREGATES); + aggvars = pull_var_clause((Node *) fpinfo->local_conds, + PVC_INCLUDE_AGGREGATES); foreach(lc, aggvars) {