From e4f5bd235894c11823ac1befe8c8c43063cad026 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Thu, 14 Mar 2013 14:18:54 +0800 Subject: discover: Introduce a container type for boot options This change introduces a new type, struct discover_boot_option. Like struct discover_device adds discover-specific data to struct device, struct discover_boot_option allows the discover server to store more than just the boot option strings for a boot option. Signed-off-by: Jeremy Kerr --- discover/event-parser.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'discover/event-parser.c') 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; } -- cgit v1.1