Merge branch 't/testsuite'

[paraslash.git] / server.c

diff --git a/server.c b/server.c
index efff208b1bd704a1e5bf64aee32491b514b5b14e..35d6f19137b3a881482df4e65c3945d6bcdb8a78 100644 (file)
--- a/server.c
+++ b/server.c
@@ -147,17 +147,14 @@ static int want_colors(void)
 
 static void init_colors_or_die(void)
 {
 
 static void init_colors_or_die(void)
 {

-       int ret, i;
+       int i;

 
        if (!want_colors())
                return;
        daemon_set_flag(DF_COLOR_LOG);
        daemon_set_default_log_colors();
 
        if (!want_colors())
                return;
        daemon_set_flag(DF_COLOR_LOG);
        daemon_set_default_log_colors();

-       for (i = 0; i < conf.log_color_given; i++) {
-               ret = daemon_set_log_color(conf.log_color_arg[i]);
-               if (ret < 0)
-                       exit(EXIT_FAILURE);
-       }
+       for (i = 0; i < conf.log_color_given; i++)
+               daemon_set_log_color_or_die(conf.log_color_arg[i]);

 }
 
 /*
 }
 
 /*


@@ -429,6 +426,7 @@ static void init_server_command_task(int argc, char **argv)
        if (ret < 0)
                goto err;
        add_close_on_fork_list(sct->listen_fd); /* child doesn't need the listener */
        if (ret < 0)
                goto err;
        add_close_on_fork_list(sct->listen_fd); /* child doesn't need the listener */

+       sprintf(sct->task.status, "server command task");

        register_task(&sct->task);
        return;
 err:
        register_task(&sct->task);
        return;
 err: