database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-19 13:42:17 +03:00
Code Activity

Remove useless casts to (void *)

Browse Source 
Many of them just seem to have been copied around for no real reason.
Their presence causes (small) risks of hiding actual type mismatches
or silently discarding qualifiers

Discussion: https://www.postgresql.org/message-id/flat/461ea37c-8b58-43b4-9736-52884e862820@eisentraut.org
This commit is contained in:
Peter Eisentraut
2024-11-28 08:19:22 +01:00
parent 97525bc5c8
commit 7f798aca1d
158 changed files with 491 additions and 550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/backend/optimizer/util/appendinfo.c
View File

@@ -425,7 +425,7 @@ adjust_appendrel_attrs_mutator(Node *node,
phv = (PlaceHolderVar *) expression_tree_mutator(node,
adjust_appendrel_attrs_mutator,
(void *) context);
context);
/* now fix PlaceHolderVar's relid sets */
if (phv->phlevelsup == 0)
{
@@ -509,8 +509,7 @@ adjust_appendrel_attrs_mutator(Node *node,
Assert(!IsA(node, RangeTblRef));
Assert(!IsA(node, JoinExpr));
return expression_tree_mutator(node, adjust_appendrel_attrs_mutator,
(void *) context);
return expression_tree_mutator(node, adjust_appendrel_attrs_mutator, context);
}
/*

29
src/backend/optimizer/util/clauses.c
View File

@@ -265,8 +265,7 @@ find_window_functions_walker(Node *node, WindowFuncLists *lists)
return false;
}
Assert(!IsA(node, SubLink));
return expression_tree_walker(node, find_window_functions_walker,
(void *) lists);
return expression_tree_walker(node, find_window_functions_walker, lists);
}
@@ -1217,7 +1216,7 @@ contain_context_dependent_node_walker(Node *node, int *flags)
*flags |= CCDN_CASETESTEXPR_OK;
res = expression_tree_walker(node,
contain_context_dependent_node_walker,
(void *) flags);
flags);
*flags = save_flags;
return res;
}
@@ -1241,7 +1240,7 @@ contain_context_dependent_node_walker(Node *node, int *flags)
return res;
}
return expression_tree_walker(node, contain_context_dependent_node_walker,
(void *) flags);
flags);
}
/*****************************************************************************
@@ -2416,7 +2415,7 @@ estimate_expression_value(PlannerInfo *root, Node *node)
*/
#define ece_generic_processing(node) \
expression_tree_mutator((Node *) (node), eval_const_expressions_mutator, \
(void *) context)
context)
/*
* Check whether all arguments of the given node were reduced to Consts.
@@ -2552,7 +2551,7 @@ eval_const_expressions_mutator(Node *node,
args = (List *)
expression_tree_mutator((Node *) args,
eval_const_expressions_mutator,
(void *) context);
context);
/* ... and the filter expression, which isn't */
aggfilter = (Expr *)
eval_const_expressions_mutator((Node *) expr->aggfilter,
@@ -2697,7 +2696,7 @@ eval_const_expressions_mutator(Node *node,
*/
args = (List *) expression_tree_mutator((Node *) expr->args,
eval_const_expressions_mutator,
(void *) context);
context);
/*
* We must do our own check for NULLs because DistinctExpr has
@@ -4094,7 +4093,7 @@ simplify_function(Oid funcid, Oid result_type, int32 result_typmod,
args = expand_function_arguments(args, false, result_type, func_tuple);
args = (List *) expression_tree_mutator((Node *) args,
eval_const_expressions_mutator,
(void *) context);
context);
/* Argument processing done, give it back to the caller */
*args_p = args;
}
@@ -4636,7 +4635,7 @@ inline_function(Oid funcid, Oid result_type, Oid result_collid,
callback_arg.prosrc = src;
sqlerrcontext.callback = sql_inline_error_callback;
sqlerrcontext.arg = (void *) &callback_arg;
sqlerrcontext.arg = &callback_arg;
sqlerrcontext.previous = error_context_stack;
error_context_stack = &sqlerrcontext;
@@ -4938,8 +4937,7 @@ substitute_actual_parameters_mutator(Node *node,
/* We don't need to copy at this time (it'll get done later) */
return list_nth(context->args, param->paramid - 1);
}
return expression_tree_mutator(node, substitute_actual_parameters_mutator,
(void *) context);
return expression_tree_mutator(node, substitute_actual_parameters_mutator, context);
}
/*
@@ -5190,7 +5188,7 @@ inline_set_returning_function(PlannerInfo *root, RangeTblEntry *rte)
callback_arg.prosrc = src;
sqlerrcontext.callback = sql_inline_error_callback;
sqlerrcontext.arg = (void *) &callback_arg;
sqlerrcontext.arg = &callback_arg;
sqlerrcontext.previous = error_context_stack;
error_context_stack = &sqlerrcontext;
@@ -5382,7 +5380,7 @@ substitute_actual_srf_parameters_mutator(Node *node,
context->sublevels_up++;
result = (Node *) query_tree_mutator((Query *) node,
substitute_actual_srf_parameters_mutator,
(void *) context,
context,
0);
context->sublevels_up--;
return result;
@@ -5407,7 +5405,7 @@ substitute_actual_srf_parameters_mutator(Node *node,
}
return expression_tree_mutator(node,
substitute_actual_srf_parameters_mutator,
(void *) context);
context);
}
/*
@@ -5436,6 +5434,5 @@ pull_paramids_walker(Node *node, Bitmapset **context)
*context = bms_add_member(*context, param->paramid);
return false;
}
return expression_tree_walker(node, pull_paramids_walker,
(void *) context);
return expression_tree_walker(node, pull_paramids_walker, context);
}

10
src/backend/optimizer/util/predtest.c
View File

@@ -908,7 +908,7 @@ static void
list_startup_fn(Node *clause, PredIterInfo info)
{
info->state_list = (List *) clause;
info->state = (void *) list_head(info->state_list);
info->state = list_head(info->state_list);
}
static Node *
@@ -920,7 +920,7 @@ list_next_fn(PredIterInfo info)
if (l == NULL)
return NULL;
n = lfirst(l);
info->state = (void *) lnext(info->state_list, l);
info->state = lnext(info->state_list, l);
return n;
}
@@ -938,7 +938,7 @@ static void
boolexpr_startup_fn(Node *clause, PredIterInfo info)
{
info->state_list = ((BoolExpr *) clause)->args;
info->state = (void *) list_head(info->state_list);
info->state = list_head(info->state_list);
}
/*
@@ -968,7 +968,7 @@ arrayconst_startup_fn(Node *clause, PredIterInfo info)
/* Create working state struct */
state = (ArrayConstIterState *) palloc(sizeof(ArrayConstIterState));
info->state = (void *) state;
info->state = state;
/* Deconstruct the array literal */
arrayconst = (Const *) lsecond(saop->args);
@@ -1047,7 +1047,7 @@ arrayexpr_startup_fn(Node *clause, PredIterInfo info)
/* Create working state struct */
state = (ArrayExprIterState *) palloc(sizeof(ArrayExprIterState));
info->state = (void *) state;
info->state = state;
/* Set up a dummy OpExpr to return as the per-item node */
state->opexpr.xpr.type = T_OpExpr;

6
src/backend/optimizer/util/tlist.c
View File

@@ -1139,8 +1139,7 @@ split_pathtarget_walker(Node *node, split_pathtarget_context *context)
context->current_depth = 0;
context->current_sgref = 0; /* subexpressions are not sortgroup items */
(void) expression_tree_walker(node, split_pathtarget_walker,
(void *) context);
(void) expression_tree_walker(node, split_pathtarget_walker, context);
/* Depth is one more than any SRF below it */
srf_depth = context->current_depth + 1;
@@ -1181,8 +1180,7 @@ split_pathtarget_walker(Node *node, split_pathtarget_context *context)
* examine its inputs.
*/
context->current_sgref = 0; /* subexpressions are not sortgroup items */
return expression_tree_walker(node, split_pathtarget_walker,
(void *) context);
return expression_tree_walker(node, split_pathtarget_walker, context);
}
/*

45
src/backend/optimizer/util/var.c
View File

@@ -124,7 +124,7 @@ pull_varnos(PlannerInfo *root, Node *node)
*/
query_or_expression_tree_walker(node,
pull_varnos_walker,
(void *) &context,
&context,
0);
return context.varnos;
@@ -150,7 +150,7 @@ pull_varnos_of_level(PlannerInfo *root, Node *node, int levelsup)
*/
query_or_expression_tree_walker(node,
pull_varnos_walker,
(void *) &context,
&context,
0);
return context.varnos;
@@ -269,12 +269,11 @@ pull_varnos_walker(Node *node, pull_varnos_context *context)
context->sublevels_up++;
result = query_tree_walker((Query *) node, pull_varnos_walker,
(void *) context, 0);
context, 0);
context->sublevels_up--;
return result;
}
return expression_tree_walker(node, pull_varnos_walker,
(void *) context);
return expression_tree_walker(node, pull_varnos_walker, context);
}
@@ -324,8 +323,7 @@ pull_varattnos_walker(Node *node, pull_varattnos_context *context)
/* Should not find an unplanned subquery */
Assert(!IsA(node, Query));
return expression_tree_walker(node, pull_varattnos_walker,
(void *) context);
return expression_tree_walker(node, pull_varattnos_walker, context);
}
@@ -350,7 +348,7 @@ pull_vars_of_level(Node *node, int levelsup)
*/
query_or_expression_tree_walker(node,
pull_vars_walker,
(void *) &context,
&context,
0);
return context.vars;
@@ -385,12 +383,11 @@ pull_vars_walker(Node *node, pull_vars_context *context)
context->sublevels_up++;
result = query_tree_walker((Query *) node, pull_vars_walker,
(void *) context, 0);
context, 0);
context->sublevels_up--;
return result;
}
return expression_tree_walker(node, pull_vars_walker,
(void *) context);
return expression_tree_walker(node, pull_vars_walker, context);
}
@@ -449,7 +446,7 @@ contain_vars_of_level(Node *node, int levelsup)
return query_or_expression_tree_walker(node,
contain_vars_of_level_walker,
(void *) &sublevels_up,
&sublevels_up,
0);
}
@@ -484,14 +481,14 @@ contain_vars_of_level_walker(Node *node, int *sublevels_up)
(*sublevels_up)++;
result = query_tree_walker((Query *) node,
contain_vars_of_level_walker,
(void *) sublevels_up,
sublevels_up,
0);
(*sublevels_up)--;
return result;
}
return expression_tree_walker(node,
contain_vars_of_level_walker,
(void *) sublevels_up);
sublevels_up);
}
@@ -520,7 +517,7 @@ locate_var_of_level(Node *node, int levelsup)
(void) query_or_expression_tree_walker(node,
locate_var_of_level_walker,
(void *) &context,
&context,
0);
return context.var_location;
@@ -558,14 +555,14 @@ locate_var_of_level_walker(Node *node,
context->sublevels_up++;
result = query_tree_walker((Query *) node,
locate_var_of_level_walker,
(void *) context,
context,
0);
context->sublevels_up--;
return result;
}
return expression_tree_walker(node,
locate_var_of_level_walker,
(void *) context);
context);
}
@@ -707,8 +704,7 @@ pull_var_clause_walker(Node *node, pull_var_clause_context *context)
else
elog(ERROR, "PlaceHolderVar found where not expected");
}
return expression_tree_walker(node, pull_var_clause_walker,
(void *) context);
return expression_tree_walker(node, pull_var_clause_walker, context);
}
@@ -867,7 +863,7 @@ flatten_join_alias_vars_mutator(Node *node,
phv = (PlaceHolderVar *) expression_tree_mutator(node,
flatten_join_alias_vars_mutator,
(void *) context);
context);
/* now fix PlaceHolderVar's relid sets */
if (phv->phlevelsup == context->sublevels_up)
{
@@ -889,7 +885,7 @@ flatten_join_alias_vars_mutator(Node *node,
context->inserted_sublink = ((Query *) node)->hasSubLinks;
newnode = query_tree_mutator((Query *) node,
flatten_join_alias_vars_mutator,
(void *) context,
context,
QTW_IGNORE_JOINALIASES);
newnode->hasSubLinks |= context->inserted_sublink;
context->inserted_sublink = save_inserted_sublink;
@@ -904,8 +900,7 @@ flatten_join_alias_vars_mutator(Node *node,
Assert(!IsA(node, PlaceHolderInfo));
Assert(!IsA(node, MinMaxAggInfo));
return expression_tree_mutator(node, flatten_join_alias_vars_mutator,
(void *) context);
return expression_tree_mutator(node, flatten_join_alias_vars_mutator, context);
}
/*
@@ -1044,7 +1039,7 @@ flatten_group_exprs_mutator(Node *node,
context->inserted_sublink = ((Query *) node)->hasSubLinks;
newnode = query_tree_mutator((Query *) node,
flatten_group_exprs_mutator,
(void *) context,
context,
QTW_IGNORE_GROUPEXPRS);
newnode->hasSubLinks |= context->inserted_sublink;
context->inserted_sublink = save_inserted_sublink;
@@ -1053,7 +1048,7 @@ flatten_group_exprs_mutator(Node *node,
}
return expression_tree_mutator(node, flatten_group_exprs_mutator,
(void *) context);
context);
}
/*