gui: Make some functions return void.
authorAndre Noll <maan@systemlinux.org>
Tue, 13 Mar 2012 20:11:16 +0000 (21:11 +0100)
committerAndre Noll <maan@systemlinux.org>
Sun, 18 Mar 2012 20:07:15 +0000 (21:07 +0100)
All callers of these functions ignore the return value, so get rid
of it.

gui.c

diff --git a/gui.c b/gui.c
index 0316e36..870e976 100644 (file)
--- a/gui.c
+++ b/gui.c
@@ -1054,26 +1054,25 @@ check_return:
 /*
  * read from command pipe and print data to bot window
  */
-static int send_output(void)
+static void send_output(void)
 {
        int ret;
 
        if (command_pipe < 0)
-               return 0;
+               return;
        ret = mark_fd_nonblocking(command_pipe);
        if (ret < 0) {
                close(command_pipe);
-               return ret;
+               return;
        }
        if (do_select(COMMAND_MODE) >= 0)
                PARA_INFO_LOG("command complete");
        else
                PARA_NOTICE_LOG("command aborted");
        print_in_bar(COLOR_MSG, " ");
-       return 1;
 }
 
-static int client_cmd_cmdline(char *cmd)
+static void client_cmd_cmdline(char *cmd)
 {
        int ret, fds[3] = {0, 1, 0};
        char *c = make_message(BINDIR "/para_client -- %s", cmd);
@@ -1083,41 +1082,40 @@ static int client_cmd_cmdline(char *cmd)
        ret = para_exec_cmdline_pid(&cmd_pid, c, fds);
        free(c);
        if (ret < 0)
-               return -1;
+               return;
        command_pipe = fds[1];
-       return send_output();
+       send_output();
 }
 
 /*
  * exec command and print output to bot win
  */
-static int display_cmd(char *cmd)
+static void display_cmd(char *cmd)
 {
        int fds[3] = {0, 1, 0};
 
        print_in_bar(COLOR_MSG, "executing display command, hit any key to abort");
        outputf(COLOR_COMMAND, "%s", cmd);
        if (para_exec_cmdline_pid(&cmd_pid, cmd, fds) < 0)
-               return -1;
+               return;
        command_pipe = fds[1];
-       return send_output();
+       send_output();
 }
 
 /*
  * shutdown curses and stat pipe before executing external commands
  */
-static int external_cmd(char *cmd)
+static void external_cmd(char *cmd)
 {
        int fds[3] = {-1, -1, -1};
 
        if (cmd_pid)
-               return -1;
+               return;
        shutdown_curses();
        para_exec_cmdline_pid(&cmd_pid, cmd, fds);
        cmd_died = 0;
        do_select(EXTERNAL_MODE);
        init_curses();
-       return 0;
 }
 
 static void print_scroll_msg(void)