Commit bdf43db

author

Marina Polyakova

committed

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.

1 parent 52bff1b commit bdf43dbCopy full SHA for bdf43db

File tree

-9

lines changed

-9

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2970,7 +2970,7 @@ Datum vops_import(PG_FUNCTION_ARGS)`
`2970`	`2970`	`text* t = DatumGetTextP(val);`
`2971`	`2971`	`int elem_size = types[i].len;`
`2972`	`2972`	`int len = VARSIZE(t) - VARHDRSZ;`
`2973`		`- chardst = (char)(tile + 1);`
	`2973`	`+ dst = (char*)(tile + 1);`
`2974`	`2974`	`if (len < elem_size) {`
`2975`	`2975`	`memcpy(dst + j*elem_size, VARDATA(t), len);`
`2976`	`2976`	`memset(dst + j*elem_size + len, 0, elem_size - len);`

Lines changed: 6 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1215,10 +1215,11 @@ foreign_grouping_ok(PlannerInfo root, RelOptInfo grouped_rel)`
`1215`	`1215`	`*/`
`1216`	`1216`	`foreach(l, aggvars)`
`1217`	`1217`	`{`
`1218`		`- Expr expr = (Expr ) lfirst(l);`
	`1218`	`+ Expr current_expr = (Expr ) lfirst(l);`
`1219`	`1219`
`1220`		`- if (IsA(expr, Aggref))`
`1221`		`- tlist = add_to_flat_tlist(tlist, list_make1(expr));`
	`1220`	`+ if (IsA(current_expr, Aggref))`
	`1221`	`+ tlist = add_to_flat_tlist(tlist,`
	`1222`	`+ list_make1(current_expr));`
`1222`	`1223`	`}`
`1223`	`1224`	`}`
`1224`	`1225`	`}`
`@@ -1240,8 +1241,6 @@ foreign_grouping_ok(PlannerInfo root, RelOptInfo grouped_rel)`
`1240`	`1241`	`*/`
`1241`	`1242`	`if (root->hasHavingQual && query->havingQual)`
`1242`	`1243`	`{`
`1243`		`- ListCell *lc;`
`1244`		`-`
`1245`	`1244`	`foreach(lc, (List *) query->havingQual)`
`1246`	`1245`	`{`
`1247`	`1246`	`Expr expr = (Expr ) lfirst(lc);`
`@@ -1259,9 +1258,8 @@ foreign_grouping_ok(PlannerInfo root, RelOptInfo grouped_rel)`
`1259`	`1258`	`*/`
`1260`	`1259`	`if (fpinfo->local_conds)`
`1261`	`1260`	`{`
`1262`		`- ListCell *lc;`
`1263`		`- List aggvars = pull_var_clause((Node ) fpinfo->local_conds,`
`1264`		`- PVC_INCLUDE_AGGREGATES);`
	`1261`	`+ aggvars = pull_var_clause((Node *) fpinfo->local_conds,`
	`1262`	`+ PVC_INCLUDE_AGGREGATES);`
`1265`	`1263`
`1266`	`1264`	`foreach(lc, aggvars)`
`1267`	`1265`	`{`

Comments

(0)