Turn PARA_STRERROR into an inline function.

[paraslash.git] / audiod_command.c

diff --git a/audiod_command.c b/audiod_command.c
index a225b76b83f848c5f9ec31b8a141a64d932212ee..773bba8b07e1e1c06468d79cedb4a7f115aeec42 100644 (file)
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -259,8 +259,7 @@ int com_stat(int fd, __a_unused int argc, __a_unused char **argv)
                        goto out;
                free(df);
        }
                        goto out;
                free(df);
        }

-
-       for (i = 0; i < NUM_STAT_ITEMS; i++) {
+       FOR_EACH_STATUS_ITEM(i) {

                char *tmp, *v;
                if (!((1 << i) & mask))
                        continue;
                char *tmp, *v;
                if (!((1 << i) & mask))
                        continue;


@@ -462,7 +461,7 @@ out:
        free(buf);
        free(argv);
        if (clifd > 0 && ret < 0 && ret != -E_CLIENT_WRITE) {
        free(buf);
        free(argv);
        if (clifd > 0 && ret < 0 && ret != -E_CLIENT_WRITE) {

-               char *tmp = make_message("%s\n", PARA_STRERROR(-ret));
+               char *tmp = make_message("%s\n", para_strerror(-ret));

                client_write(clifd, tmp);
                free(tmp);
                close(clifd);
                client_write(clifd, tmp);
                free(tmp);
                close(clifd);


@@ -529,7 +528,7 @@ void dump_empty_status(void)
 {
        int i;
 
 {
        int i;
 

-       FOR_EACH_STAT_ITEM(i) {
+       FOR_EACH_STATUS_ITEM(i) {

                char *tmp = make_message("%s:\n", status_item_list[i]);
                stat_client_write(tmp, i);
                free(tmp);
                char *tmp = make_message("%s:\n", status_item_list[i]);
                stat_client_write(tmp, i);
                free(tmp);