@@ -98,7 +98,7 @@ static curl_socket_t opensocket_callback(void *clientp, curlsocktype purpose,
9898 stat_connection_opened (client -> stat );
9999 }
100100
101- #if defined( IP_TOS )
101+ #ifdef IP_TOS
102102 if (purpose != CURLSOCKTYPE_IPCXN ) {
103103 return sock ;
104104 }
@@ -107,7 +107,7 @@ static curl_socket_t opensocket_callback(void *clientp, curlsocktype purpose,
107107 setsockopt (sock , IPPROTO_IP , IP_TOS ,
108108 & client -> opt -> dscp , sizeof (client -> opt -> dscp ));
109109 }
110- #if defined( IPV6_TCLASS )
110+ #ifdef IPV6_TCLASS
111111 else if (addr -> family == AF_INET6 ) {
112112 setsockopt (sock , IPPROTO_IPV6 , IPV6_TCLASS ,
113113 & client -> opt -> dscp , sizeof (client -> opt -> dscp ));
@@ -148,7 +148,7 @@ static void https_log_data(int level, struct https_fetch_ctx *ctx,
148148 const size_t width = 0x10 ;
149149
150150 for (size_t i = 0 ; i < size ; i += width ) {
151- char hex [3 * width + 1 ];
151+ char hex [( 3 * width ) + 1 ];
152152 char str [width + 1 ];
153153 size_t hex_off = 0 ;
154154 size_t str_off = 0 ;
@@ -660,8 +660,8 @@ static void https_client_multi_init(https_client_t *c, struct curl_slist *header
660660 c -> header_list = header_list ;
661661
662662 ASSERT_CURL_MULTI_SETOPT (c -> curlm , CURLMOPT_PIPELINING , CURLPIPE_MULTIPLEX );
663- ASSERT_CURL_MULTI_SETOPT (c -> curlm , CURLMOPT_MAX_TOTAL_CONNECTIONS , HTTPS_CONNECTION_LIMIT );
664- ASSERT_CURL_MULTI_SETOPT (c -> curlm , CURLMOPT_MAX_HOST_CONNECTIONS , HTTPS_CONNECTION_LIMIT );
663+ ASSERT_CURL_MULTI_SETOPT (c -> curlm , CURLMOPT_MAX_TOTAL_CONNECTIONS , ( long ) HTTPS_CONNECTION_LIMIT );
664+ ASSERT_CURL_MULTI_SETOPT (c -> curlm , CURLMOPT_MAX_HOST_CONNECTIONS , ( long ) HTTPS_CONNECTION_LIMIT );
665665 ASSERT_CURL_MULTI_SETOPT (c -> curlm , CURLMOPT_SOCKETDATA , c );
666666 ASSERT_CURL_MULTI_SETOPT (c -> curlm , CURLMOPT_SOCKETFUNCTION , multi_sock_cb );
667667 ASSERT_CURL_MULTI_SETOPT (c -> curlm , CURLMOPT_TIMERDATA , c );
0 commit comments