christoph/wamr
1
Fork 0
Code Releases Activity

socket: Explicit narrowing type cast and add missing static keywords (#1539)

Browse Source 
While compiling the file wasi_socket_ext.c with pedantic options (typically
`-Wimplicit-int-conversion` and `-Wmissing-prototypes`), some warnings are raised.

This PR addresses those warnings by adding missing static statements before
functions and explicitly casting a narrowing conversion.

And fix the error handling after calling getpeername.
This commit is contained in:
Jämes Ménétrey
2022-09-29 16:44:57 +02:00
committed by GitHub
parent 3fad613ea2
commit 5b10d4e630
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/iwasm/libraries/lib-socket/src/wasi/wasi_socket_ext.c
View File

@ -145,8 +145,9 @@ accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
error = __wasi_sock_accept(sockfd, 0, &new_sockfd); error = __wasi_sock_accept(sockfd, 0, &new_sockfd);
HANDLE_ERROR(error) HANDLE_ERROR(error)
error = getpeername(new_sockfd, addr, addrlen); if (getpeername(new_sockfd, addr, addrlen) == -1) {
HANDLE_ERROR(error) return -1;
}
return new_sockfd; return new_sockfd;
} }
@ -556,7 +557,7 @@ freeaddrinfo(struct addrinfo *res)
free(res); free(res);
} }
struct timeval static struct timeval
time_us_to_timeval(uint64_t time_us) time_us_to_timeval(uint64_t time_us)
{ {
struct timeval tv; struct timeval tv;
@ -565,13 +566,13 @@ time_us_to_timeval(uint64_t time_us)
return tv; return tv;
} }
uint64_t static uint64_t
timeval_to_time_us(struct timeval tv) timeval_to_time_us(struct timeval tv)
{ {
return (tv.tv_sec * 1000000UL) + tv.tv_usec; return (tv.tv_sec * 1000000UL) + tv.tv_usec;
} }
int static int
get_sol_socket_option(int sockfd, int optname, void *__restrict optval, get_sol_socket_option(int sockfd, int optname, void *__restrict optval,
socklen_t *__restrict optlen) socklen_t *__restrict optlen)
{ {
@ -638,7 +639,7 @@ get_sol_socket_option(int sockfd, int optname, void *__restrict optval,
} }
} }
int static int
get_ipproto_tcp_option(int sockfd, int optname, void *__restrict optval, get_ipproto_tcp_option(int sockfd, int optname, void *__restrict optval,
socklen_t *__restrict optlen) socklen_t *__restrict optlen)
{ {
@ -677,7 +678,7 @@ get_ipproto_tcp_option(int sockfd, int optname, void *__restrict optval,
} }
} }
int static int
get_ipproto_ip_option(int sockfd, int optname, void *__restrict optval, get_ipproto_ip_option(int sockfd, int optname, void *__restrict optval,
socklen_t *__restrict optlen) socklen_t *__restrict optlen)
{ {
@ -707,7 +708,7 @@ get_ipproto_ip_option(int sockfd, int optname, void *__restrict optval,
} }
} }
int static int
get_ipproto_ipv6_option(int sockfd, int optname, void *__restrict optval, get_ipproto_ipv6_option(int sockfd, int optname, void *__restrict optval,
socklen_t *__restrict optlen) socklen_t *__restrict optlen)
{ {
@ -754,7 +755,7 @@ getsockopt(int sockfd, int level, int optname, void *__restrict optval,
} }
} }
int static int
set_sol_socket_option(int sockfd, int optname, const void *optval, set_sol_socket_option(int sockfd, int optname, const void *optval,
socklen_t optlen) socklen_t optlen)
{ {
@ -838,7 +839,7 @@ set_sol_socket_option(int sockfd, int optname, const void *optval,
} }
} }
int static int
set_ipproto_tcp_option(int sockfd, int optname, const void *optval, set_ipproto_tcp_option(int sockfd, int optname, const void *optval,
socklen_t optlen) socklen_t optlen)
{ {
@ -878,7 +879,7 @@ set_ipproto_tcp_option(int sockfd, int optname, const void *optval,
} }
} }
int static int
set_ipproto_ip_option(int sockfd, int optname, const void *optval, set_ipproto_ip_option(int sockfd, int optname, const void *optval,
socklen_t optlen) socklen_t optlen)
{ {
@ -931,7 +932,7 @@ set_ipproto_ip_option(int sockfd, int optname, const void *optval,
} }
} }
int static int
set_ipproto_ipv6_option(int sockfd, int optname, const void *optval, set_ipproto_ipv6_option(int sockfd, int optname, const void *optval,
socklen_t optlen) socklen_t optlen)
{ {