diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/bloom/blinsert.c | 2 | ||||
| -rw-r--r-- | contrib/file_fdw/file_fdw.c | 8 | ||||
| -rw-r--r-- | contrib/hstore/hstore.h | 6 | ||||
| -rw-r--r-- | contrib/postgres_fdw/deparse.c | 2 | ||||
| -rw-r--r-- | contrib/postgres_fdw/postgres_fdw.c | 11 |
5 files changed, 10 insertions, 19 deletions
diff --git a/contrib/bloom/blinsert.c b/contrib/bloom/blinsert.c index e64291e049a..dd26d6ac29a 100644 --- a/contrib/bloom/blinsert.c +++ b/contrib/bloom/blinsert.c @@ -232,8 +232,6 @@ blinsert(Relation index, Datum *values, bool *isnull, if (metaData->nEnd > metaData->nStart) { - Page page; - blkno = metaData->notFullPage[metaData->nStart]; Assert(blkno != InvalidBlockNumber); diff --git a/contrib/file_fdw/file_fdw.c b/contrib/file_fdw/file_fdw.c index de0b9a109c2..67821cd25b3 100644 --- a/contrib/file_fdw/file_fdw.c +++ b/contrib/file_fdw/file_fdw.c @@ -450,15 +450,15 @@ get_file_fdw_attribute_options(Oid relid) for (attnum = 1; attnum <= natts; attnum++) { Form_pg_attribute attr = TupleDescAttr(tupleDesc, attnum - 1); - List *options; + List *column_options; ListCell *lc; /* Skip dropped attributes. */ if (attr->attisdropped) continue; - options = GetForeignColumnOptions(relid, attnum); - foreach(lc, options) + column_options = GetForeignColumnOptions(relid, attnum); + foreach(lc, column_options) { DefElem *def = (DefElem *) lfirst(lc); @@ -480,7 +480,7 @@ get_file_fdw_attribute_options(Oid relid) fncolumns = lappend(fncolumns, makeString(attname)); } } - /* maybe in future handle other options here */ + /* maybe in future handle other column options here */ } } diff --git a/contrib/hstore/hstore.h b/contrib/hstore/hstore.h index 4713e6ea7ab..897af244a42 100644 --- a/contrib/hstore/hstore.h +++ b/contrib/hstore/hstore.h @@ -128,15 +128,15 @@ typedef struct /* finalize a newly-constructed hstore */ #define HS_FINALIZE(hsp_,count_,buf_,ptr_) \ do { \ - int buflen = (ptr_) - (buf_); \ + int _buflen = (ptr_) - (buf_); \ if ((count_)) \ ARRPTR(hsp_)[0].entry |= HENTRY_ISFIRST; \ if ((count_) != HS_COUNT((hsp_))) \ { \ HS_SETCOUNT((hsp_),(count_)); \ - memmove(STRPTR(hsp_), (buf_), buflen); \ + memmove(STRPTR(hsp_), (buf_), _buflen); \ } \ - SET_VARSIZE((hsp_), CALCDATASIZE((count_), buflen)); \ + SET_VARSIZE((hsp_), CALCDATASIZE((count_), _buflen)); \ } while (0) /* ensure the varlena size of an existing hstore is correct */ diff --git a/contrib/postgres_fdw/deparse.c b/contrib/postgres_fdw/deparse.c index 09f37fb77a8..95247656504 100644 --- a/contrib/postgres_fdw/deparse.c +++ b/contrib/postgres_fdw/deparse.c @@ -943,8 +943,6 @@ foreign_expr_walker(Node *node, */ if (agg->aggorder) { - ListCell *lc; - foreach(lc, agg->aggorder) { SortGroupClause *srt = (SortGroupClause *) lfirst(lc); diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c index dd858aba034..8d013f5b1af 100644 --- a/contrib/postgres_fdw/postgres_fdw.c +++ b/contrib/postgres_fdw/postgres_fdw.c @@ -1341,8 +1341,6 @@ postgresGetForeignPlan(PlannerInfo *root, */ if (outer_plan) { - ListCell *lc; - /* * Right now, we only consider grouping and aggregation beyond * joins. Queries involving aggregates or grouping do not require @@ -6272,10 +6270,10 @@ foreign_grouping_ok(PlannerInfo *root, RelOptInfo *grouped_rel, */ foreach(l, aggvars) { - Expr *expr = (Expr *) lfirst(l); + Expr *aggref = (Expr *) lfirst(l); - if (IsA(expr, Aggref)) - tlist = add_to_flat_tlist(tlist, list_make1(expr)); + if (IsA(aggref, Aggref)) + tlist = add_to_flat_tlist(tlist, list_make1(aggref)); } } } @@ -6289,8 +6287,6 @@ foreign_grouping_ok(PlannerInfo *root, RelOptInfo *grouped_rel, */ if (havingQual) { - ListCell *lc; - foreach(lc, (List *) havingQual) { Expr *expr = (Expr *) lfirst(lc); @@ -6324,7 +6320,6 @@ foreign_grouping_ok(PlannerInfo *root, RelOptInfo *grouped_rel, if (fpinfo->local_conds) { List *aggvars = NIL; - ListCell *lc; foreach(lc, fpinfo->local_conds) { |