Various fixups and checks to make scan-build happy

[petitboot] / discover / event.c

diff --git a/discover/event.c b/discover/event.c
index 242ae81bf1a756306c97db74ee0e69d62ae4d487..4c46d41373c5972f893d067c22409eebbb1fb241 100644 (file)
--- a/discover/event.c
+++ b/discover/event.c
@@ -29,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;
        }
 
@@ -49,21 +49,21 @@ static int event_parse_ad_header(char *buf, int len, enum event_action *action,
                *action = EVENT_ACTION_REMOVE;
        else if (streq(buf, "url"))
                *action = EVENT_ACTION_URL;
-       else if (streq(buf, "conf"))
-               *action = EVENT_ACTION_CONF;
        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;
        }
 
@@ -80,7 +80,7 @@ static int event_parse_ad_header(char *buf, int len, enum event_action *action,
 static void event_parse_params(struct event *event, const char *buf, int len)
 {
        int param_len, name_len, value_len;
-       struct param *param;
+       struct event_param *param;
        char *sep;
 
        for (; len > 0; len -= param_len + 1, buf += param_len + 1) {
@@ -95,13 +95,12 @@ static void event_parse_params(struct event *event, const char *buf, int len)
 
                /* update the params array */
                event->params = talloc_realloc(event, event->params,
-                                       struct param, ++event->n_params);
+                                       struct event_param, ++event->n_params);
                param = &event->params[event->n_params - 1];
 
                sep = memchr(buf, '=', param_len);
                if (!sep) {
                        name_len = param_len;
-                       value_len = 0;
                        param->value = "";
                } else {
                        name_len = sep - buf;
@@ -150,7 +149,7 @@ const char *event_get_param(const struct event *event, const char *name)
 
 void event_set_param(struct event *event, const char *name, const char *value)
 {
-       struct param *param;
+       struct event_param *param;
        int i;
 
        /* if it's already present, replace the value of the old param */
@@ -165,7 +164,7 @@ void event_set_param(struct event *event, const char *name, const char *value)
 
        /* not found - create a new param */
        event->params = talloc_realloc(event, event->params,
-                               struct param, ++event->n_params);
+                               struct event_param, ++event->n_params);
        param = &event->params[event->n_params - 1];
 
        param->name = talloc_strdup(event, name);