From ca7c7a8b07c31dc8bf96f7da6fb53af884e36ddb Mon Sep 17 00:00:00 2001 Message-Id: From: Peter Krempa Date: Tue, 4 Feb 2020 15:08:01 +0100 Subject: [PATCH] Remove checking of return value of virHashNew MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There are two calls to virHashNew which check the return value. It's not necessary any more as virHashNew always returns a valid pointer. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik (cherry picked from commit 6eab924daa243afa67f2cc20dcbdf521904bb62b) https://bugzilla.redhat.com/show_bug.cgi?id=1793263 Message-Id: <08acb2e50b584a75c0131a628ee441f47e8fe823.1580824112.git.pkrempa@redhat.com> Reviewed-by: Ján Tomko --- src/conf/backup_conf.c | 6 +----- src/qemu/qemu_monitor_json.c | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/conf/backup_conf.c b/src/conf/backup_conf.c index b370b686f1..64c8f6cc09 100644 --- a/src/conf/backup_conf.c +++ b/src/conf/backup_conf.c @@ -439,15 +439,11 @@ virDomainBackupAlignDisks(virDomainBackupDefPtr def, virDomainDefPtr dom, const char *suffix) { - g_autoptr(virHashTable) disks = NULL; + g_autoptr(virHashTable) disks = virHashNew(NULL); size_t i; int ndisks; bool backup_all = false; - - if (!(disks = virHashNew(NULL))) - return -1; - /* Unlikely to have a guest without disks but technically possible. */ if (!dom->ndisks) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 5d8c7e9b5e..3fc0bcb80c 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2992,8 +2992,7 @@ qemuMonitorJSONBlockGetNamedNodeDataJSON(virJSONValuePtr nodes) { g_autoptr(virHashTable) ret = NULL; - if (!(ret = virHashNew((virHashDataFree) qemuMonitorJSONBlockNamedNodeDataFree))) - return NULL; + ret = virHashNew((virHashDataFree) qemuMonitorJSONBlockNamedNodeDataFree); if (virJSONValueArrayForeachSteal(nodes, qemuMonitorJSONBlockGetNamedNodeDataWorker, -- 2.25.0