ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

g_strdup(NULL) returns NULL; simplify 

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Markus Armbruster 2013-01-22 11:07:57 +01:00 committed by Stefan Hajnoczi
parent 6528499fa4
commit c64f50d1e2
5 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/9pfs/virtio-9p-device.c
View File

@ -85,11 +85,7 @@ VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf)
} }
s->ctx.export_flags = fse->export_flags; s->ctx.export_flags = fse->export_flags;
if (fse->path) {
s->ctx.fs_root = g_strdup(fse->path); s->ctx.fs_root = g_strdup(fse->path);
} else {
s->ctx.fs_root = NULL;
}
s->ctx.exops.get_st_gen = NULL; s->ctx.exops.get_st_gen = NULL;
len = strlen(conf->tag); len = strlen(conf->tag);
if (len > MAX_TAG_LEN - 1) { if (len > MAX_TAG_LEN - 1) {

2
hw/block-common.c
View File

@ -18,11 +18,9 @@ void blkconf_serial(BlockConf *conf, char **serial)
if (!*serial) { if (!*serial) {
/* try to fall back to value set with legacy -drive serial=... */ /* try to fall back to value set with legacy -drive serial=... */
dinfo = drive_get_by_blockdev(conf->bs); dinfo = drive_get_by_blockdev(conf->bs);
if (dinfo->serial) {
*serial = g_strdup(dinfo->serial); *serial = g_strdup(dinfo->serial);
} }
} }
}
int blkconf_geometry(BlockConf *conf, int *ptrans, int blkconf_geometry(BlockConf *conf, int *ptrans,
unsigned cyls_max, unsigned heads_max, unsigned secs_max) unsigned cyls_max, unsigned heads_max, unsigned secs_max)

2
net/net.c
View File

@ -566,9 +566,7 @@ static int net_init_nic(const NetClientOptions *opts, const char *name,
assert(peer); assert(peer);
nd->netdev = peer; nd->netdev = peer;
} }
if (name) {
nd->name = g_strdup(name); nd->name = g_strdup(name);
}
if (nic->has_model) { if (nic->has_model) {
nd->model = g_strdup(nic->model); nd->model = g_strdup(nic->model);
} }

4
slirp/slirp.c
View File

@ -225,12 +225,8 @@ Slirp *slirp_init(int restricted, struct in_addr vnetwork,
pstrcpy(slirp->client_hostname, sizeof(slirp->client_hostname), pstrcpy(slirp->client_hostname, sizeof(slirp->client_hostname),
vhostname); vhostname);
} }
if (tftp_path) {
slirp->tftp_prefix = g_strdup(tftp_path); slirp->tftp_prefix = g_strdup(tftp_path);
}
if (bootfile) {
slirp->bootp_filename = g_strdup(bootfile); slirp->bootp_filename = g_strdup(bootfile);
}
slirp->vdhcp_startaddr = vdhcp_start; slirp->vdhcp_startaddr = vdhcp_start;
slirp->vnameserver_addr = vnameserver; slirp->vnameserver_addr = vnameserver;

4
util/qemu-option.c
View File

@ -643,9 +643,7 @@ static void opt_set(QemuOpts *opts, const char *name, const char *value,
QTAILQ_INSERT_TAIL(&opts->head, opt, next); QTAILQ_INSERT_TAIL(&opts->head, opt, next);
} }
opt->desc = desc; opt->desc = desc;
if (value) {
opt->str = g_strdup(value); opt->str = g_strdup(value);
}
qemu_opt_parse(opt, &local_err); qemu_opt_parse(opt, &local_err);
if (error_is_set(&local_err)) { if (error_is_set(&local_err)) {
error_propagate(errp, 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)); opts = g_malloc0(sizeof(*opts));
if (id) {
opts->id = g_strdup(id); opts->id = g_strdup(id);
}
opts->list = list; opts->list = list;
loc_save(&opts->loc); loc_save(&opts->loc);
QTAILQ_INIT(&opts->head); QTAILQ_INIT(&opts->head);