From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57794) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsxEy-00077g-8E for qemu-devel@nongnu.org; Fri, 06 Jun 2014 12:43:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WsxEs-0006gU-4d for qemu-devel@nongnu.org; Fri, 06 Jun 2014 12:43:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16916) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsxEr-0006gK-SE for qemu-devel@nongnu.org; Fri, 06 Jun 2014 12:43:34 -0400 From: Markus Armbruster Date: Fri, 6 Jun 2014 18:43:30 +0200 Message-Id: <1402073010-9445-3-git-send-email-armbru@redhat.com> In-Reply-To: <1402073010-9445-1-git-send-email-armbru@redhat.com> References: <1402073010-9445-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] virtio: Drop superfluous conditionals around g_strdup() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@amazon.com, mst@redhat.com Signed-off-by: Markus Armbruster --- hw/net/virtio-net.c | 7 +------ hw/virtio/virtio.c | 6 +----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index dd28a5a..0a34a8b 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -1510,13 +1510,8 @@ void virtio_net_set_netclient_name(VirtIONet *n, const char *name, assert(type != NULL); g_free(n->netclient_name); - n->netclient_name = NULL; g_free(n->netclient_type); - n->netclient_type = NULL; - - if (name != NULL) { - n->netclient_name = g_strdup(name); - } + n->netclient_name = g_strdup(name); n->netclient_type = g_strdup(type); } diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index c8e36a5..53f014f 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -1165,11 +1165,7 @@ EventNotifier *virtio_queue_get_host_notifier(VirtQueue *vq) void virtio_device_set_child_bus_name(VirtIODevice *vdev, char *bus_name) { g_free(vdev->bus_name); - vdev->bus_name = NULL; - - if (bus_name) { - vdev->bus_name = g_strdup(bus_name); - } + vdev->bus_name = g_strdup(bus_name); } static void virtio_device_realize(DeviceState *dev, Error **errp) -- 1.9.3