Commit8ea91ba

Neil Conway

committed

Minor code clarity improvement: AFAICS, estate.eval_econtext must be

non-NULL during the guts of plpgsql_exec_trigger() andplpgsql_exec_function(). Therefore, we can remove the NULL check,per discussion on -patches.

1 parentce8fd39 commit8ea91baCopy full SHA for 8ea91ba

File tree

-5

lines changed

-5

lines changed

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`* procedural language`
`4`	`4`	`*`
`5`	`5`	`* IDENTIFICATION`
`6`		`- * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.159 2006/01/03 22:48:10 tgl Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.160 2006/01/10 18:50:43 neilc Exp $`
`7`	`7`	`*`
`8`	`8`	`* This software is copyrighted by Jan Wieck - Hamburg.`
`9`	`9`	`*`
`@@ -414,8 +414,7 @@ plpgsql_exec_function(PLpgSQL_function *func, FunctionCallInfo fcinfo)`
`414`	`414`	`}`
`415`	`415`
`416`	`416`	`/* Clean up any leftover temporary memory */`
`417`		`-if (estate.eval_econtext!=NULL)`
`418`		`-FreeExprContext(estate.eval_econtext);`
	`417`	`+FreeExprContext(estate.eval_econtext);`
`419`	`418`	`estate.eval_econtext=NULL;`
`420`	`419`	`exec_eval_cleanup(&estate);`
`421`	`420`
`@@ -646,8 +645,7 @@ plpgsql_exec_trigger(PLpgSQL_function *func,`
`646`	`645`	`}`
`647`	`646`
`648`	`647`	`/* Clean up any leftover temporary memory */`
`649`		`-if (estate.eval_econtext!=NULL)`
`650`		`-FreeExprContext(estate.eval_econtext);`
	`648`	`+FreeExprContext(estate.eval_econtext);`
`651`	`649`	`estate.eval_econtext=NULL;`
`652`	`650`	`exec_eval_cleanup(&estate);`
`653`	`651`

Comments

(0)