[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH v3 02/11] g_strdup(NULL) returns NULL; simplify
From: |
Markus Armbruster |
Subject: |
[Qemu-trivial] [PATCH v3 02/11] g_strdup(NULL) returns NULL; simplify |
Date: |
Tue, 22 Jan 2013 11:07:57 +0100 |
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
hw/9pfs/virtio-9p-device.c | 6 +-----
hw/block-common.c | 4 +---
net/net.c | 4 +---
slirp/slirp.c | 8 ++------
util/qemu-option.c | 8 ++------
5 files changed, 7 insertions(+), 23 deletions(-)
diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c
index 6f427df..6eab7f7 100644
--- a/hw/9pfs/virtio-9p-device.c
+++ b/hw/9pfs/virtio-9p-device.c
@@ -85,11 +85,7 @@ VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf
*conf)
}
s->ctx.export_flags = fse->export_flags;
- if (fse->path) {
- s->ctx.fs_root = g_strdup(fse->path);
- } else {
- s->ctx.fs_root = NULL;
- }
+ s->ctx.fs_root = g_strdup(fse->path);
s->ctx.exops.get_st_gen = NULL;
len = strlen(conf->tag);
if (len > MAX_TAG_LEN - 1) {
diff --git a/hw/block-common.c b/hw/block-common.c
index 0f1b64e..d21ec3a 100644
--- a/hw/block-common.c
+++ b/hw/block-common.c
@@ -18,9 +18,7 @@ void blkconf_serial(BlockConf *conf, char **serial)
if (!*serial) {
/* try to fall back to value set with legacy -drive serial=... */
dinfo = drive_get_by_blockdev(conf->bs);
- if (dinfo->serial) {
- *serial = g_strdup(dinfo->serial);
- }
+ *serial = g_strdup(dinfo->serial);
}
}
diff --git a/net/net.c b/net/net.c
index cdd9b04..2f0ab3a 100644
--- a/net/net.c
+++ b/net/net.c
@@ -566,9 +566,7 @@ static int net_init_nic(const NetClientOptions *opts, const
char *name,
assert(peer);
nd->netdev = peer;
}
- if (name) {
- nd->name = g_strdup(name);
- }
+ nd->name = g_strdup(name);
if (nic->has_model) {
nd->model = g_strdup(nic->model);
}
diff --git a/slirp/slirp.c b/slirp/slirp.c
index e93b578..0e6e232 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -225,12 +225,8 @@ Slirp *slirp_init(int restricted, struct in_addr vnetwork,
pstrcpy(slirp->client_hostname, sizeof(slirp->client_hostname),
vhostname);
}
- if (tftp_path) {
- slirp->tftp_prefix = g_strdup(tftp_path);
- }
- if (bootfile) {
- slirp->bootp_filename = g_strdup(bootfile);
- }
+ slirp->tftp_prefix = g_strdup(tftp_path);
+ slirp->bootp_filename = g_strdup(bootfile);
slirp->vdhcp_startaddr = vdhcp_start;
slirp->vnameserver_addr = vnameserver;
diff --git a/util/qemu-option.c b/util/qemu-option.c
index f532b76..c12e724 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -643,9 +643,7 @@ static void opt_set(QemuOpts *opts, const char *name, const
char *value,
QTAILQ_INSERT_TAIL(&opts->head, opt, next);
}
opt->desc = desc;
- if (value) {
- opt->str = g_strdup(value);
- }
+ opt->str = g_strdup(value);
qemu_opt_parse(opt, &local_err);
if (error_is_set(&local_err)) {
error_propagate(errp, local_err);
@@ -792,9 +790,7 @@ QemuOpts *qemu_opts_create(QemuOptsList *list, const char
*id,
}
}
opts = g_malloc0(sizeof(*opts));
- if (id) {
- opts->id = g_strdup(id);
- }
+ opts->id = g_strdup(id);
opts->list = list;
loc_save(&opts->loc);
QTAILQ_INIT(&opts->head);
--
1.7.11.7
- [Qemu-trivial] [PATCH v3 00/11] Trivial memory allocation fixes & cleanups, Markus Armbruster, 2013/01/22
- [Qemu-trivial] [PATCH v3 05/11] spice: Fix unchecked strdup() by converting to g_strdup(), Markus Armbruster, 2013/01/22
- [Qemu-trivial] [PATCH v3 06/11] virtfs-proxy-helper: Fix unchecked strdup() by conv. to g_strdup(), Markus Armbruster, 2013/01/22
- [Qemu-trivial] [PATCH v3 08/11] qemu-log: Plug trivial memory leak in cpu_set_log_filename(), Markus Armbruster, 2013/01/22
- [Qemu-trivial] [PATCH v3 10/11] qapi: Fix unchecked strdup() by converting to g_strdup(), Markus Armbruster, 2013/01/22
- [Qemu-trivial] [PATCH v3 02/11] g_strdup(NULL) returns NULL; simplify,
Markus Armbruster <=
- [Qemu-trivial] [PATCH v3 09/11] libcacard: Fix unchecked strdup() by converting to g_strdup(), Markus Armbruster, 2013/01/22
- [Qemu-trivial] [PATCH v3 01/11] g_malloc(0) and g_malloc0(0) return NULL; simplify, Markus Armbruster, 2013/01/22
- [Qemu-trivial] [PATCH v3 04/11] readline: Fix unchecked strdup() by converting to g_strdup(), Markus Armbruster, 2013/01/22
- [Qemu-trivial] [PATCH v3 03/11] hw/9pfs: Fix unchecked strdup() by converting to g_strdup(), Markus Armbruster, 2013/01/22
- [Qemu-trivial] [PATCH v3 11/11] qemu-ga: Fix unchecked strdup() by converting to g_strdup(), Markus Armbruster, 2013/01/22
- [Qemu-trivial] [PATCH v3 07/11] qemu-log: Fix unchecked strdup() by converting to g_strdup(), Markus Armbruster, 2013/01/22
- Re: [Qemu-trivial] [PATCH v3 00/11] Trivial memory allocation fixes & cleanups, Stefan Hajnoczi, 2013/01/22