Make kboot_parser global options array static

[petitboot] / devices / parser.h

diff --git a/devices/parser.h b/devices/parser.h
index 2034cf194ad0581bec38ab5248e6c3fa2d5e664b..9c6fb352e84337b14ce647e538e7f23bb07bd6f2 100644 (file)
--- a/devices/parser.h
+++ b/devices/parser.h
@@ -8,7 +8,7 @@
 struct parser {
        char *name;
        int priority;
-       int (*parse)(const char *devicepath, const char *mountpoint);
+       int (*parse)(const char *device);
        struct parser *next;
 };
 
@@ -28,14 +28,15 @@ void iterate_parsers(const char *devpath, const char *mountpoint);
 void free_device(struct device *dev);
 void free_boot_option(struct boot_option *opt);
 
-char *join_paths(const char *a, const char *b);
-
 const char *generic_icon_file(enum generic_icon_type type);
 
 /* functions provided by udev-helper or the test wrapper */
 void pb_log(const char *fmt, ...);
 
-int mount_device(const char *dev_path, char *mount_path);
+int mount_device(const char *dev_path);
+
+char *resolve_path(const char *path, const char *current_dev);
+const char *mountpoint_for_device(const char *dev_path);
 
 enum generic_icon_type guess_device_type(void);