diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2012-03-21 23:30:14 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2012-03-21 23:33:10 +0200 |
| commit | 0e85abd658738db9ea183c133c89c3c94ee37dae (patch) | |
| tree | 54ef3bd66cfb7ccee3bc3f1989a21706703a48da /src/backend/executor | |
| parent | 621eb156f159d4979193939902f49ea597972a7d (diff) | |
| download | postgresql-0e85abd658738db9ea183c133c89c3c94ee37dae.tar.gz postgresql-0e85abd658738db9ea183c133c89c3c94ee37dae.zip | |
Clean up compiler warnings from unused variables with asserts disabled
For those variables only used when asserts are enabled, use a new
macro PG_USED_FOR_ASSERTS_ONLY, which expands to
__attribute__((unused)) when asserts are not enabled.
Diffstat (limited to 'src/backend/executor')
| -rw-r--r-- | src/backend/executor/execCurrent.c | 2 | ||||
| -rw-r--r-- | src/backend/executor/nodeMaterial.c | 2 | ||||
| -rw-r--r-- | src/backend/executor/nodeSetOp.c | 2 | ||||
| -rw-r--r-- | src/backend/executor/nodeWorktablescan.c | 4 |
4 files changed, 4 insertions, 6 deletions
diff --git a/src/backend/executor/execCurrent.c b/src/backend/executor/execCurrent.c index b07161fba43..03790bbe066 100644 --- a/src/backend/executor/execCurrent.c +++ b/src/backend/executor/execCurrent.c @@ -151,7 +151,7 @@ execCurrentOf(CurrentOfExpr *cexpr, { ScanState *scanstate; bool lisnull; - Oid tuple_tableoid; + Oid tuple_tableoid PG_USED_FOR_ASSERTS_ONLY; ItemPointer tuple_tid; /* diff --git a/src/backend/executor/nodeMaterial.c b/src/backend/executor/nodeMaterial.c index b320b545aa1..06137c6ba80 100644 --- a/src/backend/executor/nodeMaterial.c +++ b/src/backend/executor/nodeMaterial.c @@ -66,7 +66,7 @@ ExecMaterial(MaterialState *node) * Allocate a second read pointer to serve as the mark. We know it * must have index 1, so needn't store that. */ - int ptrno; + int ptrno PG_USED_FOR_ASSERTS_ONLY; ptrno = tuplestore_alloc_read_pointer(tuplestorestate, node->eflags); diff --git a/src/backend/executor/nodeSetOp.c b/src/backend/executor/nodeSetOp.c index 7fa5730b10b..85590445ccc 100644 --- a/src/backend/executor/nodeSetOp.c +++ b/src/backend/executor/nodeSetOp.c @@ -344,7 +344,7 @@ setop_fill_hash_table(SetOpState *setopstate) SetOp *node = (SetOp *) setopstate->ps.plan; PlanState *outerPlan; int firstFlag; - bool in_first_rel; + bool in_first_rel PG_USED_FOR_ASSERTS_ONLY; /* * get state info from node diff --git a/src/backend/executor/nodeWorktablescan.c b/src/backend/executor/nodeWorktablescan.c index e2f3dd4d2e2..9ada6809f93 100644 --- a/src/backend/executor/nodeWorktablescan.c +++ b/src/backend/executor/nodeWorktablescan.c @@ -30,7 +30,6 @@ static TupleTableSlot * WorkTableScanNext(WorkTableScanState *node) { TupleTableSlot *slot; - EState *estate; Tuplestorestate *tuplestorestate; /* @@ -48,8 +47,7 @@ WorkTableScanNext(WorkTableScanState *node) * worktable. Therefore, we don't need a private read pointer for the * tuplestore, nor do we need to tell tuplestore_gettupleslot to copy. */ - estate = node->ss.ps.state; - Assert(ScanDirectionIsForward(estate->es_direction)); + Assert(ScanDirectionIsForward(node->ss.ps.state->es_direction)); tuplestorestate = node->rustate->working_table; |