diff options
| author | Peter Eisentraut | 2017-09-07 16:06:23 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2017-09-07 17:56:09 +0000 |
| commit | 1356f78ea93395c107cbc75dc923e29a0efccd8a (patch) | |
| tree | a06cc9e40efdf8382692fb79b5b22c3920f93b5f /src/include | |
| parent | 9d71323daca412e6e175595e1e42809fb5e1172d (diff) | |
Reduce excessive dereferencing of function pointers
It is equivalent in ANSI C to write (*funcptr) () and funcptr(). These
two styles have been applied inconsistently. After discussion, we'll
use the more verbose style for plain function pointer variables, to make
it clear that it's a variable, and the shorter style when the function
pointer is in a struct (s.func() or s->func()), because then it's clear
that it's not a plain function name, and otherwise the excessive
punctuation makes some of those invocations hard to read.
Discussion: https://www.postgresql.org/message-id/f52c16db-14ed-757d-4b48-7ef360b1631d@2ndquadrant.com
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/executor/executor.h | 4 | ||||
| -rw-r--r-- | src/include/utils/selfuncs.h | 2 | ||||
| -rw-r--r-- | src/include/utils/sortsupport.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index ad228d1394b..770881849cf 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -287,7 +287,7 @@ ExecEvalExpr(ExprState *state, ExprContext *econtext, bool *isNull) { - return (*state->evalfunc) (state, econtext, isNull); + return state->evalfunc(state, econtext, isNull); } #endif @@ -306,7 +306,7 @@ ExecEvalExprSwitchContext(ExprState *state, MemoryContext oldContext; oldContext = MemoryContextSwitchTo(econtext->ecxt_per_tuple_memory); - retDatum = (*state->evalfunc) (state, econtext, isNull); + retDatum = state->evalfunc(state, econtext, isNull); MemoryContextSwitchTo(oldContext); return retDatum; } diff --git a/src/include/utils/selfuncs.h b/src/include/utils/selfuncs.h index dc6069d4355..199a6317f5e 100644 --- a/src/include/utils/selfuncs.h +++ b/src/include/utils/selfuncs.h @@ -81,7 +81,7 @@ typedef struct VariableStatData #define ReleaseVariableStats(vardata) \ do { \ if (HeapTupleIsValid((vardata).statsTuple)) \ - (* (vardata).freefunc) ((vardata).statsTuple); \ + (vardata).freefunc((vardata).statsTuple); \ } while(0) diff --git a/src/include/utils/sortsupport.h b/src/include/utils/sortsupport.h index 6e8444b4fff..a98420c37ef 100644 --- a/src/include/utils/sortsupport.h +++ b/src/include/utils/sortsupport.h @@ -222,7 +222,7 @@ ApplySortComparator(Datum datum1, bool isNull1, } else { - compare = (*ssup->comparator) (datum1, datum2, ssup); + compare = ssup->comparator(datum1, datum2, ssup); if (ssup->ssup_reverse) compare = -compare; } @@ -260,7 +260,7 @@ ApplySortAbbrevFullComparator(Datum datum1, bool isNull1, } else { - compare = (*ssup->abbrev_full_comparator) (datum1, datum2, ssup); + compare = ssup->abbrev_full_comparator(datum1, datum2, ssup); if (ssup->ssup_reverse) compare = -compare; } |