NotificationsYou must be signed in to change notification settings
Fork5k
Star17.9k

Commitd092d11

committed

Oops, have to rename local variables called 'errcontext' in contrib, too.

As pointed out by Alvaro.

1 parentdbdf967 commitd092d11Copy full SHA for d092d11

File tree

1 file changed

+12

-12

lines changed

contrib/file_fdw
- file_fdw.c

1 file changed

+12

-12

lines changed

`‎contrib/file_fdw/file_fdw.c`

Lines changed: 12 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -614,13 +614,13 @@ fileIterateForeignScan(ForeignScanState *node)`
`614`	`614`	`FileFdwExecutionStatefestate= (FileFdwExecutionState)node->fdw_state;`
`615`	`615`	`TupleTableSlot*slot=node->ss.ss_ScanTupleSlot;`
`616`	`616`	`boolfound;`
`617`		`-ErrorContextCallbackerrcontext;`
	`617`	`+ErrorContextCallbackerrcallback;`
`618`	`618`
`619`	`619`	`/* Set up callback to identify error line number. */`
`620`		`-errcontext.callback=CopyFromErrorCallback;`
`621`		`-errcontext.arg= (void*)festate->cstate;`
`622`		`-errcontext.previous=error_context_stack;`
`623`		`-error_context_stack=&errcontext;`
	`620`	`+errcallback.callback=CopyFromErrorCallback;`
	`621`	`+errcallback.arg= (void*)festate->cstate;`
	`622`	`+errcallback.previous=error_context_stack;`
	`623`	`+error_context_stack=&errcallback;`
`624`	`624`
`625`	`625`	`/*`
`626`	`626`	`* The protocol for loading a virtual tuple into a slot is first`
`@@ -642,7 +642,7 @@ fileIterateForeignScan(ForeignScanState *node)`
`642`	`642`	`ExecStoreVirtualTuple(slot);`
`643`	`643`
`644`	`644`	`/* Remove error callback. */`
`645`		`-error_context_stack=errcontext.previous;`
	`645`	`+error_context_stack=errcallback.previous;`
`646`	`646`
`647`	`647`	`returnslot;`
`648`	`648`	`}`
`@@ -976,7 +976,7 @@ file_acquire_sample_rows(Relation onerel, int elevel,`
`976`	`976`	`char*filename;`
`977`	`977`	`List*options;`
`978`	`978`	`CopyStatecstate;`
`979`		`-ErrorContextCallbackerrcontext;`
	`979`	`+ErrorContextCallbackerrcallback;`
`980`	`980`	`MemoryContextoldcontext=CurrentMemoryContext;`
`981`	`981`	`MemoryContexttupcontext;`
`982`	`982`
`@@ -1009,10 +1009,10 @@ file_acquire_sample_rows(Relation onerel, int elevel,`
`1009`	`1009`	`rstate=anl_init_selection_state(targrows);`
`1010`	`1010`
`1011`	`1011`	`/* Set up callback to identify error line number. */`
`1012`		`-errcontext.callback=CopyFromErrorCallback;`
`1013`		`-errcontext.arg= (void*)cstate;`
`1014`		`-errcontext.previous=error_context_stack;`
`1015`		`-error_context_stack=&errcontext;`
	`1012`	`+errcallback.callback=CopyFromErrorCallback;`
	`1013`	`+errcallback.arg= (void*)cstate;`
	`1014`	`+errcallback.previous=error_context_stack;`
	`1015`	`+error_context_stack=&errcallback;`
`1016`	`1016`
`1017`	`1017`	`*totalrows=0;`
`1018`	`1018`	`*totaldeadrows=0;`
`@@ -1072,7 +1072,7 @@ file_acquire_sample_rows(Relation onerel, int elevel,`
`1072`	`1072`	`}`
`1073`	`1073`
`1074`	`1074`	`/* Remove error callback. */`
`1075`		`-error_context_stack=errcontext.previous;`
	`1075`	`+error_context_stack=errcallback.previous;`
`1076`	`1076`
`1077`	`1077`	`/* Clean up. */`
`1078`	`1078`	`MemoryContextDelete(tupcontext);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitd092d11

File tree

1 file changed

1 file changed

`‎contrib/file_fdw/file_fdw.c`

0 commit comments