1 files changed, 6 insertions, 27 deletions
diff --git a/discover/parser.h b/discover/parser.h
index 9c6fb35..bf9a4d0 100644
--- a/discover/parser.h
+++ b/discover/parser.h
@@ -1,14 +1,12 @@
+#ifndef _PARSER_H
+#define _PARSER_H
 
-#ifndef _PARSERS_H
-#define _PARSERS_H
-
-#include <stdarg.h>
-#include "message.h"
+struct discover_context;
 
 struct parser {
 	char *name;
 	int priority;
-	int (*parse)(const char *device);
+	int (*parse)(struct discover_context *ctx);
 	struct parser *next;
 };
 
@@ -22,25 +20,6 @@ enum generic_icon_type {
 
 #define streq(a,b) (!strcasecmp((a),(b)))
 
-/* general functions provided by parsers.c */
-void iterate_parsers(const char *devpath, const char *mountpoint);
-
-void free_device(struct device *dev);
-void free_boot_option(struct boot_option *opt);
-
-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 *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);
-
-int add_device(const struct device *dev);
-int add_boot_option(const struct boot_option *opt);
+void iterate_parsers(struct discover_context *ctx);
 
-#endif /* _PARSERS_H */
+#endif /* _PARSER_H */