lib/efi: Cleanup read/write routines

[petitboot] / discover / event.c

diff --git a/discover/event.c b/discover/event.c
index 0ccd3910e18396e989fe58ce8e8e423be6716373..ead2fdad88833387768d1489f9cf6d161f35de2c 100644 (file)
--- a/discover/event.c
+++ b/discover/event.c
@@ -2,7 +2,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 #include <string.h>
 
 #include <log/log.h>
@@ -30,14 +29,14 @@ static int event_parse_ad_header(char *buf, int len, enum event_action *action,
        headerlen = strnlen(buf, len);
 
        if (!headerlen) {
-               pb_log("%s: bad header, no data\n", __func__);
+               pb_log_fn("bad header, no data\n");
                return -1;
        }
 
        /* we should see an <action>@<device>\0 at the head of the buffer */
        sep = strchr(buf, '@');
        if (!sep) {
-               pb_log("%s: bad header: %s\n", __func__, buf);
+               pb_log_fn("bad header: %s\n", buf);
                return -1;
        }
 
@@ -48,15 +47,23 @@ static int event_parse_ad_header(char *buf, int len, enum event_action *action,
                *action = EVENT_ACTION_ADD;
        else if (streq(buf, "remove"))
                *action = EVENT_ACTION_REMOVE;
-       else if (streq(buf, "conf"))
-               *action = EVENT_ACTION_CONF;
+       else if (streq(buf, "url"))
+               *action = EVENT_ACTION_URL;
+       else if (streq(buf, "dhcp"))
+               *action = EVENT_ACTION_DHCP;
+       else if (streq(buf, "boot"))
+               *action = EVENT_ACTION_BOOT;
+       else if (streq(buf, "sync"))
+               *action = EVENT_ACTION_SYNC;
+       else if (streq(buf, "plugin"))
+               *action = EVENT_ACTION_PLUGIN;
        else {
-               pb_log("%s: unknown action: %s\n", __func__, buf);
+               pb_log_fn("unknown action: %s\n", buf);
                return -1;
        }
 
        if (!*(sep + 1)) {
-               pb_log("%s: bad device: %s\n", __func__, buf);
+               pb_log_fn("bad device: %s\n", buf);
                return -1;
        }