diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2017-03-09 15:18:59 -0500 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2017-03-28 21:59:23 -0400 |
| commit | 4cb824699e12c39fad97fb3d9085ced0d14c067c (patch) | |
| tree | 9a835d8efb7739e6436d3fc24b4b5a290b95df7d /src/backend/optimizer/plan/subselect.c | |
| parent | 66b764341ba12206f01e2600713bdc3abdb070b3 (diff) | |
Cast result of copyObject() to correct type
copyObject() is declared to return void *, which allows easily assigning
the result independent of the input, but it loses all type checking.
If the compiler supports typeof or something similar, cast the result to
the input type. This creates a greater amount of type safety. In some
cases, where the result is assigned to a generic type such as Node * or
Expr *, new casts are now necessary, but in general casts are now
unnecessary in the normal case and indicate that something unusual is
happening.
Reviewed-by: Mark Dilger <hornschnorter@gmail.com>
Diffstat (limited to 'src/backend/optimizer/plan/subselect.c')
| -rw-r--r-- | src/backend/optimizer/plan/subselect.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c index 6fa65406624..db0e5b31e2e 100644 --- a/src/backend/optimizer/plan/subselect.c +++ b/src/backend/optimizer/plan/subselect.c @@ -125,7 +125,7 @@ assign_param_for_var(PlannerInfo *root, Var *var) } /* Nope, so make a new one */ - var = (Var *) copyObject(var); + var = copyObject(var); var->varlevelsup = 0; pitem = makeNode(PlannerParamItem); @@ -224,7 +224,7 @@ assign_param_for_placeholdervar(PlannerInfo *root, PlaceHolderVar *phv) } /* Nope, so make a new one */ - phv = (PlaceHolderVar *) copyObject(phv); + phv = copyObject(phv); if (phv->phlevelsup != 0) { IncrementVarSublevelsUp((Node *) phv, -((int) phv->phlevelsup), 0); @@ -316,7 +316,7 @@ replace_outer_agg(PlannerInfo *root, Aggref *agg) * It does not seem worthwhile to try to match duplicate outer aggs. Just * make a new slot every time. */ - agg = (Aggref *) copyObject(agg); + agg = copyObject(agg); IncrementVarSublevelsUp((Node *) agg, -((int) agg->agglevelsup), 0); Assert(agg->agglevelsup == 0); @@ -358,7 +358,7 @@ replace_outer_grouping(PlannerInfo *root, GroupingFunc *grp) * It does not seem worthwhile to try to match duplicate outer aggs. Just * make a new slot every time. */ - grp = (GroupingFunc *) copyObject(grp); + grp = copyObject(grp); IncrementVarSublevelsUp((Node *) grp, -((int) grp->agglevelsup), 0); Assert(grp->agglevelsup == 0); @@ -491,7 +491,7 @@ make_subplan(PlannerInfo *root, Query *orig_subquery, * same sub-Query node, but the planner wants to scribble on the Query. * Try to clean this up when we do querytree redesign... */ - subquery = (Query *) copyObject(orig_subquery); + subquery = copyObject(orig_subquery); /* * If it's an EXISTS subplan, we might be able to simplify it. @@ -568,7 +568,7 @@ make_subplan(PlannerInfo *root, Query *orig_subquery, List *paramIds; /* Make a second copy of the original subquery */ - subquery = (Query *) copyObject(orig_subquery); + subquery = copyObject(orig_subquery); /* and re-simplify */ simple_exists = simplify_EXISTS_query(root, subquery); Assert(simple_exists); @@ -1431,7 +1431,7 @@ convert_EXISTS_sublink_to_join(PlannerInfo *root, SubLink *sublink, * Copy the subquery so we can modify it safely (see comments in * make_subplan). */ - subselect = (Query *) copyObject(subselect); + subselect = copyObject(subselect); /* * See if the subquery can be simplified based on the knowledge that it's |