Use a list for device->boot_options

[petitboot] / discover / device-handler.c

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 98194ad46cea86434b9fdf8217b8876106cbbe16..1f8938f295b322e68b2df19fb7eeadd8146b1ca1 100644 (file)
--- 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",
        .name = "meep",
        .description = "meep description",
        .icon_file = "meep.png",

-       .n_options = 1,
-       .options = options,

 };
 
 int device_handler_get_current_devices(struct device_handler *handler,
 };
 
 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;
 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;
 
        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());
 
        /* 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;
 }
 
        return handler;
 }