From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 9 Sep 2021 09:41:52 +0000 (+0200)
Subject: dissect-image: replace redundant if check by assert()
X-Git-Tag: v250-rc1~701^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f9e0bb6167766d3787d3b2c6722eb55a338ffe3c;p=thirdparty%2Fsystemd.git

dissect-image: replace redundant if check by assert()

We know that the designator can only be USR or ROOT (or negative), hence
let's test that with an assert here, instead of doing an if check.
---

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index a540f866896..1cfbde683d4 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -1414,9 +1414,10 @@ int dissect_image(
                                 /* If we found a verity setup, then the root partition is necessarily read-only. */
                                 m->partitions[PARTITION_ROOT].rw = false;
                                 m->verity_ready = true;
-                        }
 
-                        if (verity->designator == PARTITION_USR) {
+                        } else {
+                                assert(verity->designator == PARTITION_USR);
+
                                 if (!m->partitions[PARTITION_USR_VERITY].found || !m->partitions[PARTITION_USR].found)
                                         return -EADDRNOTAVAIL;