[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 03/13] block/vxhs: auto-ify URI parsing variables
From: |
Marc-André Lureau |
Subject: |
[PATCH 03/13] block/vxhs: auto-ify URI parsing variables |
Date: |
Thu, 9 Jul 2020 23:42:24 +0400 |
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
block/vxhs.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/block/vxhs.c b/block/vxhs.c
index d79fc97df66..5d61cfb7548 100644
--- a/block/vxhs.c
+++ b/block/vxhs.c
@@ -174,14 +174,12 @@ static QemuOptsList runtime_tcp_opts = {
*/
static int vxhs_parse_uri(const char *filename, QDict *options)
{
- URI *uri = NULL;
- char *port;
- int ret = 0;
+ g_autoptr(URI) uri = NULL;
+ g_autofree char *port = NULL;
trace_vxhs_parse_uri_filename(filename);
uri = uri_parse(filename);
if (!uri || !uri->server || !uri->path) {
- uri_free(uri);
return -EINVAL;
}
@@ -190,15 +188,13 @@ static int vxhs_parse_uri(const char *filename, QDict
*options)
if (uri->port) {
port = g_strdup_printf("%d", uri->port);
qdict_put_str(options, VXHS_OPT_SERVER ".port", port);
- g_free(port);
}
qdict_put_str(options, "vdisk-id", uri->path);
trace_vxhs_parse_uri_hostinfo(uri->server, uri->port);
- uri_free(uri);
- return ret;
+ return 0;
}
static void vxhs_parse_filename(const char *filename, QDict *options,
--
2.27.0.221.ga08a83db2b
- [PATCH 00/13] RFC: use upcoming GUri for URI handling, Marc-André Lureau, 2020/07/09
- [PATCH 01/13] uri: add g_auto macros for URI & QueryParams, Marc-André Lureau, 2020/07/09
- [PATCH 02/13] block/nbd: auto-ify URI parsing variables, Marc-André Lureau, 2020/07/09
- [PATCH 03/13] block/vxhs: auto-ify URI parsing variables,
Marc-André Lureau <=
- [PATCH 04/13] block/sheepdog: auto-ify URI parsing variables, Marc-André Lureau, 2020/07/09
- [PATCH 05/13] block/ssh: auto-ify URI parsing variables, Marc-André Lureau, 2020/07/09
- [PATCH 06/13] block/nfs: auto-ify URI parsing variables, Marc-André Lureau, 2020/07/09
- [PATCH 07/13] block/gluster: auto-ify URI parsing variables, Marc-André Lureau, 2020/07/09
- [PATCH 08/13] build-sys: add HAVE_GLIB_GURI, Marc-André Lureau, 2020/07/09
- [PATCH 09/13] nbd: add GUri-based URI parsing version, Marc-André Lureau, 2020/07/09
- [PATCH 10/13] sheepdog: add GUri-based URI parsing, Marc-André Lureau, 2020/07/09
- [PATCH 11/13] nfs: add GUri-based URI parsing, Marc-André Lureau, 2020/07/09