discover: Deprecate 'conf' user event

[petitboot] / discover / user-event.c

diff --git a/discover/user-event.c b/discover/user-event.c
index 6ea754fea808de474368b887a43278aef8248fbb..7ceddb12c7e0b3def7dd4acd9b0795981cc6e43b 100644 (file)
--- a/discover/user-event.c
+++ b/discover/user-event.c
@@ -392,28 +392,6 @@ static int user_event_dhcp(struct user_event *uev, struct event *event)
        return 0;
 }
 
-static int user_event_conf(struct user_event *uev, struct event *event)
-{
-       struct device_handler *handler = uev->handler;
-       struct discover_device *dev;
-       struct pb_url *url;
-       const char *val;
-
-       val = event_get_param(event, "url");
-       if (!val)
-               return 0;
-
-       url = pb_url_parse(event, val);
-       if (!url)
-               return 0;
-
-       dev = discover_device_create(handler, event->device);
-
-       device_handler_conf(handler, dev, url);
-
-       return 0;
-}
-
 static int user_event_add(struct user_event *uev, struct event *event)
 {
        struct device_handler *handler = uev->handler;
@@ -513,13 +491,10 @@ static void user_event_handle_message(struct user_event *uev, char *buf,
                break;
        case EVENT_ACTION_URL:
                result = user_event_url(uev, event);
-               break;
-       case EVENT_ACTION_CONF:
-               result = user_event_conf(uev, event);
-               break;
+               goto out;
        case EVENT_ACTION_DHCP:
                result = user_event_dhcp(uev, event);
-               break;
+               goto out;
        case EVENT_ACTION_BOOT:
                result = user_event_boot(uev, event);
                break;
@@ -530,8 +505,10 @@ static void user_event_handle_message(struct user_event *uev, char *buf,
                break;
        }
 
+       /* user_event_url() and user_event_dhcp() will steal the event context,
+        * but all others still need to free */
        talloc_free(event);
-
+out:
        return;
 }