qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Marc-André Lureau" <marcandre.lureau@redhat.com>
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com, changpeng.liu@intel.com, f4bug@amsat.org,
	felipe@nutanix.com,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [Qemu-devel] [PATCH v2 06/27] vhost-user-scsi: use g_strdup()
Date: Tue, 19 Sep 2017 18:52:05 +0200	[thread overview]
Message-ID: <20170919165226.23022-7-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com>

Since vhost-user-scsi uses glib.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 contrib/vhost-user-scsi/vhost-user-scsi.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index 78bcc65f5a..1fb57da2da 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -822,10 +822,10 @@ int main(int argc, char **argv)
         case 'h':
             goto help;
         case 'u':
-            unix_fn = strdup(optarg);
+            unix_fn = g_strdup(optarg);
             break;
         case 'i':
-            iscsi_uri = strdup(optarg);
+            iscsi_uri = g_strdup(optarg);
             break;
         default:
             goto help;
@@ -854,12 +854,8 @@ out:
         vdev_scsi_deinit(vdev_scsi);
         free(vdev_scsi);
     }
-    if (unix_fn) {
-        free(unix_fn);
-    }
-    if (iscsi_uri) {
-        free(iscsi_uri);
-    }
+    g_free(unix_fn);
+    g_free(iscsi_uri);
 
     return err;
 
-- 
2.14.1.146.gd35faa819

  parent reply	other threads:[~2017-09-19 16:53 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 01/27] glib-compat: move G_SOURCE_CONTINUE/REMOVE there Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 02/27] build-sys: fix libvhost-user.a build Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 03/27] build-sys: make vhost-user-scsi depend on libvhost-user.a Marc-André Lureau
2017-10-10 16:18   ` Paolo Bonzini
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 04/27] libvhost-user: drop dependency on glib Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 05/27] libvhost-user: improve vu_queue_pop() doc Marc-André Lureau
2017-09-19 16:52 ` Marc-André Lureau [this message]
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 07/27] vhost-user-scsi: connect unix socket before allocating Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 08/27] vhost-user-scsi: code style fixes Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 09/27] vhost-user-scsi: use glib allocation Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 10/27] vhost-user-scsi: glib calls that allocate don't return NULL Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 11/27] vhost-user-scsi: also free the gtree Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 12/27] vhost-user-scsi: remove vdev_scsi_find_by_vu() Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 13/27] vhost-user-scsi: simplify unix path cleanup Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 14/27] vhost-user-scsi: use NULL pointer Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 15/27] vhost-user-scsi: assert() in iscsi_add_lun() Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 16/27] vhost-user-scsi: remove vdev_scsi_add_iscsi_lun() Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 17/27] vhost-user-scsi: remove VUS_MAX_LUNS Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 18/27] vhost-user-scsi: remove unimplemented functions Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 19/27] vhost-user-scsi: rename VUS types Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 20/27] vhost-user-scsi: avoid use of iscsi_ namespace Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 21/27] vhost-user-scsi: don't copy iscsi/scsi-lowlevel.h Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 22/27] vhost-user-scsi: drop extra callback pointer Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 23/27] vhost-user-scsi: simplify source handling Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 24/27] vhost-user-scsi: use glib logging Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 25/27] libvhost-user: add glib source helper Marc-André Lureau
2017-10-10 16:22   ` Paolo Bonzini
2017-10-10 16:25     ` Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 26/27] vhost-user-scsi: use libvhost-user glib helper Marc-André Lureau
2017-10-10 16:23   ` Paolo Bonzini
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 27/27] vhost-user-scsi: remove server_sock from VusDev Marc-André Lureau

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=20170919165226.23022-7-marcandre.lureau@redhat.com \
    --to=marcandre.lureau@redhat.com \
    --cc=changpeng.liu@intel.com \
    --cc=f4bug@amsat.org \
    --cc=felipe@nutanix.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).