src/admin/libvirt-admin.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
From: GAURAV AGRAWAL <agrawalgaurav@gnome.org>
Signed-off-by: Gaurav Agrawal <agrawalgaurav@gnome.org>
---
src/admin/libvirt-admin.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/admin/libvirt-admin.c b/src/admin/libvirt-admin.c
index 4099a54854..17d0eb39fe 100644
--- a/src/admin/libvirt-admin.c
+++ b/src/admin/libvirt-admin.c
@@ -111,7 +111,7 @@ getSocketPath(virURIPtr uri)
virURIParamPtr param = &uri->params[i];
if (STREQ(param->name, "socket")) {
- VIR_FREE(sock_path);
+ g_free(sock_path);
sock_path = g_strdup(param->value);
} else {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@@ -203,11 +203,11 @@ virAdmGetDefaultURI(virConfPtr conf, char **uristr)
virAdmConnectPtr
virAdmConnectOpen(const char *name, unsigned int flags)
{
- char *sock_path = NULL;
+ g_autofree char *sock_path = NULL;
char *alias = NULL;
virAdmConnectPtr conn = NULL;
g_autoptr(virConf) conf = NULL;
- char *uristr = NULL;
+ g_autofree char *uristr = NULL;
if (virAdmInitialize() < 0)
goto error;
@@ -233,7 +233,7 @@ virAdmConnectOpen(const char *name, unsigned int flags)
goto error;
if (alias) {
- VIR_FREE(uristr);
+ g_free(uristr);
uristr = alias;
}
@@ -251,16 +251,11 @@ virAdmConnectOpen(const char *name, unsigned int flags)
if (remoteAdminConnectOpen(conn, flags) < 0)
goto error;
- cleanup:
- VIR_FREE(sock_path);
- VIR_FREE(uristr);
return conn;
error:
virDispatchError(NULL);
- virObjectUnref(conn);
- conn = NULL;
- goto cleanup;
+ return NULL;
}
/**
--
2.24.1
On Fri, Feb 28, 2020 at 11:46:40PM +0530, Gaurav Agrawal wrote: > From: GAURAV AGRAWAL <agrawalgaurav@gnome.org> > > Signed-off-by: Gaurav Agrawal <agrawalgaurav@gnome.org> > --- > src/admin/libvirt-admin.c | 15 +++++---------- > 1 file changed, 5 insertions(+), 10 deletions(-) > > diff --git a/src/admin/libvirt-admin.c b/src/admin/libvirt-admin.c > index 4099a54854..17d0eb39fe 100644 > --- a/src/admin/libvirt-admin.c > +++ b/src/admin/libvirt-admin.c > @@ -111,7 +111,7 @@ getSocketPath(virURIPtr uri) > virURIParamPtr param = &uri->params[i]; > > if (STREQ(param->name, "socket")) { > - VIR_FREE(sock_path); > + g_free(sock_path); > sock_path = g_strdup(param->value); > } else { > virReportError(VIR_ERR_CONFIG_UNSUPPORTED, > @@ -203,11 +203,11 @@ virAdmGetDefaultURI(virConfPtr conf, char **uristr) > virAdmConnectPtr > virAdmConnectOpen(const char *name, unsigned int flags) > { > - char *sock_path = NULL; > + g_autofree char *sock_path = NULL; > char *alias = NULL; > virAdmConnectPtr conn = NULL; > g_autoptr(virConf) conf = NULL; > - char *uristr = NULL; > + g_autofree char *uristr = NULL; > > if (virAdmInitialize() < 0) > goto error; > @@ -233,7 +233,7 @@ virAdmConnectOpen(const char *name, unsigned int flags) > goto error; > > if (alias) { > - VIR_FREE(uristr); > + g_free(uristr); > uristr = alias; > } > > @@ -251,16 +251,11 @@ virAdmConnectOpen(const char *name, unsigned int flags) > if (remoteAdminConnectOpen(conn, flags) < 0) > goto error; > > - cleanup: > - VIR_FREE(sock_path); > - VIR_FREE(uristr); > return conn; > > error: > virDispatchError(NULL); > - virObjectUnref(conn); This line is still needed > - conn = NULL; > - goto cleanup; > + return NULL; egards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
© 2016 - 2024 Red Hat, Inc.