X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=devices%2Fparser.h;fp=devices%2Fparser.h;h=9c6fb352e84337b14ce647e538e7f23bb07bd6f2;hp=840ca1b9d477ee56b50984af58ee5993ee71f0bb;hb=aab818c10b1fa68b968cabc852680f8ec0fe1360;hpb=84a9a8660a90551f2f934ac77ac0c9b2c2e8c079

diff --git a/devices/parser.h b/devices/parser.h
index 840ca1b..9c6fb35 100644
--- 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,8 +28,6 @@ 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 */
@@ -37,7 +35,7 @@ void pb_log(const char *fmt, ...);
 
 int mount_device(const char *dev_path);
 
-char *resolve_path(const char *path, const char *default_mountpoint);
+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);