stat.c: Simplify stat_client_write().

[paraslash.git] / audiod.c

diff --git a/audiod.c b/audiod.c
index f7e481b4c66be206785e1043eb8a59e733938069..dfb61db4c1d811fdedf97d5fa381defc241ae03b 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -119,7 +119,7 @@ int get_audio_format_num(char *name)
 {
        int i;
 
-       while (isspace(*name))
+       while (para_isspace(*name))
                name++;
        FOR_EACH_AUDIO_FORMAT(i)
                if (!strcmp(name, audio_formats[i]))
@@ -869,7 +869,7 @@ static int audiod_get_socket(void)
                PARA_EMERG_LOG("can not listen on socket\n");
                exit(EXIT_FAILURE); /* do not unlink socket */
        }
-       mark_fd_nonblock(fd);
+       mark_fd_nonblocking(fd);
        return fd;
 }
 
@@ -951,7 +951,7 @@ static void close_stat_pipe(void)
                return;
        client_close(stat_task->pcd);
        stat_task->pcd = NULL;
-       for (i = 0; i < NUM_STAT_ITEMS; i++) {
+       FOR_EACH_STATUS_ITEM(i) {
                free(stat_task->stat_item_values[i]);
                stat_task->stat_item_values[i] = NULL;
        }
@@ -961,7 +961,7 @@ static void close_stat_pipe(void)
        audiod_status_dump();
        stat_task->playing = 0;
        stat_task->stat_item_values[SI_BASENAME] = make_message(
-               "%s:no connection to para_server\n",
+               "%s: no connection to para_server\n",
                status_item_list[SI_BASENAME]);
        stat_client_write(stat_task->stat_item_values[SI_BASENAME],
                SI_BASENAME);
@@ -1168,7 +1168,7 @@ int main(int argc, char *argv[])
        register_task(audiod_task);
        s.default_timeout.tv_sec = 0;
        s.default_timeout.tv_usec = 99 * 1000;
-       ret = sched(&s);
+       ret = schedule(&s);
 
        PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
        return EXIT_FAILURE;