NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitc7f5c58

committed

PL/Python: Fix remaining scan-build warnings

Apparently, scan-build thinks that proc->is_setof can change duringPLy_exec_function(). To make it clearer, save the value in a localvariable.Also add an assertion to clear another warning.Reviewed-by: John Naylor <jcnaylor@gmail.com>

1 parentcdddd5d commitc7f5c58Copy full SHA for c7f5c58

File tree

1 file changed

-2

lines changed

src/pl/plpython
- plpy_exec.c

1 file changed

-2

lines changed

`‎src/pl/plpython/plpy_exec.c`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ static void PLy_abort_open_subtransactions(int save_subxact_level);`
`57`	`57`	`Datum`
`58`	`58`	`PLy_exec_function(FunctionCallInfofcinfo,PLyProcedure*proc)`
`59`	`59`	`{`
	`60`	`+boolis_setof=proc->is_setof;`
`60`	`61`	`Datumrv;`
`61`	`62`	`PyObject*volatileplargs=NULL;`
`62`	`63`	`PyObject*volatileplrv=NULL;`
`@@ -73,7 +74,7 @@ PLy_exec_function(FunctionCallInfo fcinfo, PLyProcedure *proc)`
`73`	`74`
`74`	`75`	`PG_TRY();`
`75`	`76`	`{`
`76`		`-if (proc->is_setof)`
	`77`	`+if (is_setof)`
`77`	`78`	`{`
`78`	`79`	`/* First Call setup */`
`79`	`80`	`if (SRF_IS_FIRSTCALL())`
`@@ -93,6 +94,7 @@ PLy_exec_function(FunctionCallInfo fcinfo, PLyProcedure *proc)`
`93`	`94`	`funcctx=SRF_PERCALL_SETUP();`
`94`	`95`	`Assert(funcctx!=NULL);`
`95`	`96`	`srfstate= (PLySRFState*)funcctx->user_fctx;`
	`97`	`+Assert(srfstate!=NULL);`
`96`	`98`	`}`
`97`	`99`
`98`	`100`	`if (srfstate==NULL\|\|srfstate->iter==NULL)`
`@@ -125,7 +127,7 @@ PLy_exec_function(FunctionCallInfo fcinfo, PLyProcedure *proc)`
`125`	`127`	`* We stay in the SPI context while doing this, because PyIter_Next()`
`126`	`128`	`* calls back into Python code which might contain SPI calls.`
`127`	`129`	`*/`
`128`		`-if (proc->is_setof)`
	`130`	`+if (is_setof)`
`129`	`131`	`{`
`130`	`132`	`if (srfstate->iter==NULL)`
`131`	`133`	`{`

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!

Commitc7f5c58

File tree

1 file changed

1 file changed

`‎src/pl/plpython/plpy_exec.c`

0 commit comments