mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux-user: do_setsockopt: eliminate goto in switch for SO_SNDTIMEO

Browse Source 
There's identical code for SO_SNDTIMEO and SO_RCVTIMEO, currently
implemented using an ugly goto into another switch case.  Eliminate
that using arithmetic if, making code flow more natural.

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Message-Id: <20240331100737.2724186-5-mjt@tls.msk.ru>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Michael Tokarev 2024-03-31 13:07:37 +03:00 committed by Richard Henderson
parent 166bd92e3b
commit 88a722b6ad
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
linux-user/syscall.c
View File

@ -2301,12 +2301,10 @@ static abi_long do_setsockopt(int sockfd, int level, int optname,
case TARGET_SOL_SOCKET: case TARGET_SOL_SOCKET:
switch (optname) { switch (optname) {
case TARGET_SO_RCVTIMEO: case TARGET_SO_RCVTIMEO:
case TARGET_SO_SNDTIMEO:
{ {
struct timeval tv; struct timeval tv;
optname = SO_RCVTIMEO;
set_timeout:
if (optlen != sizeof(struct target_timeval)) { if (optlen != sizeof(struct target_timeval)) {
return -TARGET_EINVAL; return -TARGET_EINVAL;
} }
@ -2315,13 +2313,12 @@ set_timeout:
return -TARGET_EFAULT; return -TARGET_EFAULT;
} }
ret = get_errno(setsockopt(sockfd, SOL_SOCKET, optname, ret = get_errno(setsockopt(sockfd, SOL_SOCKET,
optname == TARGET_SO_RCVTIMEO ?
SO_RCVTIMEO : SO_SNDTIMEO,
&tv, sizeof(tv))); &tv, sizeof(tv)));
return ret; return ret;
} }
case TARGET_SO_SNDTIMEO:
optname = SO_SNDTIMEO;
goto set_timeout;
case TARGET_SO_ATTACH_FILTER: case TARGET_SO_ATTACH_FILTER:
{ {
struct target_sock_fprog *tfprog; struct target_sock_fprog *tfprog;