Commit d94717e0 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

nonblock: call with (void) to show we ignore the return code 

Coverity pointed out several of these.
parent a60825fa

lib/connect.c

+1 −1
Original line number Diff line number Diff line
@@ -1050,7 +1050,7 @@ singleipconnect(struct connectdata *conn, 
  }



  /* set socket non-blocking */

  curlx_nonblock(sockfd, TRUE);

  (void)curlx_nonblock(sockfd, TRUE);



  conn->connecttime = Curl_tvnow();

  if(conn->num_addr > 1)

lib/curl_rtmp.c

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static CURLcode rtmp_connect(struct connectdata *conn, bool *done) 
     !(r->Link.protocol & RTMP_FEATURE_HTTP))

    r->Link.lFlags |= RTMP_LF_BUFX;



  curlx_nonblock(r->m_sb.sb_socket, FALSE);

  (void)curlx_nonblock(r->m_sb.sb_socket, FALSE);

  setsockopt(r->m_sb.sb_socket, SOL_SOCKET, SO_RCVTIMEO,

             (char *)&tv, sizeof(tv));

lib/ftp.c

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ static CURLcode AcceptServerConnect(struct connectdata *conn) 
  infof(data, "Connection accepted from server\n");



  conn->sock[SECONDARYSOCKET] = s;

  curlx_nonblock(s, TRUE); /* enable non-blocking */

  (void)curlx_nonblock(s, TRUE); /* enable non-blocking */

  conn->sock_accepted[SECONDARYSOCKET] = TRUE;



  if(data->set.fsockopt) {

lib/socks.c

+8 −8
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -127,7 +127,7 @@ CURLcode Curl_SOCKS4(const char *proxy_name, 
    return CURLE_OPERATION_TIMEDOUT;

  }



  curlx_nonblock(sock, FALSE);

  (void)curlx_nonblock(sock, FALSE);



  infof(data, "SOCKS4 communication to %s:%d\n", hostname, remote_port);
@@ -335,7 +335,7 @@ CURLcode Curl_SOCKS4(const char *proxy_name, 
    }

  }



  curlx_nonblock(sock, TRUE);

  (void)curlx_nonblock(sock, TRUE);



  return CURLE_OK; /* Proxy was successful! */

}
@@ -396,7 +396,7 @@ CURLcode Curl_SOCKS5(const char *proxy_name, 
    return CURLE_OPERATION_TIMEDOUT;

  }



  curlx_nonblock(sock, TRUE);

  (void)curlx_nonblock(sock, TRUE);



  /* wait until socket gets connected */

  result = Curl_socket_ready(CURL_SOCKET_BAD, sock, timeout);
@@ -427,7 +427,7 @@ CURLcode Curl_SOCKS5(const char *proxy_name, 
  socksreq[3] = 2; /* username/password */

#endif



  curlx_nonblock(sock, FALSE);

  (void)curlx_nonblock(sock, FALSE);



  code = Curl_write_plain(conn, sock, (char *)socksreq, (2 + (int)socksreq[1]),

                          &written);
@@ -436,7 +436,7 @@ CURLcode Curl_SOCKS5(const char *proxy_name, 
    return CURLE_COULDNT_CONNECT;

  }



  curlx_nonblock(sock, TRUE);

  (void)curlx_nonblock(sock, TRUE);



  result = Curl_socket_ready(sock, CURL_SOCKET_BAD, timeout);
@@ -454,7 +454,7 @@ CURLcode Curl_SOCKS5(const char *proxy_name, 
    return CURLE_RECV_ERROR;

  }



  curlx_nonblock(sock, FALSE);

  (void)curlx_nonblock(sock, FALSE);



  result=Curl_blockread_all(conn, sock, (char *)socksreq, 2, &actualread);

  if((result != CURLE_OK) || (actualread != 2)) {
@@ -747,7 +747,7 @@ CURLcode Curl_SOCKS5(const char *proxy_name, 
  }

#endif



  curlx_nonblock(sock, TRUE);

  (void)curlx_nonblock(sock, TRUE);

  return CURLE_OK; /* Proxy was successful! */

}