diff options
author | Eric Botcazou <ebotcazou@adacore.com> | 2020-05-24 15:13:05 +0200 |
---|---|---|
committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2020-07-08 10:55:55 -0400 |
commit | 19ddfb317fc57239cc4f7144683c060bdb8317e7 (patch) | |
tree | 3ee7d0ab5d2b0af4c7996ead0c6fb9be185b1df2 /gcc/ada/socket.c | |
parent | 9e8102b350742f09e8c122f3d3ee3f9f2ce4abd4 (diff) | |
download | gcc-19ddfb317fc57239cc4f7144683c060bdb8317e7.zip gcc-19ddfb317fc57239cc4f7144683c060bdb8317e7.tar.gz gcc-19ddfb317fc57239cc4f7144683c060bdb8317e7.tar.bz2 |
[Ada] Fix warnings in C runtime files on Windows
gcc/ada/
* adaint.h (__gnat_expect_portable_execvp): Fix prototype.
(__gnat_expect_poll): Likewise.
* expect.c [_WIN32]: Include adaint.h file.
(__gnat_waitpid): Remove useless variable.
(__gnat_expect_portable_execvp): Add ATTRIBUTE_UNUSED on parameter.
* raise-gcc.c [SEH] (__gnat_personality_v0): Add ATTRIBUTE_UNUSED.
* socket.c [_WIN32] (__gnat_getservbyport): Add ATTRIBUTE_UNUSED on
a couple of parameters.
(__gnat_gethostbyname): Likewise.
(__gnat_gethostbyaddr): Likewise.
(__gnat_getservbyname): Likewise.
(__gnat_last_socket_in_set): Use variables local to loops.
(__gnat_socket_ioctl): Cast 3rd parameter to proper type if _WIN32.
(__gnat_inet_pton): Cast 2nd parameter to proper type if _WIN32.
* sysdep.c (__gnat_localtime_tzoff): Remove superfluous test.
* terminals.c [_WIN32]: Include io.h file.
(is_gui_app): Remove useless variables and fix unsigned comparison.
(nt_spawnve): Add ATTRIBUTE_UNUSED on first parameter. Initialize a
local variable and remove others that are useless. Add missing cast
(__gnat_setup_child_communication): Remove useless variable and call
Use proper formatting string in call to sprintf.
(__gnat_setup_parent_communication): Cast to proper type.
(find_child_console): Fix prototype and remove useless variable.
(find_process_handle): Likewise.
(_gnat_interrupt_process): Move to after __gnat_interrupt_pid.
(__gnat_reset_tty): Add ATTRIBUTE_UNUSED on parameter, remove return
(__gnat_setup_winsize): Add ATTRIBUTE_UNUSED on all parameters.
Diffstat (limited to 'gcc/ada/socket.c')
-rw-r--r-- | gcc/ada/socket.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/gcc/ada/socket.c b/gcc/ada/socket.c index dd73c6a..96baebf 100644 --- a/gcc/ada/socket.c +++ b/gcc/ada/socket.c @@ -333,8 +333,8 @@ __gnat_getservbyport (int port, const char *proto, } #else int -__gnat_gethostbyname (const char *name, - struct hostent *ret, char *buf, size_t buflen, +__gnat_gethostbyname (const char *name, struct hostent *ret, + char *buf ATTRIBUTE_UNUSED, size_t buflen ATTRIBUTE_UNUSED, int *h_errnop) { struct hostent *rh; @@ -349,8 +349,8 @@ __gnat_gethostbyname (const char *name, } int -__gnat_gethostbyaddr (const char *addr, int len, int type, - struct hostent *ret, char *buf, size_t buflen, +__gnat_gethostbyaddr (const char *addr, int len, int type, struct hostent *ret, + char *buf ATTRIBUTE_UNUSED, size_t buflen ATTRIBUTE_UNUSED, int *h_errnop) { struct hostent *rh; @@ -365,8 +365,8 @@ __gnat_gethostbyaddr (const char *addr, int len, int type, } int -__gnat_getservbyname (const char *name, const char *proto, - struct servent *ret, char *buf, size_t buflen) +__gnat_getservbyname (const char *name, const char *proto, struct servent *ret, + char *buf ATTRIBUTE_UNUSED, size_t buflen ATTRIBUTE_UNUSED) { struct servent *rh; rh = getservbyname (name, proto); @@ -377,8 +377,8 @@ __gnat_getservbyname (const char *name, const char *proto, } int -__gnat_getservbyport (int port, const char *proto, - struct servent *ret, char *buf, size_t buflen) +__gnat_getservbyport (int port, const char *proto, struct servent *ret, + char *buf ATTRIBUTE_UNUSED, size_t buflen ATTRIBUTE_UNUSED) { struct servent *rh; rh = getservbyport (port, proto); @@ -397,19 +397,18 @@ __gnat_getservbyport (int port, const char *proto, void __gnat_last_socket_in_set (fd_set *set, int *last) { - int s; int l; l = -1; #ifdef _WIN32 /* More efficient method for NT. */ - for (s = 0; s < set->fd_count; s++) + for (unsigned int s = 0; s < set->fd_count; s++) if ((int) set->fd_array[s] > l) l = set->fd_array[s]; #else - for (s = *last; s != -1; s--) + for (int s = *last; s != -1; s--) if (FD_ISSET (s, set)) { l = s; @@ -517,7 +516,7 @@ __gnat_get_h_errno (void) { int __gnat_socket_ioctl (int fd, IOCTL_Req_T req, int *arg) { #if defined (_WIN32) - return ioctlsocket (fd, req, arg); + return ioctlsocket (fd, req, (unsigned long *)arg); #elif defined (__APPLE__) /* * On Darwin, req is an unsigned long, and we want to convert without sign @@ -553,7 +552,8 @@ __gnat_inet_pton (int af, const char *src, void *dst) { int rc; ss.ss_family = af; - rc = WSAStringToAddressA (src, af, NULL, (struct sockaddr *)&ss, &sslen); + rc = WSAStringToAddressA ((char *)src, af, NULL, (struct sockaddr *)&ss, + &sslen); if (rc == 0) { switch (af) { case AF_INET: |