Define status items in para.h.

[paraslash.git] / audioc.c

diff --git a/audioc.c b/audioc.c
index f2e20bab468a42c14fdba8e72e7165f7e1c6b30e..2711ac1a0cc21c7ff41ef22769e304b5ffb87506 100644 (file)
--- a/audioc.c
+++ b/audioc.c
@@ -116,7 +116,7 @@ static void version_completer(struct i9e_completion_info *ci,
 static void stat_completer(struct i9e_completion_info *ci,
                struct i9e_completion_result *cr)
 {
-       char *sia[] = {STATUS_ITEM_ARRAY NULL};
+       char *sia[] = {STATUS_ITEMS NULL};
        char *opts[] = {LSG_AUDIOD_CMD_STAT_OPTS, NULL};
 
        if (ci->word_num <= 2 && ci->word && ci->word[0] == '-')
@@ -200,7 +200,7 @@ static int audioc_i9e_line_handler(char *line)
        ret = connect_audiod(socket_name, args);
        free(args);
        if (ret < 0)
-               goto out;
+               return ret;
        at->fd = ret;
        ret = mark_fd_nonblocking(at->fd);
        if (ret < 0)
@@ -217,8 +217,6 @@ static int audioc_i9e_line_handler(char *line)
        return 1;
 close:
        close(at->fd);
-out:
-       free(args);
        return ret;
 }