* [PATCH] nptl: futex: Provide correct indentation for part of __futex_abstimed_wait_cancelable64
@ 2020-09-08 13:26 Lukasz Majewski
2020-09-08 14:13 ` Adhemerval Zanella
0 siblings, 1 reply; 2+ messages in thread
From: Lukasz Majewski @ 2020-09-08 13:26 UTC (permalink / raw)
To: Joseph Myers, Paul Eggert, Adhemerval Zanella
Cc: Alistair Francis, Arnd Bergmann, Alistair Francis, GNU C Library,
Florian Weimer, Carlos O'Donell, Stepan Golosunov,
Andreas Schwab, Zack Weinberg, Jeff Law, Lukasz Majewski
By mistake the if for calling __futex_abstimed_wait_cancellable32 was
misaligned with the rest of the function body.
---
sysdeps/nptl/futex-internal.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sysdeps/nptl/futex-internal.c b/sysdeps/nptl/futex-internal.c
index 5e52f17dee..de5a9626e3 100644
--- a/sysdeps/nptl/futex-internal.c
+++ b/sysdeps/nptl/futex-internal.c
@@ -67,9 +67,9 @@ __futex_abstimed_wait_cancelable64 (unsigned int* futex_word,
abstime, NULL /* Unused. */,
FUTEX_BITSET_MATCH_ANY);
#ifndef __ASSUME_TIME64_SYSCALLS
-if (err == -ENOSYS)
- err = __futex_abstimed_wait_cancellable32 (futex_word, expected,
- clockid, abstime, private);
+ if (err == -ENOSYS)
+ err = __futex_abstimed_wait_cancellable32 (futex_word, expected,
+ clockid, abstime, private);
#endif
switch (err)
--
2.20.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] nptl: futex: Provide correct indentation for part of __futex_abstimed_wait_cancelable64
2020-09-08 13:26 [PATCH] nptl: futex: Provide correct indentation for part of __futex_abstimed_wait_cancelable64 Lukasz Majewski
@ 2020-09-08 14:13 ` Adhemerval Zanella
0 siblings, 0 replies; 2+ messages in thread
From: Adhemerval Zanella @ 2020-09-08 14:13 UTC (permalink / raw)
To: Lukasz Majewski, Joseph Myers, Paul Eggert
Cc: Alistair Francis, Arnd Bergmann, Alistair Francis, GNU C Library,
Florian Weimer, Carlos O'Donell, Stepan Golosunov,
Andreas Schwab, Zack Weinberg, Jeff Law
On 08/09/2020 10:26, Lukasz Majewski wrote:
> By mistake the if for calling __futex_abstimed_wait_cancellable32 was
> misaligned with the rest of the function body.
LGTM, thanks.
> ---
> sysdeps/nptl/futex-internal.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/sysdeps/nptl/futex-internal.c b/sysdeps/nptl/futex-internal.c
> index 5e52f17dee..de5a9626e3 100644
> --- a/sysdeps/nptl/futex-internal.c
> +++ b/sysdeps/nptl/futex-internal.c
> @@ -67,9 +67,9 @@ __futex_abstimed_wait_cancelable64 (unsigned int* futex_word,
> abstime, NULL /* Unused. */,
> FUTEX_BITSET_MATCH_ANY);
> #ifndef __ASSUME_TIME64_SYSCALLS
> -if (err == -ENOSYS)
> - err = __futex_abstimed_wait_cancellable32 (futex_word, expected,
> - clockid, abstime, private);
> + if (err == -ENOSYS)
> + err = __futex_abstimed_wait_cancellable32 (futex_word, expected,
> + clockid, abstime, private);
Align the clockid the the other arguments as well.
> #endif
>
> switch (err)
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-08 14:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-08 13:26 [PATCH] nptl: futex: Provide correct indentation for part of __futex_abstimed_wait_cancelable64 Lukasz Majewski
2020-09-08 14:13 ` Adhemerval Zanella
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).