Skip to content

Commit

Permalink
linux-user: do_setsockopt: eliminate goto in switch for SO_SNDTIMEO
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michael Tokarev authored and rth7680 committed Apr 6, 2024
1 parent 01c2896 commit 819358f
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions linux-user/syscall.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -2315,13 +2313,12 @@ static abi_long do_setsockopt(int sockfd, int level, int optname,
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;
Expand Down

0 comments on commit 819358f

Please sign in to comment.