use para_fd_set also in gui.c and in http_send.c
authorAndre <maan@p133.(none)>
Wed, 19 Apr 2006 01:57:59 +0000 (03:57 +0200)
committerAndre <maan@p133.(none)>
Wed, 19 Apr 2006 01:57:59 +0000 (03:57 +0200)
gui.c
http_send.c

diff --git a/gui.c b/gui.c
index 0babfa8..49f8f46 100644 (file)
--- a/gui.c
+++ b/gui.c
@@ -886,22 +886,15 @@ repeat:
        /* audiod pipe */
        if (audiod_pipe < 0)
                audiod_pipe = open_audiod_pipe();
-       /* FIXME: para_fd_set */
-       if (audiod_pipe >= 0) {
-               FD_SET(audiod_pipe, &rfds);
-               max_fileno = PARA_MAX(max_fileno, audiod_pipe);
-       }
-
+       if (audiod_pipe >= 0)
+               para_fd_set(audiod_pipe, &rfds, &max_fileno);
        /* signal pipe */
-       FD_SET(signal_pipe, &rfds);
-       max_fileno = PARA_MAX(max_fileno, signal_pipe);
+       para_fd_set(signal_pipe, &rfds, &max_fileno);
        /* command pipe only for COMMAND_MODE */
-       if (command_pipe >= 0 && mode == COMMAND_MODE) {
-               FD_SET(command_pipe, &rfds);
-               max_fileno = PARA_MAX(max_fileno, command_pipe);
-       }
+       if (command_pipe >= 0 && mode == COMMAND_MODE)
+               para_fd_set(command_pipe, &rfds, &max_fileno);
        if (curses_active)
-               FD_SET(STDIN_FILENO, &rfds);
+               para_fd_set(STDIN_FILENO, &rfds, &max_fileno);
        ret = para_select(max_fileno + 1, &rfds, NULL, &tv);
 //     PARA_DEBUG_LOG("select returned %d\n", ret);
        if (ret <= 0)
index bb9534c..285215f 100644 (file)
@@ -29,6 +29,7 @@
 #include "error.h"
 #include "net.h"
 #include "string.h"
+#include "fd.h"
 
 /** \cond convert sock_addr_in to ascii */
 #define CLIENT_ADDR(hc) inet_ntoa((hc)->addr.sin_addr)
@@ -346,7 +347,6 @@ err_out:
        free(hc);
 }
 
-/* FIXME: use para_fdset */
 static void http_pre_select(struct audio_format *af, int *max_fileno, fd_set *rfds,
                fd_set *wfds)
 {
@@ -354,8 +354,7 @@ static void http_pre_select(struct audio_format *af, int *max_fileno, fd_set *rf
 
        if (server_fd < 0)
                return;
-       FD_SET(server_fd, rfds);
-       *max_fileno = PARA_MAX(*max_fileno, server_fd);
+       para_fd_set(server_fd, rfds, max_fileno);
        list_for_each_entry_safe(hc, tmp, &clients, node) {
                //PARA_DEBUG_LOG("hc %p on fd %d: status %d\n", hc, hc->fd, hc->status);
                hc->check_r = 0;
@@ -365,21 +364,18 @@ static void http_pre_select(struct audio_format *af, int *max_fileno, fd_set *rf
                case HTTP_READY_TO_STREAM:
                        break;
                case HTTP_CONNECTED: /* need to recv get request */
-                       FD_SET(hc->fd, rfds);
-                       *max_fileno = PARA_MAX(*max_fileno, hc->fd);
+                       para_fd_set(hc->fd, rfds, max_fileno);
                        hc->check_r = 1;
                        break;
                case HTTP_GOT_GET_REQUEST: /* need to send ok msg */
                case HTTP_INVALID_GET_REQUEST: /* need to send err msg */
-                       FD_SET(hc->fd, wfds);
-                       *max_fileno = PARA_MAX(*max_fileno, hc->fd);
+                       para_fd_set(hc->fd, wfds, max_fileno);
                        hc->check_w = 1;
                        break;
                case HTTP_SENT_OK_MSG:
                        if (!af || !afs_playing())
                                break; /* wait until server starts playing */
-                       FD_SET(hc->fd, wfds);
-                       *max_fileno = PARA_MAX(*max_fileno, hc->fd);
+                       para_fd_set(hc->fd, wfds, max_fileno);
                        hc->check_w = 1;
                        break;
                }