[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/35] linux-user: do_setsockopt: eliminate goto in switch for SO_
From: |
Richard Henderson |
Subject: |
[PULL 06/35] linux-user: do_setsockopt: eliminate goto in switch for SO_SNDTIMEO |
Date: |
Mon, 8 Apr 2024 07:49:00 -1000 |
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 00/35] misc patch queue, Richard Henderson, 2024/04/08
- [PULL 01/35] tcg/optimize: Do not attempt to constant fold neg_vec, Richard Henderson, 2024/04/08
- [PULL 02/35] linux-user: Fix waitid return of siginfo_t and rusage, Richard Henderson, 2024/04/08
- [PULL 04/35] 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/08
- [PULL 03/35] linux-user: do_setsockopt: fix SOL_ALG.ALG_SET_KEY, Richard Henderson, 2024/04/08
- [PULL 06/35] linux-user: do_setsockopt: eliminate goto in switch for SO_SNDTIMEO,
Richard Henderson <=
- [PULL 08/35] linux-user: replace calloc() with g_new0(), Richard Henderson, 2024/04/08
- [PULL 07/35] linux-user: Add FITRIM ioctl, Richard Henderson, 2024/04/08
- [PULL 09/35] target/hppa: Fix IIAOQ, IIASQ for pa2.0, Richard Henderson, 2024/04/08
- [PULL 10/35] target/sh4: mac.w: memory accesses are 16-bit words, Richard Henderson, 2024/04/08
- [PULL 11/35] target/sh4: Merge mach and macl into a union, Richard Henderson, 2024/04/08
- [PULL 05/35] linux-user: do_setsockopt: make ip_mreq_source local to the place where it is used, Richard Henderson, 2024/04/08
- [PULL 12/35] target/sh4: Fix mac.l with saturation enabled, Richard Henderson, 2024/04/08
- [PULL 14/35] target/sh4: add missing CHECK_NOT_DELAY_SLOT, Richard Henderson, 2024/04/08
- [PULL 13/35] target/sh4: Fix mac.w with saturation enabled, Richard Henderson, 2024/04/08
- [PULL 16/35] target/m68k: Pass semihosting arg to exit, Richard Henderson, 2024/04/08