discover: remove (unused) duplicate struct mount_map

[petitboot] / discover / device-handler.c

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 12bc40f7283a83bf24dac77e3e4f0f353deb55af..9589bb20d16c0e8ac57f390138aafca4ccd0b2be 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -33,11 +33,6 @@ struct device_handler {
        struct list contexts;
 };
 
-struct mount_map {
-       char *device_path;
-       char *mount_point;
-};
-
 /**
  * device_handler_add - Add a device to the handler device array.
  */
@@ -201,7 +196,7 @@ static int mount_device(struct discover_context *ctx)
        argv[4] = "ro";
        argv[5] = NULL;
 
-       if (pb_run_cmd(argv, 1)) {
+       if (pb_run_cmd(argv, 1, 0)) {
 
                /* Retry mount without ro option. */
 
@@ -210,7 +205,7 @@ static int mount_device(struct discover_context *ctx)
                argv[2] = ctx->mount_path;
                argv[3] = NULL;
 
-               if (pb_run_cmd(argv, 1))
+               if (pb_run_cmd(argv, 1, 0))
                        goto out_rmdir;
        }
 
@@ -387,46 +382,31 @@ static int handle_remove_user_event(struct device_handler *handler,
        return 0;
 }
 
+typedef int (*event_handler)(struct device_handler *, struct event *);
+
+static event_handler handlers[EVENT_TYPE_MAX][EVENT_ACTION_MAX] = {
+       [EVENT_TYPE_UDEV] = {
+               [EVENT_ACTION_ADD]      = handle_add_udev_event,
+               [EVENT_ACTION_REMOVE]   = handle_remove_udev_event,
+       },
+       [EVENT_TYPE_USER] = {
+               [EVENT_ACTION_ADD]      = handle_add_user_event,
+               [EVENT_ACTION_REMOVE]   = handle_remove_user_event,
+       }
+};
+
 int device_handler_event(struct device_handler *handler,
                struct event *event)
 {
-       int rc = 0;
-
-       switch (event->type) {
-       case EVENT_TYPE_UDEV:
-               switch (event->action) {
-               case EVENT_ACTION_ADD:
-                       rc = handle_add_udev_event(handler, event);
-                       break;
-               case EVENT_ACTION_REMOVE:
-                       rc = handle_remove_udev_event(handler, event);
-                       break;
-               default:
-                       pb_log("%s unknown action: %d\n", __func__,
-                               event->action);
-                       break;
-               }
-               break;
-       case EVENT_TYPE_USER:
-               switch (event->action) {
-               case EVENT_ACTION_ADD:
-                       rc = handle_add_user_event(handler, event);
-                       break;
-               case EVENT_ACTION_REMOVE:
-                       rc = handle_remove_user_event(handler, event);
-                       break;
-               default:
-                       pb_log("%s unknown action: %d\n", __func__,
-                               event->action);
-                       break;
-               }
-               break;
-       default:
-               pb_log("%s unknown type: %d\n", __func__, event->type);
-               break;
+       if (event->type >= EVENT_TYPE_MAX ||
+                       event->action >= EVENT_ACTION_MAX ||
+                       !handlers[event->type][event->action]) {
+               pb_log("%s unknown type/action: %d/%d\n", __func__,
+                               event->type, event->action);
+               return 0;
        }
 
-       return rc;
+       return handlers[event->type][event->action](handler, event);
 }
 
 struct device_handler *device_handler_init(struct discover_server *server)