From b118597194815910897ccf86d77b8b5a066adf5a Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Fri, 2 Jan 2009 15:30:29 +0900 Subject: Use a list for device->boot_options Makes adding and removing options easier for parsers. Signed-off-by: Jeremy Kerr --- discover/device-handler.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'discover/device-handler.c') diff --git a/discover/device-handler.c b/discover/device-handler.c index 98194ad..1f8938f 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -61,8 +61,6 @@ static struct device device = { .name = "meep", .description = "meep description", .icon_file = "meep.png", - .n_options = 1, - .options = options, }; int device_handler_get_current_devices(struct device_handler *handler, @@ -378,6 +376,7 @@ int device_handler_event(struct device_handler *handler, struct device_handler *device_handler_init(struct discover_server *server) { struct device_handler *handler; + int i; handler = talloc(NULL, struct device_handler); handler->devices = NULL; @@ -388,6 +387,12 @@ struct device_handler *device_handler_init(struct discover_server *server) /* set up our mount point base */ mkdir_recursive(mount_base()); + /* setup out test objects */ + list_init(&device.boot_options); + + for (i = 0; i < sizeof(options) / sizeof(options[0]); i++) + list_add(&device.boot_options, &options[i].list); + return handler; } -- cgit v1.2.1