X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=devices%2Fparser.c;h=5e50dcbdafc292f8c05a29f986f1d5510259938b;hp=b9edff7b4fa01160d4824600f6d61d76ed96da34;hb=2ce51d1e70aaf667be126b88a35b6210a45fb314;hpb=678dbd282f917c68c4fd6badfc14fcf464796f5d

diff --git a/devices/parser.c b/devices/parser.c
index b9edff7..5e50dcb 100644
--- a/devices/parser.c
+++ b/devices/parser.c
@@ -21,13 +21,13 @@ void iterate_parsers(const char *devpath, const char *mountpoint)
 {
 	int i;
 
-	pb_log("trying parsers for %s@%s\n", devpath, mountpoint);
+	pb_log("trying parsers for %s\n", devpath);
 
 	for (i = 0; parsers[i]; i++) {
 		pb_log("\ttrying parser '%s'\n", parsers[i]->name);
 		/* just use a dummy device path for now */
-		if (parsers[i]->parse(devpath, mountpoint))
-			/*return*/;
+		if (parsers[i]->parse(devpath))
+			return;
 	}
 	pb_log("\tno boot_options found\n");
 }
@@ -67,20 +67,6 @@ void free_boot_option(struct boot_option *opt)
 	free(opt);
 }
 
-char *join_paths(const char *a, const char *b)
-{
-	char *full_path;
-
-	full_path = malloc(strlen(a) + strlen(b) + 2);
-
-	strcpy(full_path, a);
-	if (b[0] != '/')
-		strcat(full_path, "/");
-	strcat(full_path, b);
-
-	return full_path;
-}
-
 const char *generic_icon_file(enum generic_icon_type type)
 {
 	switch (type) {