OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Drop superfluous conditionals around g_strdup() 

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Markus Armbruster 2014-12-04 10:26:55 +01:00 committed by Michael Tokarev
parent 4ad608803c
commit 24588100ab
3 changed files with 19 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backends/rng-random.c
View File

@ -88,11 +88,7 @@ static char *rng_random_get_filename(Object *obj, Error **errp)
{ {
RndRandom *s = RNG_RANDOM(obj); RndRandom *s = RNG_RANDOM(obj);
if (s->filename) { return g_strdup(s->filename);
return g_strdup(s->filename);
}
return NULL;
} }
static void rng_random_set_filename(Object *obj, const char *filename, static void rng_random_set_filename(Object *obj, const char *filename,

4
hw/tpm/tpm_passthrough.c
View File

@ -400,9 +400,7 @@ static int tpm_passthrough_handle_device_opts(QemuOpts *opts, TPMBackend *tb)
const char *value; const char *value;
value = qemu_opt_get(opts, "cancel-path"); value = qemu_opt_get(opts, "cancel-path");
if (value) { tb->cancel_path = g_strdup(value);
tb->cancel_path = g_strdup(value);
}
value = qemu_opt_get(opts, "path"); value = qemu_opt_get(opts, "path");
if (!value) { if (!value) {

43
util/uri.c
View File

@ -1736,24 +1736,21 @@ uri_resolve(const char *uri, const char *base) {
goto done; goto done;
if ((ref->scheme == NULL) && (ref->path == NULL) && if ((ref->scheme == NULL) && (ref->path == NULL) &&
((ref->authority == NULL) && (ref->server == NULL))) { ((ref->authority == NULL) && (ref->server == NULL))) {
if (bas->scheme != NULL) res->scheme = g_strdup(bas->scheme);
res->scheme = g_strdup(bas->scheme);
if (bas->authority != NULL) if (bas->authority != NULL)
res->authority = g_strdup(bas->authority); res->authority = g_strdup(bas->authority);
else if (bas->server != NULL) { else if (bas->server != NULL) {
res->server = g_strdup(bas->server); res->server = g_strdup(bas->server);
if (bas->user != NULL) res->user = g_strdup(bas->user);
res->user = g_strdup(bas->user); res->port = bas->port;
res->port = bas->port;
} }
if (bas->path != NULL) res->path = g_strdup(bas->path);
res->path = g_strdup(bas->path); if (ref->query != NULL) {
if (ref->query != NULL)
res->query = g_strdup (ref->query); res->query = g_strdup (ref->query);
else if (bas->query != NULL) } else {
res->query = g_strdup(bas->query); res->query = g_strdup(bas->query);
if (ref->fragment != NULL) }
res->fragment = g_strdup(ref->fragment); res->fragment = g_strdup(ref->fragment);
goto step_7; goto step_7;
} }
@ -1767,13 +1764,10 @@ uri_resolve(const char *uri, const char *base) {
val = uri_to_string(ref); val = uri_to_string(ref);
goto done; goto done;
} }
if (bas->scheme != NULL) res->scheme = g_strdup(bas->scheme);
res->scheme = g_strdup(bas->scheme);
if (ref->query != NULL) res->query = g_strdup(ref->query);
res->query = g_strdup(ref->query); res->fragment = g_strdup(ref->fragment);
if (ref->fragment != NULL)
res->fragment = g_strdup(ref->fragment);
/* /*
* 4) If the authority component is defined, then the reference is a * 4) If the authority component is defined, then the reference is a
@ -1787,20 +1781,17 @@ uri_resolve(const char *uri, const char *base) {
res->authority = g_strdup(ref->authority); res->authority = g_strdup(ref->authority);
else { else {
res->server = g_strdup(ref->server); res->server = g_strdup(ref->server);
if (ref->user != NULL) res->user = g_strdup(ref->user);
res->user = g_strdup(ref->user);
res->port = ref->port; res->port = ref->port;
} }
if (ref->path != NULL) res->path = g_strdup(ref->path);
res->path = g_strdup(ref->path);
goto step_7; goto step_7;
} }
if (bas->authority != NULL) if (bas->authority != NULL)
res->authority = g_strdup(bas->authority); res->authority = g_strdup(bas->authority);
else if (bas->server != NULL) { else if (bas->server != NULL) {
res->server = g_strdup(bas->server); res->server = g_strdup(bas->server);
if (bas->user != NULL) res->user = g_strdup(bas->user);
res->user = g_strdup(bas->user);
res->port = bas->port; res->port = bas->port;
} }