From aa0e46636a5b71b609a41e9ab97134cd76ac1522 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Tue, 26 Feb 2019 15:01:50 +0000 Subject: Break further lines before not after operators. This patch continues the process of fixing coding style to break lines before not after operators in accordance with the GNU Coding Standards, fixing such issues in a non-exhaustive selection of sysdeps files that had them. Tested for x86_64, and with build-many-glibcs.py. * sysdeps/arm/sysdep.h (#if condition): Break lines before rather than after operators. * sysdeps/mach/hurd/fork.c (__fork): Likewise. * sysdeps/mach/hurd/getcwd.c (__hurd_canonicalize_directory_name_internal): Likewise. * sysdeps/mach/hurd/htl/pt-mutex-consistent.c (pthread_mutex_consistent): Likewise. * sysdeps/mach/hurd/htl/pt-mutex-init.c (_pthread_mutex_init): Likewise. * sysdeps/mach/hurd/htl/pt-mutex-transfer-np.c (__pthread_mutex_transfer_np): Likewise. * sysdeps/mach/hurd/htl/pt-mutex-unlock.c (__pthread_mutex_unlock): Likewise. * sysdeps/mach/hurd/htl/pt-mutex.h (ROBUST_LOCK): Likewise. (mtx_owned_p): Likewise. * sysdeps/mach/hurd/htl/pt-mutexattr-getrobust.c (pthread_mutexattr_getrobust): Likewise. * sysdeps/mach/hurd/i386/init-first.c (init1): Likewise. * sysdeps/mach/hurd/i386/trampoline.c (_hurd_setup_sighandler): Likewise. * sysdeps/mach/hurd/ioctl.c (__ioctl): Likewise. * sysdeps/mach/hurd/jmp-unwind.c (_longjmp_unwind): Likewise. * sysdeps/mach/hurd/kill.c (__kill): Likewise. * sysdeps/mach/hurd/mig-reply.c (__mig_get_reply_port): Likewise. * sysdeps/mach/hurd/ptrace.c (ptrace): Likewise. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Likewise. * sysdeps/unix/sysv/linux/aarch64/sysdep.h (#if condition): Likewise. * sysdeps/unix/sysv/linux/alpha/ioperm.c (process_cpuinfo): Likewise. * sysdeps/unix/sysv/linux/bits/timex.h (STA_RONLY): Likewise. * sysdeps/unix/sysv/linux/csky/sysdep.h (#if condition): Likewise. * sysdeps/unix/sysv/linux/generic/____longjmp_chk.c (____longjmp_chk): Likewise. * sysdeps/unix/sysv/linux/generic/futimesat.c (futimesat): Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h (INTERNAL_SYSCALL): Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h (INTERNAL_SYSCALL): Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c (__get_clockfreq_via_cpuinfo): Likewise. --- sysdeps/unix/sysv/linux/generic/____longjmp_chk.c | 4 ++-- sysdeps/unix/sysv/linux/generic/futimesat.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sysdeps/unix/sysv/linux/generic') diff --git a/sysdeps/unix/sysv/linux/generic/____longjmp_chk.c b/sysdeps/unix/sysv/linux/generic/____longjmp_chk.c index c918616..8c28377 100644 --- a/sysdeps/unix/sysv/linux/generic/____longjmp_chk.c +++ b/sysdeps/unix/sysv/linux/generic/____longjmp_chk.c @@ -49,8 +49,8 @@ void ____longjmp_chk (__jmp_buf env, int val) /* If we we are executing on the alternate stack and within the bounds, do the longjmp. */ - if (ss.ss_flags == SS_ONSTACK && - (this_frame >= ss.ss_sp && this_frame < (ss.ss_sp + ss.ss_size))) + if (ss.ss_flags == SS_ONSTACK + && (this_frame >= ss.ss_sp && this_frame < (ss.ss_sp + ss.ss_size))) __longjmp (env, val); __fortify_fail ("longjmp causes uninitialized stack frame"); diff --git a/sysdeps/unix/sysv/linux/generic/futimesat.c b/sysdeps/unix/sysv/linux/generic/futimesat.c index f809cf6..93abc34 100644 --- a/sysdeps/unix/sysv/linux/generic/futimesat.c +++ b/sysdeps/unix/sysv/linux/generic/futimesat.c @@ -37,8 +37,8 @@ futimesat (int fd, const char *file, const struct timeval tvp[2]) if (tvp) { - if (tvp[0].tv_usec >= 1000000 || tvp[0].tv_usec < 0 || - tvp[1].tv_usec >= 1000000 || tvp[1].tv_usec < 0) + if (tvp[0].tv_usec >= 1000000 || tvp[0].tv_usec < 0 + || tvp[1].tv_usec >= 1000000 || tvp[1].tv_usec < 0) { __set_errno (EINVAL); return -1; -- cgit v1.1