diff options
Diffstat (limited to 'discover')
| -rw-r--r-- | discover/device-handler.c | 24 | ||||
| -rw-r--r-- | discover/event-parser.c | 6 | ||||
| -rw-r--r-- | discover/parser.h | 3 |
3 files changed, 18 insertions, 15 deletions
diff --git a/discover/device-handler.c b/discover/device-handler.c index ab27b51..4ba7405 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -347,23 +347,25 @@ static int handle_add_user_event(struct device_handler *handler, assert(event->device); - device = talloc_zero(handler, struct device); + device = device_handler_find(handler, event->device); - if (!device) - goto fail; + if (!device) { + device = talloc_zero(handler, struct device); - device->id = talloc_strdup(device, event->device); - list_init(&device->boot_options); + if (!device) + goto fail; - parse_user_event(device, event); + device->id = talloc_strdup(device, event->device); + list_init(&device->boot_options); - discover_server_notify_device_add(handler->server, device); + /* add device to handler device array */ + device_handler_add(handler, device); - list_for_each_entry(&device->boot_options, opt, list) - discover_server_notify_boot_option_add(handler->server, opt); + discover_server_notify_device_add(handler->server, device); + } - /* add device to handler device array */ - device_handler_add(handler, device); + opt = parse_user_event(device, event); + discover_server_notify_boot_option_add(handler->server, opt); return 0; diff --git a/discover/event-parser.c b/discover/event-parser.c index 1eec5c9..c09c5ba 100644 --- a/discover/event-parser.c +++ b/discover/event-parser.c @@ -13,7 +13,7 @@ * Understands params: name, image, args. */ -int parse_user_event(struct device *device, struct event *event) +struct boot_option *parse_user_event(struct device *device, struct event *event) { struct boot_option *opt; const char *p; @@ -54,9 +54,9 @@ int parse_user_event(struct device *device, struct event *event) device_add_boot_option(device, opt); - return 0; + return opt; fail: talloc_free(opt); - return -1; + return NULL; } diff --git a/discover/parser.h b/discover/parser.h index 589c6ff..a80d1b5 100644 --- a/discover/parser.h +++ b/discover/parser.h @@ -21,6 +21,7 @@ enum generic_icon_type { void parser_init(void); void iterate_parsers(struct discover_context *ctx); -int parse_user_event(struct device *device, struct event *event); +struct boot_option *parse_user_event(struct device *device, + struct event *event); #endif /* _PARSER_H */ |
