From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 8 Apr 2023 07:15:03 +0000 (+0900)
Subject: os-util: use _IMAGE_CLASS_INVALID
X-Git-Tag: v254-rc1~770^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d67071d2f6f09676d01becbde65a338b13f3a012;p=thirdparty%2Fsystemd.git

os-util: use _IMAGE_CLASS_INVALID

When extension is not specified, image class is not necessary to be
specified. Let's use _IMAGE_CLASS_INVALID as an indicator that no
extension is specified.
---

diff --git a/src/basic/os-util.c b/src/basic/os-util.c
index 686d5e13825..005ccf790b9 100644
--- a/src/basic/os-util.c
+++ b/src/basic/os-util.c
@@ -65,8 +65,6 @@ int path_is_extension_tree(ImageClass image_class, const char *path, const char
         int r;
 
         assert(path);
-        assert(image_class >= 0);
-        assert(image_class < _IMAGE_CLASS_MAX);
 
         /* Does the path exist at all? If not, generate an error immediately. This is useful so that a missing root dir
          * always results in -ENOENT, and we can properly distinguish the case where the whole root doesn't exist from
@@ -305,7 +303,7 @@ int _parse_os_release(const char *root, ...) {
         int r;
 
         va_start(ap, root);
-        r = parse_release_internal(root, -1, /* relax_extension_release_check= */ false, NULL, ap);
+        r = parse_release_internal(root, _IMAGE_CLASS_INVALID, /* relax_extension_release_check= */ false, NULL, ap);
         va_end(ap);
 
         return r;
diff --git a/src/basic/os-util.h b/src/basic/os-util.h
index 61216743615..0cd55f87c6c 100644
--- a/src/basic/os-util.h
+++ b/src/basic/os-util.h
@@ -25,17 +25,17 @@ bool image_name_is_valid(const char *s) _pure_;
 
 int path_is_extension_tree(ImageClass image_class, const char *path, const char *extension, bool relax_extension_release_check);
 static inline int path_is_os_tree(const char *path) {
-        return path_is_extension_tree(IMAGE_SYSEXT, path, NULL, false);
+        return path_is_extension_tree(_IMAGE_CLASS_INVALID, path, NULL, false);
 }
 
 int open_extension_release(const char *root, ImageClass image_class, const char *extension, bool relax_extension_release_check, char **ret_path, int *ret_fd);
 static inline int open_os_release(const char *root, char **ret_path, int *ret_fd) {
-        return open_extension_release(root, IMAGE_SYSEXT, NULL, false, ret_path, ret_fd);
+        return open_extension_release(root, _IMAGE_CLASS_INVALID, NULL, false, ret_path, ret_fd);
 }
 
 int fopen_extension_release(const char *root, ImageClass image_class, const char *extension, bool relax_extension_release_check, char **ret_path, FILE **ret_file);
 static inline int fopen_os_release(const char *root, char **ret_path, FILE **ret_file) {
-        return fopen_extension_release(root, IMAGE_SYSEXT, NULL, false, ret_path, ret_file);
+        return fopen_extension_release(root, _IMAGE_CLASS_INVALID, NULL, false, ret_path, ret_file);
 }
 
 int _parse_extension_release(const char *root, ImageClass image_class, bool relax_extension_release_check, const char *extension, ...) _sentinel_;