diff options
| author | Viktor Szakats <commit@vsz.me> | 2020-10-16 07:15:48 +0000 |
|---|---|---|
| committer | Viktor Szakats <commit@vsz.me> | 2020-10-16 07:15:48 +0000 |
| commit | e34959c0b959020819a9ddd64dffa5bccc49c689 (patch) | |
| tree | 120168e6b8725219609f836d8fdb77ec7972bcc8 | |
| parent | 769c9a4eecba87c366ae8490ceeb9a02c5c6813e (diff) | |
| download | curl-e34959c0b959020819a9ddd64dffa5bccc49c689.tar.gz | |
http3: fix two build errors, silence warnings
* fix two build errors due to mismatch between function
declarations and their definitions
* silence two mismatched signs warnings via casts
Approved-by: Daniel Stenberg
Closes #6093
| -rw-r--r-- | lib/quic.h | 2 | ||||
| -rw-r--r-- | lib/vquic/ngtcp2.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/quic.h b/lib/quic.h index 8e7df90ea..de6b5825d 100644 --- a/lib/quic.h +++ b/lib/quic.h @@ -41,7 +41,7 @@ CURLcode Curl_quic_connect(struct connectdata *conn, const struct sockaddr *addr, socklen_t addrlen); CURLcode Curl_quic_is_connected(struct connectdata *conn, - curl_socket_t sockfd, + int sockindex, bool *connected); int Curl_quic_ver(char *p, size_t len); CURLcode Curl_quic_done_sending(struct connectdata *conn); diff --git a/lib/vquic/ngtcp2.c b/lib/vquic/ngtcp2.c index c076b7c3e..526d9383f 100644 --- a/lib/vquic/ngtcp2.c +++ b/lib/vquic/ngtcp2.c @@ -1715,7 +1715,8 @@ CURLcode Curl_quic_is_connected(struct connectdata *conn, } -static CURLcode ng_process_ingress(struct connectdata *conn, int sockfd, +static CURLcode ng_process_ingress(struct connectdata *conn, + curl_socket_t sockfd, struct quicsocket *qs) { ssize_t recvd; @@ -1730,7 +1731,7 @@ static CURLcode ng_process_ingress(struct connectdata *conn, int sockfd, for(;;) { remote_addrlen = sizeof(remote_addr); - while((recvd = recvfrom(sockfd, buf, bufsize, 0, + while((recvd = recvfrom(sockfd, (char *)buf, bufsize, 0, (struct sockaddr *)&remote_addr, &remote_addrlen)) == -1 && SOCKERRNO == EINTR) @@ -1870,7 +1871,7 @@ static CURLcode ng_flush_egress(struct connectdata *conn, int sockfd, } memcpy(&remote_addr, ps.path.remote.addr, ps.path.remote.addrlen); - while((sent = send(sockfd, out, outlen, 0)) == -1 && + while((sent = send(sockfd, (const char *)out, outlen, 0)) == -1 && SOCKERRNO == EINTR) ; |