[libvirt] [PATCH v1 36/40] util: iscsi: use VIR_AUTOPTR for aggregate types
Erik Skultety
eskultet at redhat.com
Wed Jul 25 11:37:44 UTC 2018
On Sat, Jul 21, 2018 at 05:37:08PM +0530, Sukrit Bhatnagar wrote:
> By making use of GNU C's cleanup attribute handled by the
> VIR_AUTOPTR macro for declaring aggregate pointer variables,
> majority of the calls to *Free functions can be dropped, which
> in turn leads to getting rid of most of our cleanup sections.
>
> Signed-off-by: Sukrit Bhatnagar <skrtbhtngr at gmail.com>
> ---
> src/util/viriscsi.c | 68 +++++++++++++++++------------------------------------
> 1 file changed, 22 insertions(+), 46 deletions(-)
>
> diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c
> index 13fd02c..a3367bc 100644
> --- a/src/util/viriscsi.c
> +++ b/src/util/viriscsi.c
> @@ -83,7 +83,7 @@ virISCSIGetSession(const char *devpath,
> VIR_AUTOFREE(char *) error = NULL;
> int exitstatus = 0;
>
> - virCommandPtr cmd = virCommandNewArgList(ISCSIADM, "--mode",
> + VIR_AUTOPTR(virCommand) cmd = virCommandNewArgList(ISCSIADM, "--mode",
> "session", NULL);
> virCommandSetErrorBuffer(cmd, &error);
>
> @@ -93,15 +93,13 @@ virISCSIGetSession(const char *devpath,
> vars,
> virISCSIExtractSession,
> &cbdata, NULL, &exitstatus) < 0)
> - goto cleanup;
> + return cbdata.session;
I'd prefer you returned NULL explicitly to avoid any confusion.
With that:
Reviewed-by: Erik Skultety <eskultet at redhat.com>
More information about the libvir-list
mailing list