Add __must_check annotation for mark_fd_nonblocking() and mark_fd_blocking().

[paraslash.git] / http_send.c

diff --git a/http_send.c b/http_send.c
index 2a14f4282e4b453a465dbbfeb6ee16fcf611a726..c1a4fc6af4b72ce20122ef98ec9cf36ce11f1439 100644 (file)
--- a/http_send.c
+++ b/http_send.c
@@ -309,15 +309,13 @@ static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
        }
 }
 
-static int http_open(int port)
+static int http_open(void)
 {
        int ret;
 
-       listen_fd = para_listen(AF_UNSPEC, IPPROTO_TCP, port);
-       if (listen_fd < 0) {
-               http_shutdown_clients();
+       listen_fd = para_listen(AF_UNSPEC, IPPROTO_TCP, conf.http_port_arg);
+       if (listen_fd < 0)
                return listen_fd;
-       }
        ret = mark_fd_nonblocking(listen_fd);
        if (ret < 0) {
                PARA_EMERG_LOG("%s\n", para_strerror(-ret));
@@ -331,7 +329,7 @@ static int http_com_on(__a_unused struct sender_command_data *scd)
 {
        if (listen_fd >= 0)
                return 1;
-       return http_open(conf.http_port_arg);
+       return http_open();
 }
 
 static int http_com_off(__a_unused struct sender_command_data *scd)
@@ -431,6 +429,6 @@ void http_send_init(struct sender *s)
        self = s;
        acl_init(&http_acl, conf.http_access_arg, conf.http_access_given);
        if (!conf.http_no_autostart_given)
-               http_open(conf.http_port_arg); /* ignore errors */
+               http_open(); /* ignore errors */
        PARA_DEBUG_LOG("%s", "http sender init complete\n");
 }