[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 5/9] linux-user: do_setsockopt: eliminate goto in switch for SO_SN
|
From: |
Richard Henderson |
|
Subject: |
[PULL 5/9] linux-user: do_setsockopt: eliminate goto in switch for SO_SNDTIMEO |
|
Date: |
Wed, 24 Apr 2024 15:51:19 -0700 |
From: Michael Tokarev <mjt@tls.msk.ru>
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>
---
linux-user/syscall.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 1fedf16650..41659b63f5 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -2301,12 +2301,10 @@ static abi_long do_setsockopt(int sockfd, int level,
int optname,
case TARGET_SOL_SOCKET:
switch (optname) {
case TARGET_SO_RCVTIMEO:
+ case TARGET_SO_SNDTIMEO:
{
struct timeval tv;
- optname = SO_RCVTIMEO;
-
-set_timeout:
if (optlen != sizeof(struct target_timeval)) {
return -TARGET_EINVAL;
}
@@ -2315,13 +2313,12 @@ set_timeout:
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)));
return ret;
}
- case TARGET_SO_SNDTIMEO:
- optname = SO_SNDTIMEO;
- goto set_timeout;
case TARGET_SO_ATTACH_FILTER:
{
struct target_sock_fprog *tfprog;
--
2.34.1
- [PULL 0/9] tcg + linux-user patch queue, Richard Henderson, 2024/04/24
- [PULL 1/9] meson: Make DEBUG_REMAP a meson option, Richard Henderson, 2024/04/24
- [PULL 2/9] linux-user: do_setsockopt: fix SOL_ALG.ALG_SET_KEY, Richard Henderson, 2024/04/24
- [PULL 3/9] linux-user: do_setsockopt: make ip_mreq local to the place it is used and inline target_to_host_ip_mreq(), Richard Henderson, 2024/04/24
- [PULL 4/9] linux-user: do_setsockopt: make ip_mreq_source local to the place where it is used, Richard Henderson, 2024/04/24
- [PULL 5/9] linux-user: do_setsockopt: eliminate goto in switch for SO_SNDTIMEO,
Richard Henderson <=
- [PULL 6/9] linux-user: Add FITRIM ioctl, Richard Henderson, 2024/04/24
- [PULL 7/9] target/m68k: Pass semihosting arg to exit, Richard Henderson, 2024/04/24
- [PULL 9/9] target/m68k: Support semihosting on non-ColdFire targets, Richard Henderson, 2024/04/24
- [PULL 8/9] target/m68k: Perform the semihosting test during translate, Richard Henderson, 2024/04/24
- Re: [PULL 0/9] tcg + linux-user patch queue, Richard Henderson, 2024/04/24