Mirrors/curl
0
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-01-18 17:21:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

build: globally suppress DJGPP warnings in FD_SET()

Browse Source 
Replacing the many local `#pragma` used before this patch,
reducing the number of `__DJGPP__` guards from 58 to 13.

Closes #20299
This commit is contained in:
Viktor Szakats
2026-01-13 22:07:53 +01:00
parent ad8374aedc
commit 0431cbe71a
13 changed files with 13 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMake/PickyWarnings.cmake
View File

@@ -436,6 +436,10 @@ if(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND MSVC)
endforeach() endforeach()
endif() endif()
if(DOS AND CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 10.0)
list(APPEND _picky "-Wno-arith-conversion") # Avoid warnings in DJGPP's built-in FD_SET() macro
endif()
if(_picky_nocheck OR _picky) if(_picky_nocheck OR _picky)
set(_picky_tmp "${_picky_nocheck}" "${_picky}") set(_picky_tmp "${_picky_nocheck}" "${_picky}")
string(REPLACE ";" " " _picky_tmp "${_picky_tmp}") string(REPLACE ";" " " _picky_tmp "${_picky_tmp}")

9
configure.ac
View File

@@ -598,6 +598,15 @@ if test "$compiler_id" = "INTEL_UNIX_C"; then
# #
fi fi
case $host in
*msdosdjgpp)
if test "$compiler_num" -ge "1000"; then
dnl Avoid warnings in DJGPP's built-in FD_SET() macro
CFLAGS="$CFLAGS -Wno-arith-conversion"
fi
;;
esac
CURL_CFLAG_EXTRAS="" CURL_CFLAG_EXTRAS=""
if test "$want_werror" = "yes"; then if test "$want_werror" = "yes"; then
CURL_CFLAG_EXTRAS="-Werror" CURL_CFLAG_EXTRAS="-Werror"

3
docs/examples/sendrecv.c
View File

@@ -36,9 +36,6 @@
*/ */
#ifdef __GNUC__ #ifdef __GNUC__
#pragma GCC diagnostic ignored "-Wsign-conversion" #pragma GCC diagnostic ignored "-Wsign-conversion"
#ifdef __DJGPP__
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
#pragma warning(disable:4127) /* conditional expression is constant */ #pragma warning(disable:4127) /* conditional expression is constant */
#endif #endif

7
lib/cshutdn.c
View File

@@ -480,17 +480,10 @@ void Curl_cshutdn_setfds(struct cshutdn *cshutdn,
curl_socket_t sock = ps.sockets[i]; curl_socket_t sock = ps.sockets[i];
if(!FDSET_SOCK(sock)) if(!FDSET_SOCK(sock))
continue; continue;
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
if(ps.actions[i] & CURL_POLL_IN) if(ps.actions[i] & CURL_POLL_IN)
FD_SET(sock, read_fd_set); FD_SET(sock, read_fd_set);
if(ps.actions[i] & CURL_POLL_OUT) if(ps.actions[i] & CURL_POLL_OUT)
FD_SET(sock, write_fd_set); FD_SET(sock, write_fd_set);
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
if((ps.actions[i] & (CURL_POLL_OUT | CURL_POLL_IN)) && if((ps.actions[i] & (CURL_POLL_OUT | CURL_POLL_IN)) &&
((int)sock > *maxfd)) ((int)sock > *maxfd))
*maxfd = (int)sock; *maxfd = (int)sock;

7
lib/multi.c
View File

@@ -1246,17 +1246,10 @@ CURLMcode curl_multi_fdset(CURLM *m,
if(!FDSET_SOCK(ps.sockets[i])) if(!FDSET_SOCK(ps.sockets[i]))
/* pretend it does not exist */ /* pretend it does not exist */
continue; continue;
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
if(ps.actions[i] & CURL_POLL_IN) if(ps.actions[i] & CURL_POLL_IN)
FD_SET(ps.sockets[i], read_fd_set); FD_SET(ps.sockets[i], read_fd_set);
if(ps.actions[i] & CURL_POLL_OUT) if(ps.actions[i] & CURL_POLL_OUT)
FD_SET(ps.sockets[i], write_fd_set); FD_SET(ps.sockets[i], write_fd_set);
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
if((int)ps.sockets[i] > this_max_fd) if((int)ps.sockets[i] > this_max_fd)
this_max_fd = (int)ps.sockets[i]; this_max_fd = (int)ps.sockets[i];
} }

7
src/tool_cb_rea.c
View File

@@ -65,14 +65,7 @@ static bool waitfd(int waitms, int fd)
timeout.tv_usec = (int)((waitms % 1000) * 1000); timeout.tv_usec = (int)((waitms % 1000) * 1000);
FD_ZERO(&bits); FD_ZERO(&bits);
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
FD_SET(fd, &bits); FD_SET(fd, &bits);
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
if(!select(fd + 1, &bits, NULL, NULL, &timeout)) if(!select(fd + 1, &bits, NULL, NULL, &timeout))
return TRUE; /* timeout */ return TRUE; /* timeout */
return FALSE; return FALSE;

7
tests/libtest/lib530.c
View File

@@ -233,14 +233,7 @@ static void t530_updateFdSet(struct t530_Sockets *sockets, fd_set *fdset,
{ {
int i; int i;
for(i = 0; i < sockets->count; ++i) { for(i = 0; i < sockets->count; ++i) {
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
FD_SET(sockets->sockets[i], fdset); FD_SET(sockets->sockets[i], fdset);
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
if(*maxFd < sockets->sockets[i] + 1) { if(*maxFd < sockets->sockets[i] + 1) {
*maxFd = sockets->sockets[i] + 1; *maxFd = sockets->sockets[i] + 1;
} }

7
tests/libtest/lib582.c
View File

@@ -180,14 +180,7 @@ static void t582_updateFdSet(struct t582_Sockets *sockets, fd_set *fdset,
{ {
int i; int i;
for(i = 0; i < sockets->count; ++i) { for(i = 0; i < sockets->count; ++i) {
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
FD_SET(sockets->sockets[i], fdset); FD_SET(sockets->sockets[i], fdset);
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
if(*maxFd < sockets->sockets[i] + 1) { if(*maxFd < sockets->sockets[i] + 1) {
*maxFd = sockets->sockets[i] + 1; *maxFd = sockets->sockets[i] + 1;
} }

7
tests/libtest/lib758.c
View File

@@ -279,14 +279,7 @@ static void t758_updateFdSet(struct t758_Sockets *sockets, fd_set *fdset,
{ {
int i; int i;
for(i = 0; i < sockets->count; ++i) { for(i = 0; i < sockets->count; ++i) {
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
FD_SET(sockets->sockets[i], fdset); FD_SET(sockets->sockets[i], fdset);
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
if(*maxFd < sockets->sockets[i] + 1) { if(*maxFd < sockets->sockets[i] + 1) {
*maxFd = sockets->sockets[i] + 1; *maxFd = sockets->sockets[i] + 1;
} }

7
tests/server/mqttd.c
View File

@@ -675,14 +675,7 @@ static bool mqttd_incoming(curl_socket_t listenfd)
FD_ZERO(&fds_err); FD_ZERO(&fds_err);
/* there is always a socket to wait for */ /* there is always a socket to wait for */
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
FD_SET(sockfd, &fds_read); FD_SET(sockfd, &fds_read);
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
do { do {
/* select() blocking behavior call on blocking descriptors please */ /* select() blocking behavior call on blocking descriptors please */

28
tests/server/sockfilt.c
View File

@@ -953,14 +953,7 @@ static bool juggle(curl_socket_t *sockfdp,
FD_ZERO(&fds_write); FD_ZERO(&fds_write);
FD_ZERO(&fds_err); FD_ZERO(&fds_err);
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
FD_SET((curl_socket_t)fileno(stdin), &fds_read); FD_SET((curl_socket_t)fileno(stdin), &fds_read);
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
switch(*mode) { switch(*mode) {
@@ -969,14 +962,7 @@ static bool juggle(curl_socket_t *sockfdp,
/* server mode */ /* server mode */
sockfd = listenfd; sockfd = listenfd;
/* there is always a socket to wait for */ /* there is always a socket to wait for */
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
FD_SET(sockfd, &fds_read); FD_SET(sockfd, &fds_read);
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
maxfd = (int)sockfd; maxfd = (int)sockfd;
break; break;
@@ -990,14 +976,7 @@ static bool juggle(curl_socket_t *sockfdp,
} }
else { else {
/* there is always a socket to wait for */ /* there is always a socket to wait for */
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
FD_SET(sockfd, &fds_read); FD_SET(sockfd, &fds_read);
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
maxfd = (int)sockfd; maxfd = (int)sockfd;
} }
break; break;
@@ -1007,14 +986,7 @@ static bool juggle(curl_socket_t *sockfdp,
sockfd = *sockfdp; sockfd = *sockfdp;
/* sockfd turns CURL_SOCKET_BAD when our connection has been closed */ /* sockfd turns CURL_SOCKET_BAD when our connection has been closed */
if(CURL_SOCKET_BAD != sockfd) { if(CURL_SOCKET_BAD != sockfd) {
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
FD_SET(sockfd, &fds_read); FD_SET(sockfd, &fds_read);
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
maxfd = (int)sockfd; maxfd = (int)sockfd;
} }
else { else {

21
tests/server/socksd.c
View File

@@ -649,37 +649,16 @@ static bool socksd_incoming(curl_socket_t listenfd)
FD_ZERO(&fds_err); FD_ZERO(&fds_err);
/* there is always a socket to wait for */ /* there is always a socket to wait for */
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
FD_SET(sockfd, &fds_read); FD_SET(sockfd, &fds_read);
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
for(i = 0; i < 2; i++) { for(i = 0; i < 2; i++) {
if(c[i].used) { if(c[i].used) {
curl_socket_t fd = c[i].clientfd; curl_socket_t fd = c[i].clientfd;
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
FD_SET(fd, &fds_read); FD_SET(fd, &fds_read);
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
if((int)fd > maxfd) if((int)fd > maxfd)
maxfd = (int)fd; maxfd = (int)fd;
fd = c[i].remotefd; fd = c[i].remotefd;
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
FD_SET(fd, &fds_read); FD_SET(fd, &fds_read);
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
if((int)fd > maxfd) if((int)fd > maxfd)
maxfd = (int)fd; maxfd = (int)fd;
} }

56
tests/server/sws.c
View File

@@ -1118,14 +1118,7 @@ static int sws_get_request(curl_socket_t sock, struct sws_httprequest *req)
FD_ZERO(&input); FD_ZERO(&input);
FD_ZERO(&output); FD_ZERO(&output);
got = 0; got = 0;
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
FD_SET(sock, &input); FD_SET(sock, &input);
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
do { do {
logmsg("Wait until readable"); logmsg("Wait until readable");
rc = select((int)sock + 1, &input, &output, NULL, &timeout); rc = select((int)sock + 1, &input, &output, NULL, &timeout);
@@ -1321,14 +1314,7 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port)
timeout.tv_sec = 1; /* 1000 ms */ timeout.tv_sec = 1; /* 1000 ms */
FD_ZERO(&output); FD_ZERO(&output);
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
FD_SET(serverfd, &output); FD_SET(serverfd, &output);
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
while(1) { while(1) {
rc = select((int)serverfd + 1, NULL, &output, NULL, &timeout); rc = select((int)serverfd + 1, NULL, &output, NULL, &timeout);
if(rc < 0 && SOCKERRNO != SOCKEINTR) if(rc < 0 && SOCKERRNO != SOCKEINTR)
@@ -1453,14 +1439,7 @@ static void http_connect(curl_socket_t *infdp,
/* listener socket is monitored to allow client to establish /* listener socket is monitored to allow client to establish
secondary tunnel only when this tunnel is not established secondary tunnel only when this tunnel is not established
and primary one is fully operational */ and primary one is fully operational */
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
FD_SET(rootfd, &input); FD_SET(rootfd, &input);
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
maxfd = rootfd; maxfd = rootfd;
} }
@@ -1470,28 +1449,14 @@ static void http_connect(curl_socket_t *infdp,
if(clientfd[i] != CURL_SOCKET_BAD) { if(clientfd[i] != CURL_SOCKET_BAD) {
if(poll_client_rd[i]) { if(poll_client_rd[i]) {
/* unless told not to do so, monitor readability */ /* unless told not to do so, monitor readability */
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
FD_SET(clientfd[i], &input); FD_SET(clientfd[i], &input);
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
if(clientfd[i] > maxfd) if(clientfd[i] > maxfd)
maxfd = clientfd[i]; maxfd = clientfd[i];
} }
if(poll_client_wr[i] && toc[i]) { if(poll_client_wr[i] && toc[i]) {
/* unless told not to do so, monitor writability /* unless told not to do so, monitor writability
if there is data ready to be sent to client */ if there is data ready to be sent to client */
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
FD_SET(clientfd[i], &output); FD_SET(clientfd[i], &output);
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
if(clientfd[i] > maxfd) if(clientfd[i] > maxfd)
maxfd = clientfd[i]; maxfd = clientfd[i];
} }
@@ -1500,28 +1465,14 @@ static void http_connect(curl_socket_t *infdp,
if(serverfd[i] != CURL_SOCKET_BAD) { if(serverfd[i] != CURL_SOCKET_BAD) {
if(poll_server_rd[i]) { if(poll_server_rd[i]) {
/* unless told not to do so, monitor readability */ /* unless told not to do so, monitor readability */
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
FD_SET(serverfd[i], &input); FD_SET(serverfd[i], &input);
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
if(serverfd[i] > maxfd) if(serverfd[i] > maxfd)
maxfd = serverfd[i]; maxfd = serverfd[i];
} }
if(poll_server_wr[i] && tos[i]) { if(poll_server_wr[i] && tos[i]) {
/* unless told not to do so, monitor writability /* unless told not to do so, monitor writability
if there is data ready to be sent to server */ if there is data ready to be sent to server */
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
FD_SET(serverfd[i], &output); FD_SET(serverfd[i], &output);
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
if(serverfd[i] > maxfd) if(serverfd[i] > maxfd)
maxfd = serverfd[i]; maxfd = serverfd[i];
} }
@@ -2343,14 +2294,7 @@ static int test_sws(int argc, char *argv[])
for(socket_idx = 0; socket_idx < num_sockets; ++socket_idx) { for(socket_idx = 0; socket_idx < num_sockets; ++socket_idx) {
/* Listen on all sockets */ /* Listen on all sockets */
#ifdef __DJGPP__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warith-conversion"
#endif
FD_SET(all_sockets[socket_idx], &input); FD_SET(all_sockets[socket_idx], &input);
#ifdef __DJGPP__
#pragma GCC diagnostic pop
#endif
if(all_sockets[socket_idx] > maxfd) if(all_sockets[socket_idx] > maxfd)
maxfd = all_sockets[socket_idx]; maxfd = all_sockets[socket_idx];
} }