X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fevent-parser.c;h=289fee96bdf8da7f688b985ad66b7216985dcbd6;hp=d7c0820083ff8a098383992939d357b2377e6cfc;hb=e4f5bd235894c11823ac1befe8c8c43063cad026;hpb=397dc244bfdc2a57fc3e8fd191b0ef60c8a4b66b;ds=sidebyside diff --git a/discover/event-parser.c b/discover/event-parser.c index d7c0820..289fee9 100644 --- a/discover/event-parser.c +++ b/discover/event-parser.c @@ -16,15 +16,17 @@ int parse_user_event(struct discover_context *ctx, struct event *event) { + struct discover_boot_option *d_opt; struct boot_option *opt; struct device *dev; const char *p; dev = ctx->device->device; - opt = talloc_zero(dev, struct boot_option); + d_opt = discover_boot_option_create(ctx, ctx->device); + opt = d_opt->option; - if (!opt) + if (!d_opt) goto fail; p = event_get_param(event, "name"); @@ -56,11 +58,11 @@ int parse_user_event(struct discover_context *ctx, struct event *event) opt->description = talloc_asprintf(opt, "%s %s", opt->boot_image_file, opt->boot_args); - discover_context_add_boot_option(ctx, opt); + discover_context_add_boot_option(ctx, d_opt); return 0; fail: - talloc_free(opt); + talloc_free(d_opt); return -1; }