audiod: Properly prefix uptime string.

[paraslash.git] / audiod_command.c

diff --git a/audiod_command.c b/audiod_command.c
index ca1bff5b807de5b75b833740bc5ac84c90345bb5..48c276e4640ee3ffdb3e4b20ff5fe162f9b4296c 100644 (file)
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -187,10 +187,11 @@ int com_stat(int fd, int argc, char **argv)
                int slot_num = get_play_time_slot_num();
                char *ts = get_time_string(slot_num);
                if (ts) {
+                       PARA_ERROR_LOG("play time: %s\n", ts);
                        ret = client_write(fd, ts);
+                       free(ts);
                        if (ret < 0)
                                goto out;
-                       free(ts);
                }
        }
        if (mask & (one << SI_AUDIOD_UPTIME)) {
@@ -199,23 +200,23 @@ int com_stat(int fd, int argc, char **argv)
                        status_item_list[SI_AUDIOD_UPTIME], us);
                free(us);
                ret = client_write(fd, tmp);
+               free(tmp);
                if (ret < 0)
                        goto out;
-               free(tmp);
        }
        if (mask & (one << SI_AUDIOD_STATUS)) {
                char *s = audiod_status_string();
                ret = client_write(fd, s);
+               free(s);
                if (ret < 0)
                        goto out;
-               free(s);
        }
        if (mask & (one << SI_DECODER_FLAGS)) {
                char *df = decoder_flags();
                ret = client_write(fd, df);
+               free(df);
                if (ret < 0)
                        goto out;
-               free(df);
        }
        FOR_EACH_STATUS_ITEM(i) {
                char *tmp, *v;
@@ -439,14 +440,14 @@ void audiod_status_dump(void)
                        free(new);
        }
 
-       new = uptime_str();
+       tmp = uptime_str();
+       new = make_message("%s: %s\n", status_item_list[SI_AUDIOD_UPTIME],
+               tmp);
+       free(tmp);
        old = stat_item_values[SI_AUDIOD_UPTIME];
        if (!old || strcmp(old, new)) {
                free(old);
-               tmp = make_message("%s: %s\n",
-                       status_item_list[SI_AUDIOD_UPTIME], new);
-               stat_client_write(tmp, SI_AUDIOD_UPTIME);
-               free(tmp);
+               stat_client_write(new, SI_AUDIOD_UPTIME);
                stat_item_values[SI_AUDIOD_UPTIME] = new;
        } else
                free(new);