Commit370b3a4

committed

pgcrypto: Code cleanup for decrypt_internal.

Remove some unnecessary null-tests, and replace a goto-label constructwith an "if" block.Michael Paquier, reviewed by me.

1 parentc31b5d9 commit370b3a4Copy full SHA for 370b3a4

File tree

+10

-20

lines changed

+10

-20

lines changed

Lines changed: 10 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -575,35 +575,25 @@ decrypt_internal(int is_pubenc, int need_text, text *data,`
`575`	`575`	`err=pgp_set_symkey(ctx, (uint8*)VARDATA(key),`
`576`	`576`	`VARSIZE(key)-VARHDRSZ);`
`577`	`577`
`578`		`-/*`
`579`		`- * decrypt`
`580`		`- */`
	`578`	`+/* decrypt */`
`581`	`579`	`if (err >=0)`
	`580`	`+{`
`582`	`581`	`err=pgp_decrypt(ctx,src,dst);`
`583`	`582`
`584`		`-/*`
`585`		`- * failed?`
`586`		`- */`
`587`		`-if (err<0)`
`588`		`-gotoout;`
`589`		`-`
`590`		`-if (ex.expect)`
`591`		`-check_expect(ctx,&ex);`
	`583`	`+if (ex.expect)`
	`584`	`+check_expect(ctx,&ex);`
`592`	`585`
`593`		`-/* remember the setting */`
`594`		`-got_unicode=pgp_get_unicode_mode(ctx);`
	`586`	`+/* remember the setting */`
	`587`	`+got_unicode=pgp_get_unicode_mode(ctx);`
	`588`	`+}`
`595`	`589`
`596`		`-out:`
`597`		`-if (src)`
`598`		`-mbuf_free(src);`
`599`		`-if (ctx)`
`600`		`-pgp_free(ctx);`
	`590`	`+mbuf_free(src);`
	`591`	`+pgp_free(ctx);`
`601`	`592`
`602`	`593`	`if (err)`
`603`	`594`	`{`
`604`	`595`	`px_set_debug_handler(NULL);`
`605`		`-if (dst)`
`606`		`-mbuf_free(dst);`
	`596`	`+mbuf_free(dst);`
`607`	`597`	`ereport(ERROR,`
`608`	`598`	`(errcode(ERRCODE_EXTERNAL_ROUTINE_INVOCATION_EXCEPTION),`
`609`	`599`	`errmsg("%s",px_strerror(err))));`

Comments

(0)