From 1906ff6940bb9f84f0f6a66980354e66b5124558 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Thu, 12 Sep 2019 13:05:03 +0100 Subject: [PATCH 06/22] opts: remove redundant check for NULL parameter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RH-Author: Laszlo Ersek Message-id: <20190912130503.14094-7-lersek@redhat.com> Patchwork-id: 90432 O-Subject: [RHEL-8.2.0 qemu-kvm PATCH 6/6] opts: remove redundant check for NULL parameter Bugzilla: 1749022 RH-Acked-by: Stefano Garzarella RH-Acked-by: Philippe Mathieu-Daudé RH-Acked-by: Eduardo Habkost From: Daniel P. Berrangé No callers of get_opt_value() pass in a NULL for the "value" parameter, so the check is redundant. RHEL8 notes: - Context difference in "util/qemu-option.c", function get_opt_value(); upstream has commit 5c99fa375da1 ("cutils: Provide strchrnul", 2018-06-29), part of v3.0.0, but downstream lacks it. Harmless, because said upstream commit only refactors get_opt_value(). Signed-off-by: Daniel P. Berrangé Message-Id: <20180514171913.17664-4-berrange@redhat.com> Reviewed-by: Eduardo Habkost Tested-by: Roman Kagan Signed-off-by: Paolo Bonzini (cherry picked from commit 0c2f6e7ee99517449b4ed6cf333c2d9456d8fe35) Signed-off-by: Laszlo Ersek Signed-off-by: Danilo C. L. de Paula --- util/qemu-option.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/util/qemu-option.c b/util/qemu-option.c index a396d60..940f7a3 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -75,9 +75,7 @@ const char *get_opt_value(const char *p, char **value) size_t capacity = 0, length; const char *offset; - if (value) { - *value = NULL; - } + *value = NULL; while (1) { offset = strchr(p, ','); if (!offset) { @@ -88,11 +86,9 @@ const char *get_opt_value(const char *p, char **value) if (*offset != '\0' && *(offset + 1) == ',') { length++; } - if (value) { - *value = g_renew(char, *value, capacity + length + 1); - strncpy(*value + capacity, p, length); - (*value)[capacity + length] = '\0'; - } + *value = g_renew(char, *value, capacity + length + 1); + strncpy(*value + capacity, p, length); + (*value)[capacity + length] = '\0'; capacity += length; if (*offset == '\0' || *(offset + 1) != ',') { -- 1.8.3.1