diff options
| author | Peter Geoghegan | 2022-09-20 21:08:57 +0000 |
|---|---|---|
| committer | Peter Geoghegan | 2022-09-20 21:08:57 +0000 |
| commit | eccb607e19993483e25966abae895277599f77a2 (patch) | |
| tree | cf156ef5b2ed0d1959456469b3c3267b75c1380d | |
| parent | a601366a460f68472bf70c4d94c57baa0a3ed1b2 (diff) | |
Fix recent cpluspluscheck issue in selfuncs.h.
Fix selfuncs.h cpluspluscheck complaint, without reintroducing a
parameter name inconsistency (restore the original declaration names,
and then make corresponding function definitions consistent with that).
Oversight in commit a601366a.
Author: Peter Geoghegan <[email protected]>
Reported-By: Andres Freund <[email protected]>
| -rw-r--r-- | src/backend/utils/adt/selfuncs.c | 6 | ||||
| -rw-r--r-- | src/include/utils/selfuncs.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index c746759eef..1808388397 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -290,7 +290,7 @@ eqsel_internal(PG_FUNCTION_ARGS, bool negate) * This is exported so that some other estimation functions can use it. */ double -var_eq_const(VariableStatData *vardata, Oid operator, Oid collation, +var_eq_const(VariableStatData *vardata, Oid oproid, Oid collation, Datum constval, bool constisnull, bool varonleft, bool negate) { @@ -331,7 +331,7 @@ var_eq_const(VariableStatData *vardata, Oid operator, Oid collation, } else if (HeapTupleIsValid(vardata->statsTuple) && statistic_proc_security_check(vardata, - (opfuncoid = get_opcode(operator)))) + (opfuncoid = get_opcode(oproid)))) { AttStatsSlot sslot; bool match = false; @@ -461,7 +461,7 @@ var_eq_const(VariableStatData *vardata, Oid operator, Oid collation, * This is exported so that some other estimation functions can use it. */ double -var_eq_non_const(VariableStatData *vardata, Oid operator, Oid collation, +var_eq_non_const(VariableStatData *vardata, Oid oproid, Oid collation, Node *other, bool varonleft, bool negate) { diff --git a/src/include/utils/selfuncs.h b/src/include/utils/selfuncs.h index 49af4ed2ed..d485b9bfcd 100644 --- a/src/include/utils/selfuncs.h +++ b/src/include/utils/selfuncs.h @@ -181,11 +181,11 @@ extern double ineq_histogram_selectivity(PlannerInfo *root, Oid collation, Datum constval, Oid consttype); extern double var_eq_const(VariableStatData *vardata, - Oid operator, Oid collation, + Oid oproid, Oid collation, Datum constval, bool constisnull, bool varonleft, bool negate); extern double var_eq_non_const(VariableStatData *vardata, - Oid operator, Oid collation, + Oid oproid, Oid collation, Node *other, bool varonleft, bool negate); |