netifd: Do not return values in void function

[project/netifd.git] / main.c

diff --git a/main.c b/main.c
index 804424e8937b32f1ccae6dbfc00cb015182dbaef..e5260b5eafa9324861da347472572eee0ddab714 100644 (file)
--- a/main.c
+++ b/main.c
@@ -57,6 +57,7 @@ static bool use_syslog = true;
 static void
 netifd_delete_process(struct netifd_process *proc)
 {
+       while (ustream_poll(&proc->log.stream));
        list_del(&proc->list);
        ustream_free(&proc->log.stream);
        close(proc->log.fd.fd);
@@ -127,9 +128,9 @@ netifd_process_cb(struct uloop_process *proc, int ret)
        struct netifd_process *np;
        np = container_of(proc, struct netifd_process, uloop);
 
-       while (ustream_poll(&np->log.stream));
        netifd_delete_process(np);
-       return np->cb(np, ret);
+       np->cb(np, ret);
+       return;
 }
 
 int
@@ -233,10 +234,10 @@ static int usage(const char *progname)
                " -p <path>:            Path to netifd addons (default: %s)\n"
                " -c <path>:            Path to UCI configuration\n"
                " -h <path>:            Path to the hotplug script\n"
+               "                       (default: "DEFAULT_HOTPLUG_PATH")\n"
                " -r <path>:            Path to resolv.conf\n"
                " -l <level>:           Log output level (default: %d)\n"
                " -S:                   Use stderr instead of syslog for log messages\n"
-               "                       (default: "DEFAULT_HOTPLUG_PATH")\n"
                "\n", progname, main_path, DEFAULT_LOG_LEVEL);
 
        return 1;
@@ -303,8 +304,8 @@ int main(int argc, char **argv)
                        break;
                case 'l':
                        log_level = atoi(optarg);
-                       if (log_level >= ARRAY_SIZE(log_class))
-                               log_level = ARRAY_SIZE(log_class) - 1;
+                       if (log_level >= (int)ARRAY_SIZE(log_class))
+                               log_level = (int)ARRAY_SIZE(log_class) - 1;
                        break;
 #ifndef DUMMY_MODE
                case 'S':