cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-opts-remove-redundant-check-for-NULL-parameter.patch

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