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.
This commit is contained in:
Yu Watanabe
2023-04-11 05:20:15 +09:00
parent c2cd950817
commit d67071d2f6
2 changed files with 4 additions and 6 deletions
+1 -3
View File
@@ -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;
+3 -3
View File
@@ -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_;