This rewrite of a nested conditional produces the same results, but
eliminate a goto and corresponding label.
Signed-off-by: Laine Stump <laine@xxxxxxxxxx>
---
src/nwfilter/nwfilter_ebiptables_driver.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c
index 6e05e638aa..90afbe21f1 100644
--- a/src/nwfilter/nwfilter_ebiptables_driver.c
+++ b/src/nwfilter/nwfilter_ebiptables_driver.c
@@ -3101,13 +3101,12 @@ virNWFilterRuleInstSort(const void *a, const void *b)
/* ensure root chain commands appear before all others since
we will need them to create the child chains */
if (root_a) {
- if (root_b)
- goto normal;
- return -1; /* a before b */
- }
- if (root_b)
+ if (!root_b)
+ return -1; /* a before b */
+ } else if (root_b) {
return 1; /* b before a */
- normal:
+ }
+
/* priorities are limited to range [-1000, 1000] */
return insta->priority - instb->priority;
}
--
2.25.4
