[PATCH] admin: use g_autofree
From: GAURAV AGRAWAL <agrawalgaurav@gnome.org> Signed-off-by: Gaurav Agrawal <agrawalgaurav@gnome.org> --- src/admin/libvirt-admin.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/admin/libvirt-admin.c b/src/admin/libvirt-admin.c index 4099a54854..d841a15f95 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,14 +251,11 @@ virAdmConnectOpen(const char *name, unsigned int flags) if (remoteAdminConnectOpen(conn, flags) < 0) goto error; - cleanup: - VIR_FREE(sock_path); - VIR_FREE(uristr); +cleanup: return conn; error: virDispatchError(NULL); - virObjectUnref(conn); conn = NULL; goto cleanup; } -- 2.24.1
On a Saturday in 2020, Gaurav Agrawal wrote:
From: GAURAV AGRAWAL <agrawalgaurav@gnome.org>
Your author name is in all caps, consider using the same form as below:
Signed-off-by: Gaurav Agrawal <agrawalgaurav@gnome.org>
To see where it comes from you can use --show-origin: $ git config --show-origin user.name file:/home/jtomko/.gitconfig Ján Tomko
--- src/admin/libvirt-admin.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/admin/libvirt-admin.c b/src/admin/libvirt-admin.c index 4099a54854..d841a15f95 100644 --- a/src/admin/libvirt-admin.c +++ b/src/admin/libvirt-admin.c @@ -251,14 +251,11 @@ virAdmConnectOpen(const char *name, unsigned int flags) if (remoteAdminConnectOpen(conn, flags) < 0) goto error;
- cleanup: - VIR_FREE(sock_path); - VIR_FREE(uristr); +cleanup: return conn;
error: virDispatchError(NULL);
- virObjectUnref(conn);
'conn' is still not marked as g_auto, so this unref needs to stay.
conn = NULL; goto cleanup;
These two lines can be replaced by return NULL, and the cleanup: label above removed. Jano
} -- 2.24.1
participants (2)
-
Gaurav Agrawal -
Ján Tomko