Merge branch 'refs/heads/t/si_conversion'

[paraslash.git] / audioc.c

diff --git a/audioc.c b/audioc.c
index f2e20bab468a42c14fdba8e72e7165f7e1c6b30e..ed39ce6efa942e58773d891e2ffb28acc39eecf3 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] == '-')
@@ -132,7 +132,6 @@ static void grab_completer(struct i9e_completion_info *ci,
        i9e_complete_option(opts, ci, cr);
 }
 
-I9E_DUMMY_COMPLETER(SUPERCOMMAND_UNAVAILABLE);
 static struct i9e_completer audiod_completers[] = {
 #define LSG_AUDIOD_CMD_CMD(_name) {.name = #_name, \
        .completer = _name ## _completer}
@@ -200,7 +199,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 +216,6 @@ static int audioc_i9e_line_handler(char *line)
        return 1;
 close:
        close(at->fd);
-out:
-       free(args);
        return ret;
 }
 
@@ -334,7 +331,7 @@ static void handle_help_flag(void)
  *
  * \return EXIT_SUCCESS or EXIT_FAILURE.
  *
- * \sa send_cred_buffer(), para_audioc(1), para_audiod(1).
+ * \sa \ref send_cred_buffer(), para_audioc(1), para_audiod(1).
  */
 int main(int argc, char *argv[])
 {