aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/mach/hurd
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2019-03-07 20:20:25 +0000
committerJoseph Myers <joseph@codesourcery.com>2019-03-07 20:20:25 +0000
commitc5f65462a29fa4b7caa9026b36b2792d79b16d1d (patch)
tree2c380bd19a34653cda14db6c74618ca2f5c761b7 /sysdeps/mach/hurd
parent27a2f2f34c9e77815c6367cf670e24cbac0db7c0 (diff)
downloadglibc-c5f65462a29fa4b7caa9026b36b2792d79b16d1d.tar
glibc-c5f65462a29fa4b7caa9026b36b2792d79b16d1d.tar.gz
glibc-c5f65462a29fa4b7caa9026b36b2792d79b16d1d.tar.bz2
glibc-c5f65462a29fa4b7caa9026b36b2792d79b16d1d.zip
Break lines before not after operators, batch 4.
This patch fixes further coding style issues where code should have broken lines before operators in accordance with the GNU Coding Standards but instead was breaking lines after them. Tested for x86_64, and with build-many-glibcs.py. * stdio-common/vfscanf-internal.c (ARG): Break lines before rather than after operators. * sysdeps/mach/hurd/setitimer.c (timer_thread): Likewise. (setitimer_locked): Likewise. * sysdeps/mach/hurd/sigaction.c (__sigaction): Likewise. * sysdeps/mach/hurd/sigaltstack.c (__sigaltstack): Likewise. * sysdeps/mach/pagecopy.h (PAGE_COPY_FWD): Likewise. * sysdeps/mach/thread_state.h (machine_get_basic_state): Likewise. * sysdeps/powerpc/powerpc64/tst-ucontext-ppc64-vscr.c (PPC_CPU_SUPPORTED): Likewise. * sysdeps/unix/sysv/linux/alpha/a.out.h (N_TXTOFF): Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/overflow.h (stat_overflow): Likewise. (statfs_overflow): Likewise. * sysdeps/unix/sysv/linux/tst-personality.c (do_test): Likewise. * sysdeps/unix/sysv/linux/tst-ttyname.c (eq_ttyname): Likewise. (eq_ttyname_r): Likewise. (run_chroot_tests): Likewise.
Diffstat (limited to 'sysdeps/mach/hurd')
-rw-r--r--sysdeps/mach/hurd/setitimer.c12
-rw-r--r--sysdeps/mach/hurd/sigaction.c12
-rw-r--r--sysdeps/mach/hurd/sigaltstack.c5
3 files changed, 15 insertions, 14 deletions
diff --git a/sysdeps/mach/hurd/setitimer.c b/sysdeps/mach/hurd/setitimer.c
index 1e8b40de4c..61e37c5f5d 100644
--- a/sysdeps/mach/hurd/setitimer.c
+++ b/sysdeps/mach/hurd/setitimer.c
@@ -89,8 +89,8 @@ timer_thread (void)
err = __mach_msg (&msg.header,
MACH_RCV_MSG|MACH_RCV_TIMEOUT|MACH_RCV_INTERRUPT,
0, 0, _hurd_itimer_port,
- _hurd_itimerval.it_value.tv_sec * 1000 +
- _hurd_itimerval.it_value.tv_usec / 1000,
+ _hurd_itimerval.it_value.tv_sec * 1000
+ + _hurd_itimerval.it_value.tv_usec / 1000,
MACH_PORT_NULL);
switch (err)
{
@@ -278,8 +278,8 @@ setitimer_locked (const struct itimerval *new, struct itimerval *old,
kernel context so that when the thread is resumed, mach_msg
will return to timer_thread (below) and it will fetch new
values from _hurd_itimerval. */
- if ((err = __thread_suspend (_hurd_itimer_thread)) ||
- (err = __thread_abort (_hurd_itimer_thread)))
+ if ((err = __thread_suspend (_hurd_itimer_thread))
+ || (err = __thread_abort (_hurd_itimer_thread)))
/* If we can't save it for later, nuke it. */
kill_itimer_thread ();
else
@@ -287,8 +287,8 @@ setitimer_locked (const struct itimerval *new, struct itimerval *old,
}
}
/* See if the timeout changed. If so, we must alert the itimer thread. */
- else if (remaining.tv_sec != newval.it_value.tv_sec ||
- remaining.tv_usec != newval.it_value.tv_usec)
+ else if (remaining.tv_sec != newval.it_value.tv_sec
+ || remaining.tv_usec != newval.it_value.tv_usec)
{
/* The timeout value is changing. Tell the itimer thread to
reexamine it and start counting down. If the itimer thread is
diff --git a/sysdeps/mach/hurd/sigaction.c b/sysdeps/mach/hurd/sigaction.c
index 5e6626df33..ae23e22054 100644
--- a/sysdeps/mach/hurd/sigaction.c
+++ b/sysdeps/mach/hurd/sigaction.c
@@ -30,10 +30,10 @@ __sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
struct sigaction a, old;
sigset_t pending;
- if (sig <= 0 || sig >= NSIG ||
- (act != NULL && act->sa_handler != SIG_DFL &&
- ((__sigmask (sig) & _SIG_CANT_MASK) ||
- act->sa_handler == SIG_ERR)))
+ if (sig <= 0 || sig >= NSIG
+ || (act != NULL && act->sa_handler != SIG_DFL
+ && ((__sigmask (sig) & _SIG_CANT_MASK)
+ || act->sa_handler == SIG_ERR)))
{
errno = EINVAL;
return -1;
@@ -51,8 +51,8 @@ __sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
if (act != NULL)
ss->actions[sig] = a;
- if (act != NULL && sig == SIGCHLD &&
- (a.sa_flags & SA_NOCLDSTOP) != (old.sa_flags & SA_NOCLDSTOP))
+ if (act != NULL && sig == SIGCHLD
+ && (a.sa_flags & SA_NOCLDSTOP) != (old.sa_flags & SA_NOCLDSTOP))
{
__spin_unlock (&ss->lock);
diff --git a/sysdeps/mach/hurd/sigaltstack.c b/sysdeps/mach/hurd/sigaltstack.c
index 02bdfdd4d5..fc1a9e1bd9 100644
--- a/sysdeps/mach/hurd/sigaltstack.c
+++ b/sysdeps/mach/hurd/sigaltstack.c
@@ -36,8 +36,9 @@ __sigaltstack (const stack_t *argss, stack_t *oss)
s = _hurd_self_sigstate ();
__spin_lock (&s->lock);
- if (argss != NULL &&
- (ss.ss_flags & SS_DISABLE) && (s->sigaltstack.ss_flags & SS_ONSTACK))
+ if (argss != NULL
+ && (ss.ss_flags & SS_DISABLE)
+ && (s->sigaltstack.ss_flags & SS_ONSTACK))
{
/* Can't disable a stack that is in use. */
__spin_unlock (&s->lock);