From 8299ef3d81140a3baf65dd810a0ab78082b2cd75 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 25 Jul 2025 19:51:42 +0200 Subject: [PATCH] os: xtrans: fix shadowed variable `arg` is also a parameter of that functions, so we really shouldn't also have a local variable by the same name. Signed-off-by: Enrico Weigelt, metux IT consult --- os/Xtrans.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/os/Xtrans.c b/os/Xtrans.c index 0433d08a4c..b28a8a2726 100644 --- a/os/Xtrans.c +++ b/os/Xtrans.c @@ -596,15 +596,10 @@ int _XSERVTransSetOption (XtransConnInfo ciptr, int option, int arg) #else #if defined(WIN32) { -#ifdef WIN32 - u_long arg; -#else - int arg; -#endif - arg = 1; + u_long arg_ret = 1; /* IBM TCP/IP understands this option too well: it causes _XSERVTransRead to fail * eventually with EWOULDBLOCK */ - ret = ioctl (fd, FIONBIO, &arg); + ret = ioctl (fd, FIONBIO, &arg_ret); } #else ret = fcntl (fd, F_GETFL, 0); @@ -613,7 +608,7 @@ int _XSERVTransSetOption (XtransConnInfo ciptr, int option, int arg) #else ret = fcntl (fd, F_SETFL, ret | O_NDELAY); #endif -#endif /* AIXV3 || uniosu */ +#endif /* WIN32 */ #endif /* FIOSNBIO */ #endif /* O_NONBLOCK */ break;