diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2012-11-12 18:30:51 +0200 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2012-11-12 18:30:51 +0200 |
| commit | d092d116ed047ebb923ada112235a8866571731c (patch) | |
| tree | 700ee1db8950dd0fbd6e01a0d4948a64dd790036 | |
| parent | dbdf9679d7d61b03a3bf73af9b095831b7010eb5 (diff) | |
| download | postgresql-d092d116ed047ebb923ada112235a8866571731c.tar.gz postgresql-d092d116ed047ebb923ada112235a8866571731c.zip | |
Oops, have to rename local variables called 'errcontext' in contrib, too.
As pointed out by Alvaro.
| -rw-r--r-- | contrib/file_fdw/file_fdw.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/contrib/file_fdw/file_fdw.c b/contrib/file_fdw/file_fdw.c index 81fc4e29008..7ab3ed603ae 100644 --- a/contrib/file_fdw/file_fdw.c +++ b/contrib/file_fdw/file_fdw.c @@ -614,13 +614,13 @@ fileIterateForeignScan(ForeignScanState *node) FileFdwExecutionState *festate = (FileFdwExecutionState *) node->fdw_state; TupleTableSlot *slot = node->ss.ss_ScanTupleSlot; bool found; - ErrorContextCallback errcontext; + ErrorContextCallback errcallback; /* Set up callback to identify error line number. */ - errcontext.callback = CopyFromErrorCallback; - errcontext.arg = (void *) festate->cstate; - errcontext.previous = error_context_stack; - error_context_stack = &errcontext; + errcallback.callback = CopyFromErrorCallback; + errcallback.arg = (void *) festate->cstate; + errcallback.previous = error_context_stack; + error_context_stack = &errcallback; /* * The protocol for loading a virtual tuple into a slot is first @@ -642,7 +642,7 @@ fileIterateForeignScan(ForeignScanState *node) ExecStoreVirtualTuple(slot); /* Remove error callback. */ - error_context_stack = errcontext.previous; + error_context_stack = errcallback.previous; return slot; } @@ -976,7 +976,7 @@ file_acquire_sample_rows(Relation onerel, int elevel, char *filename; List *options; CopyState cstate; - ErrorContextCallback errcontext; + ErrorContextCallback errcallback; MemoryContext oldcontext = CurrentMemoryContext; MemoryContext tupcontext; @@ -1009,10 +1009,10 @@ file_acquire_sample_rows(Relation onerel, int elevel, rstate = anl_init_selection_state(targrows); /* Set up callback to identify error line number. */ - errcontext.callback = CopyFromErrorCallback; - errcontext.arg = (void *) cstate; - errcontext.previous = error_context_stack; - error_context_stack = &errcontext; + errcallback.callback = CopyFromErrorCallback; + errcallback.arg = (void *) cstate; + errcallback.previous = error_context_stack; + error_context_stack = &errcallback; *totalrows = 0; *totaldeadrows = 0; @@ -1072,7 +1072,7 @@ file_acquire_sample_rows(Relation onerel, int elevel, } /* Remove error callback. */ - error_context_stack = errcontext.previous; + error_context_stack = errcallback.previous; /* Clean up. */ MemoryContextDelete(tupcontext); |