|
 |
6d3351 |
From 25fbc5c619a4277086b0bce0e3a55dd4099d4ab2 Mon Sep 17 00:00:00 2001
|
|
|
6d3351 |
Message-Id: <25fbc5c619a4277086b0bce0e3a55dd4099d4ab2@dist-git>
|
|
|
6d3351 |
From: Martin Kletzander <mkletzan@redhat.com>
|
|
|
6d3351 |
Date: Tue, 25 Apr 2017 13:41:20 +0200
|
|
|
6d3351 |
Subject: [PATCH] Remove pointless check for !ret in
|
|
|
6d3351 |
virDomainNetDefCoalesceParseXML
|
|
|
6d3351 |
|
|
|
6d3351 |
https://bugzilla.redhat.com/show_bug.cgi?id=1414627
|
|
|
6d3351 |
|
|
|
6d3351 |
It was left there after removing a macro it was part of in first
|
|
|
6d3351 |
version or so. Now it will always be NULL.
|
|
|
6d3351 |
|
|
|
6d3351 |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
6d3351 |
(cherry picked from commit b2763f189c5b306a685021b4fede9e2cee8528de)
|
|
|
6d3351 |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
6d3351 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6d3351 |
---
|
|
|
6d3351 |
src/conf/domain_conf.c | 2 +-
|
|
|
6d3351 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
6d3351 |
|
|
|
6d3351 |
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
|
|
|
6d3351 |
index 47022c329..2d5d00cf2 100644
|
|
|
6d3351 |
--- a/src/conf/domain_conf.c
|
|
|
6d3351 |
+++ b/src/conf/domain_conf.c
|
|
|
6d3351 |
@@ -6776,7 +6776,7 @@ virDomainNetDefCoalesceParseXML(xmlNodePtr node,
|
|
|
6d3351 |
if (!str)
|
|
|
6d3351 |
goto cleanup;
|
|
|
6d3351 |
|
|
|
6d3351 |
- if (!ret && VIR_ALLOC(ret) < 0)
|
|
|
6d3351 |
+ if (VIR_ALLOC(ret) < 0)
|
|
|
6d3351 |
goto cleanup;
|
|
|
6d3351 |
|
|
|
6d3351 |
if (virStrToLong_ullp(str, NULL, 10, &tmp) < 0) {
|
|
|
6d3351 |
--
|
|
|
6d3351 |
2.12.2
|
|
|
6d3351 |
|