From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 4 Dec 2023 17:18:48 +0000 (+0100)
Subject: dissect-image: path[] is now defined for all metadata fields
X-Git-Tag: v256-rc1~1503^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ee413e632335d90d6accbbc3a86b8e42d61fc36;p=thirdparty%2Fsystemd.git

dissect-image: path[] is now defined for all metadata fields

There's no point in handling a case that never can happen.
---

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 2687eafaf6b..b63973cea8c 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -3390,10 +3390,7 @@ int dissected_image_acquire_metadata(DissectedImage *m, DissectImageFlags extra_
         assert(m);
 
         for (; n_meta_initialized < _META_MAX; n_meta_initialized ++) {
-                if (!paths[n_meta_initialized]) {
-                        fds[2*n_meta_initialized] = fds[2*n_meta_initialized+1] = -EBADF;
-                        continue;
-                }
+                assert(paths[n_meta_initialized]);
 
                 if (pipe2(fds + 2*n_meta_initialized, O_CLOEXEC) < 0) {
                         r = -errno;
@@ -3435,8 +3432,7 @@ int dissected_image_acquire_metadata(DissectedImage *m, DissectImageFlags extra_
                 for (unsigned k = 0; k < _META_MAX; k++) {
                         _cleanup_close_ int fd = -ENOENT;
 
-                        if (!paths[k])
-                                continue;
+                        assert(paths[k]);
 
                         fds[2*k] = safe_close(fds[2*k]);
 
@@ -3535,8 +3531,7 @@ int dissected_image_acquire_metadata(DissectedImage *m, DissectImageFlags extra_
         for (unsigned k = 0; k < _META_MAX; k++) {
                 _cleanup_fclose_ FILE *f = NULL;
 
-                if (!paths[k])
-                        continue;
+                assert(paths[k]);
 
                 fds[2*k+1] = safe_close(fds[2*k+1]);