All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Marc-André Lureau" <marcandre.lureau@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>,
	integration@gluster.org, sheepdog@lists.wpkg.org,
	qemu-block@nongnu.org, "Peter Lieven" <pl@kamp.de>,
	"Richard W.M. Jones" <rjones@redhat.com>,
	"Max Reitz" <mreitz@redhat.com>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Liu Yuan" <namei.unix@gmail.com>
Subject: [PATCH 03/13] block/vxhs: auto-ify URI parsing variables
Date: Thu,  9 Jul 2020 23:42:24 +0400	[thread overview]
Message-ID: <20200709194234.2117650-4-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <20200709194234.2117650-1-marcandre.lureau@redhat.com>

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



  parent reply	other threads:[~2020-07-09 19:45 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-09 19:42 [PATCH 00/13] RFC: use upcoming GUri for URI handling Marc-André Lureau
2020-07-09 19:42 ` [PATCH 01/13] uri: add g_auto macros for URI & QueryParams Marc-André Lureau
2020-07-09 19:42 ` [PATCH 02/13] block/nbd: auto-ify URI parsing variables Marc-André Lureau
2020-07-09 19:42 ` Marc-André Lureau [this message]
2020-07-09 19:42 ` [PATCH 04/13] block/sheepdog: " Marc-André Lureau
2020-07-09 19:42 ` [PATCH 05/13] block/ssh: " Marc-André Lureau
2020-07-23 12:30   ` Richard W.M. Jones
2020-07-09 19:42 ` [PATCH 06/13] block/nfs: " Marc-André Lureau
2020-07-09 19:42 ` [PATCH 07/13] block/gluster: " Marc-André Lureau
2020-07-09 19:42 ` [PATCH 08/13] build-sys: add HAVE_GLIB_GURI Marc-André Lureau
2020-07-09 19:42 ` [PATCH 09/13] nbd: add GUri-based URI parsing version Marc-André Lureau
2020-07-10  8:31   ` Daniel P. Berrangé
2020-07-09 19:42 ` [PATCH 10/13] sheepdog: add GUri-based URI parsing Marc-André Lureau
2020-07-09 19:42 ` [PATCH 11/13] nfs: " Marc-André Lureau
2020-07-09 19:42 ` [PATCH 12/13] gluster: " Marc-André Lureau
2020-07-09 19:42 ` [PATCH 13/13] ssh: " Marc-André Lureau
2020-07-23 12:31   ` Richard W.M. Jones
2020-07-23 12:58     ` Marc-André Lureau
2020-07-23 13:06       ` Daniel P. Berrangé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200709194234.2117650-4-marcandre.lureau@redhat.com \
    --to=marcandre.lureau@redhat.com \
    --cc=integration@gluster.org \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=namei.unix@gmail.com \
    --cc=pl@kamp.de \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=rjones@redhat.com \
    --cc=sheepdog@lists.wpkg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.