Adding upstream version 256.upstream/256

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 7 insertions, 8 deletions

diff --git a/src/shared/fstab-util.h b/src/shared/fstab-util.h
index 9cf34f0..040f076 100644
--- a/src/shared/fstab-util.h
+++ b/src/shared/fstab-util.h
@@ -25,6 +25,8 @@ static inline int fstab_has_node(const char *path) {
         return fstab_is_mount_point_full(NULL, path);
 }
 
+int fstab_has_mount_point_prefix_strv(char **prefixes);
+
 int fstab_filter_options(
                 const char *opts,
                 const char *names,
@@ -32,23 +34,20 @@ int fstab_filter_options(
                 char **ret_value,
                 char ***ret_values,
                 char **ret_filtered);
-
 static inline bool fstab_test_option(const char *opts, const char *names) {
-        return !!fstab_filter_options(opts, names, NULL, NULL, NULL, NULL);
+        return fstab_filter_options(opts, names, NULL, NULL, NULL, NULL);
 }
-
-int fstab_find_pri(const char *options, int *ret);
-
 static inline bool fstab_test_yes_no_option(const char *opts, const char *yes_no) {
-        const char *opt;
+        const char *opt_found;
 
         /* If first name given is last, return 1.
          * If second name given is last or neither is found, return 0. */
 
-        assert_se(fstab_filter_options(opts, yes_no, &opt, NULL, NULL, NULL) >= 0);
+        assert_se(fstab_filter_options(opts, yes_no, &opt_found, NULL, NULL, NULL) >= 0);
 
-        return opt == yes_no;
+        return opt_found == yes_no;
 }
+int fstab_find_pri(const char *opts, int *ret);
 
 char *fstab_node_to_udev_node(const char *p);