X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=devices%2Fparser.c;h=5e50dcbdafc292f8c05a29f986f1d5510259938b;hb=a57e4ef92b8e590643a325d309511306c5b941a9;hp=00f36598f0e25e4431feab15cf2cc67c3bd447ba;hpb=7d7c328016aca3e14aee6268a2e7881d3440e226;p=petitboot diff --git a/devices/parser.c b/devices/parser.c index 00f3659..5e50dcb 100644 --- a/devices/parser.c +++ b/devices/parser.c @@ -26,7 +26,7 @@ void iterate_parsers(const char *devpath, const char *mountpoint) 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_for_device(devpath))) + 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) {