Break more lines before not after operators.

This patch makes further coding style fixes where code was breaking
lines after an operator, contrary to the GNU Coding Standards.  As
with the previous patch, it is limited to files following a reasonable
approximation to GNU style already, and is not exhaustive; more such
issues remain to be fixed.

Tested for x86_64, and with build-many-glibcs.py.

	* dirent/dirent.h [!_DIRENT_HAVE_D_NAMLEN
	&& _DIRENT_HAVE_D_RECLEN] (_D_ALLOC_NAMLEN): Break lines before
	rather than after operators.
	* elf/cache.c (print_cache): Likewise.
	* gshadow/fgetsgent_r.c (__fgetsgent_r): Likewise.
	* htl/pt-getattr.c (__pthread_getattr_np): Likewise.
	* hurd/hurdinit.c (_hurd_setproc): Likewise.
	* hurd/hurdkill.c (_hurd_sig_post): Likewise.
	* hurd/hurdlookup.c (__file_name_lookup_under): Likewise.
	* hurd/hurdsig.c (_hurd_internal_post_signal): Likewise.
	(reauth_proc): Likewise.
	* hurd/lookup-at.c (__file_name_lookup_at): Likewise.
	(__file_name_split_at): Likewise.
	(__directory_name_split_at): Likewise.
	* hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Likewise.
	* hurd/port2fd.c (_hurd_port2fd): Likewise.
	* iconv/gconv_dl.c (do_print): Likewise.
	* inet/netinet/in.h (struct sockaddr_in): Likewise.
	* libio/wstrops.c (_IO_wstr_seekoff): Likewise.
	* locale/setlocale.c (new_composite_name): Likewise.
	* malloc/memusagestat.c (main): Likewise.
	* misc/fstab.c (fstab_convert): Likewise.
	* nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock_usercnt):
	Likewise.
	* nss/nss_compat/compat-grp.c (getgrent_next_nss): Likewise.
	(getgrent_next_file): Likewise.
	(internal_getgrnam_r): Likewise.
	(internal_getgrgid_r): Likewise.
	* nss/nss_compat/compat-initgroups.c (getgrent_next_nss):
	Likewise.
	(internal_getgrent_r): Likewise.
	* nss/nss_compat/compat-pwd.c (getpwent_next_nss_netgr): Likewise.
	(getpwent_next_nss): Likewise.
	(getpwent_next_file): Likewise.
	(internal_getpwnam_r): Likewise.
	(internal_getpwuid_r): Likewise.
	* nss/nss_compat/compat-spwd.c (getspent_next_nss_netgr):
	Likewise.
	(getspent_next_nss): Likewise.
	(internal_getspnam_r): Likewise.
	* pwd/fgetpwent_r.c (__fgetpwent_r): Likewise.
	* shadow/fgetspent_r.c (__fgetspent_r): Likewise.
	* string/strchr.c (STRCHR): Likewise.
	* string/strchrnul.c (STRCHRNUL): Likewise.
	* sysdeps/aarch64/fpu/fpu_control.h (_FPU_FPCR_IEEE): Likewise.
	* sysdeps/aarch64/sfp-machine.h (_FP_CHOOSENAN): Likewise.
	* sysdeps/csky/dl-machine.h (elf_machine_rela): Likewise.
	* sysdeps/generic/memcopy.h (PAGE_COPY_FWD_MAYBE): Likewise.
	* sysdeps/generic/symbol-hacks.h (__stack_chk_fail_local):
	Likewise.
	* sysdeps/gnu/netinet/ip_icmp.h (ICMP_INFOTYPE): Likewise.
	* sysdeps/gnu/updwtmp.c (TRANSFORM_UTMP_FILE_NAME): Likewise.
	* sysdeps/gnu/utmp_file.c (TRANSFORM_UTMP_FILE_NAME): Likewise.
	* sysdeps/hppa/jmpbuf-unwind.h (_JMPBUF_UNWINDS): Likewise.
	* sysdeps/mach/hurd/bits/stat.h (S_ISPARE): Likewise.
	* sysdeps/mach/hurd/dl-sysdep.c (_dl_sysdep_start): Likewise.
	(open_file): Likewise.
	* sysdeps/mach/hurd/htl/pt-mutexattr-setprotocol.c
	(pthread_mutexattr_setprotocol): Likewise.
	* sysdeps/mach/hurd/ioctl.c (__ioctl): Likewise.
	* sysdeps/mach/hurd/mmap.c (__mmap): Likewise.
	* sysdeps/mach/hurd/ptrace.c (ptrace): Likewise.
	* sysdeps/mach/hurd/spawni.c (__spawni): Likewise.
	* sysdeps/microblaze/dl-machine.h (elf_machine_type_class):
	Likewise.
	(elf_machine_rela): Likewise.
	* sysdeps/mips/mips32/sfp-machine.h (_FP_CHOOSENAN): Likewise.
	* sysdeps/mips/mips64/sfp-machine.h (_FP_CHOOSENAN): Likewise.
	* sysdeps/mips/sys/asm.h (multiple #if conditionals): Likewise.
	* sysdeps/posix/rename.c (rename): Likewise.
	* sysdeps/powerpc/novmx-sigjmp.c (__novmx__sigjmp_save): Likewise.
	* sysdeps/powerpc/sigjmp.c (__vmx__sigjmp_save): Likewise.
	* sysdeps/s390/fpu/fenv_libc.h (FPC_VALID_MASK): Likewise.
	* sysdeps/s390/utf8-utf16-z9.c (gconv_end): Likewise.
	* sysdeps/unix/grantpt.c (grantpt): Likewise.
	* sysdeps/unix/sysv/linux/a.out.h (N_TXTOFF): Likewise.
	* sysdeps/unix/sysv/linux/updwtmp.c (TRANSFORM_UTMP_FILE_NAME):
	Likewise.
	* sysdeps/unix/sysv/linux/utmp_file.c (TRANSFORM_UTMP_FILE_NAME):
	Likewise.
	* sysdeps/x86/cpu-features.c (get_common_indices): Likewise.
	* time/tzfile.c (__tzfile_compute): Likewise.

30 files changed, 120 insertions, 107 deletions

diff --git a/sysdeps/aarch64/fpu/fpu_control.h b/sysdeps/aarch64/fpu/fpu_control.h
index f46a751..554040c 100644
--- a/sysdeps/aarch64/fpu/fpu_control.h
+++ b/sysdeps/aarch64/fpu/fpu_control.h
@@ -75,9 +75,9 @@
 #define _FPU_FPCR_MASK_IOE 0x0100
 
 #define _FPU_FPCR_IEEE                       \
-  (_FPU_DEFAULT  | _FPU_FPCR_MASK_IXE |	     \
-   _FPU_FPCR_MASK_UFE | _FPU_FPCR_MASK_OFE | \
-   _FPU_FPCR_MASK_DZE | _FPU_FPCR_MASK_IOE)
+  (_FPU_DEFAULT  | _FPU_FPCR_MASK_IXE	     \
+   | _FPU_FPCR_MASK_UFE | _FPU_FPCR_MASK_OFE \
+   | _FPU_FPCR_MASK_DZE | _FPU_FPCR_MASK_IOE)
 
 #define _FPU_FPSR_IEEE 0
 
diff --git a/sysdeps/aarch64/sfp-machine.h b/sysdeps/aarch64/sfp-machine.h
index 3e96995..a9ecdbf 100644
--- a/sysdeps/aarch64/sfp-machine.h
+++ b/sysdeps/aarch64/sfp-machine.h
@@ -31,8 +31,8 @@
    NaNs is sNaN,  in which case the result is NANSIGN/NANFRAC.  */
 #define _FP_CHOOSENAN(fs, wc, R, X, Y, OP)			\
   do {								\
-    if ((_FP_FRAC_HIGH_RAW_##fs(X) |				\
-	 _FP_FRAC_HIGH_RAW_##fs(Y)) & _FP_QNANBIT_##fs)		\
+    if ((_FP_FRAC_HIGH_RAW_##fs(X)				\
+	 | _FP_FRAC_HIGH_RAW_##fs(Y)) & _FP_QNANBIT_##fs)	\
       {								\
 	R##_s = _FP_NANSIGN_##fs;				\
         _FP_FRAC_SET_##wc(R,_FP_NANFRAC_##fs);			\
diff --git a/sysdeps/csky/dl-machine.h b/sysdeps/csky/dl-machine.h
index e670d84..1ed58a2 100644
--- a/sysdeps/csky/dl-machine.h
+++ b/sysdeps/csky/dl-machine.h
@@ -282,8 +282,8 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
 	   break;
 	case R_CKCORE_PCREL_IMM26BY2:
 	{
-	  unsigned int offset = ((value + reloc->r_addend -
-				  (unsigned int)reloc_addr) >> 1);
+	  unsigned int offset = ((value + reloc->r_addend
+				  - (unsigned int)reloc_addr) >> 1);
 	  insn_opcode = (*opcode16_addr << 16) | (*(opcode16_addr + 1));
 	  if (offset > 0x3ffffff){
 	    const char *strtab;
diff --git a/sysdeps/generic/memcopy.h b/sysdeps/generic/memcopy.h
index 9f17476..7b179d5 100644
--- a/sysdeps/generic/memcopy.h
+++ b/sysdeps/generic/memcopy.h
@@ -164,8 +164,8 @@ extern void _wordcopy_bwd_dest_aligned (long int, long int, size_t)
 # define PAGE_COPY_FWD_MAYBE(dstp, srcp, nbytes_left, nbytes)		      \
   do									      \
     {									      \
-      if ((nbytes) >= PAGE_COPY_THRESHOLD &&				      \
-	  PAGE_OFFSET ((dstp) - (srcp)) == 0) 				      \
+      if ((nbytes) >= PAGE_COPY_THRESHOLD				      \
+	  && PAGE_OFFSET ((dstp) - (srcp)) == 0)			      \
 	{								      \
 	  /* The amount to copy is past the threshold for copying	      \
 	     pages virtually with kernel VM operations, and the		      \
diff --git a/sysdeps/generic/symbol-hacks.h b/sysdeps/generic/symbol-hacks.h
index d614c09..3586e6e 100644
--- a/sysdeps/generic/symbol-hacks.h
+++ b/sysdeps/generic/symbol-hacks.h
@@ -11,8 +11,8 @@ asm ("memcpy = __GI_memcpy");
    __stack_chk_fail itself is a global symbol, exported from libc.so,
    and cannot be made hidden.  */
 
-# if IS_IN (libc) && defined SHARED && \
-  defined STACK_PROTECTOR_LEVEL && STACK_PROTECTOR_LEVEL > 0
+# if IS_IN (libc) && defined SHARED \
+  && defined STACK_PROTECTOR_LEVEL && STACK_PROTECTOR_LEVEL > 0
 asm (".hidden __stack_chk_fail_local\n"
      "__stack_chk_fail = __stack_chk_fail_local");
 # endif
diff --git a/sysdeps/gnu/netinet/ip_icmp.h b/sysdeps/gnu/netinet/ip_icmp.h
index e6b00fc..2e2bfe9 100644
--- a/sysdeps/gnu/netinet/ip_icmp.h
+++ b/sysdeps/gnu/netinet/ip_icmp.h
@@ -269,11 +269,11 @@ struct icmp
 #define	ICMP_PARAMPROB_OPTABSENT 1		/* req. opt. absent */
 
 #define	ICMP_INFOTYPE(type) \
-	((type) == ICMP_ECHOREPLY || (type) == ICMP_ECHO || \
-	(type) == ICMP_ROUTERADVERT || (type) == ICMP_ROUTERSOLICIT || \
-	(type) == ICMP_TSTAMP || (type) == ICMP_TSTAMPREPLY || \
-	(type) == ICMP_IREQ || (type) == ICMP_IREQREPLY || \
-	(type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY)
+	((type) == ICMP_ECHOREPLY || (type) == ICMP_ECHO \
+	 || (type) == ICMP_ROUTERADVERT || (type) == ICMP_ROUTERSOLICIT \
+	 || (type) == ICMP_TSTAMP || (type) == ICMP_TSTAMPREPLY \
+	 || (type) == ICMP_IREQ || (type) == ICMP_IREQREPLY \
+	 || (type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY)
 
 #endif /* __USE_MISC */
 
diff --git a/sysdeps/gnu/updwtmp.c b/sysdeps/gnu/updwtmp.c
index e2eae25..bec9921 100644
--- a/sysdeps/gnu/updwtmp.c
+++ b/sysdeps/gnu/updwtmp.c
@@ -19,11 +19,13 @@
 #include <string.h>
 #include <unistd.h>
 
-#define TRANSFORM_UTMP_FILE_NAME(file_name) \
-    ((strcmp (file_name, _PATH_UTMP "x") == 0 \
-      && __access (_PATH_UTMP "x", F_OK) != 0) ? _PATH_UTMP : \
-     ((strcmp (file_name, _PATH_WTMP "x") == 0 \
-       && __access (_PATH_WTMP "x", F_OK) != 0) ? _PATH_WTMP : \
-      file_name))
+#define TRANSFORM_UTMP_FILE_NAME(file_name)	\
+  ((strcmp (file_name, _PATH_UTMP "x") == 0	\
+    && __access (_PATH_UTMP "x", F_OK) != 0)	\
+   ? _PATH_UTMP					\
+   : ((strcmp (file_name, _PATH_WTMP "x") == 0	\
+       && __access (_PATH_WTMP "x", F_OK) != 0)	\
+      ? _PATH_WTMP				\
+      : file_name))
 
 #include <login/updwtmp.c>
diff --git a/sysdeps/gnu/utmp_file.c b/sysdeps/gnu/utmp_file.c
index c8a9502..737ff29 100644
--- a/sysdeps/gnu/utmp_file.c
+++ b/sysdeps/gnu/utmp_file.c
@@ -19,11 +19,13 @@
 #include <string.h>
 #include <unistd.h>
 
-#define TRANSFORM_UTMP_FILE_NAME(file_name) \
-    ((strcmp (file_name, _PATH_UTMP "x") == 0 \
-      && __access (_PATH_UTMP "x", F_OK) != 0) ? _PATH_UTMP : \
-     ((strcmp (file_name, _PATH_WTMP "x") == 0 \
-       && __access (_PATH_WTMP "x", F_OK) != 0) ? _PATH_WTMP : \
-      file_name))
+#define TRANSFORM_UTMP_FILE_NAME(file_name)	\
+  ((strcmp (file_name, _PATH_UTMP "x") == 0	\
+    && __access (_PATH_UTMP "x", F_OK) != 0)	\
+   ? _PATH_UTMP					\
+   : ((strcmp (file_name, _PATH_WTMP "x") == 0	\
+       && __access (_PATH_WTMP "x", F_OK) != 0)	\
+      ? _PATH_WTMP				\
+      : file_name))
 
 #include <login/utmp_file.c>
diff --git a/sysdeps/hppa/jmpbuf-unwind.h b/sysdeps/hppa/jmpbuf-unwind.h
index d5be25e..57f0071 100644
--- a/sysdeps/hppa/jmpbuf-unwind.h
+++ b/sysdeps/hppa/jmpbuf-unwind.h
@@ -22,5 +22,5 @@
 /* Test if longjmp to JMPBUF would unwind the frame containing a local
    variable at ADDRESS.  */
 #define _JMPBUF_UNWINDS(_jmpbuf, _address, _demangle)			\
-  ((void *) (_address) >						\
-   (void *) _demangle ((((unsigned long *) _jmpbuf)[JB_SP])))
+  ((void *) (_address)							\
+   > (void *) _demangle ((((unsigned long *) _jmpbuf)[JB_SP])))
diff --git a/sysdeps/mach/hurd/bits/stat.h b/sysdeps/mach/hurd/bits/stat.h
index 5ef487e..0044493 100644
--- a/sysdeps/mach/hurd/bits/stat.h
+++ b/sysdeps/mach/hurd/bits/stat.h
@@ -218,8 +218,8 @@ struct stat64
 #define S_IMMAP0	000100000000
 
 /* ALL the unused bits.  */
-#define	S_ISPARE	(~(S_IFMT|S_ITRANS|S_INOCACHE|S_IMMAP0|    \
-			   S_IUSEUNK|S_IUNKNOWN|07777))
+#define	S_ISPARE	(~(S_IFMT|S_ITRANS|S_INOCACHE|S_IMMAP0    \
+			   |S_IUSEUNK|S_IUNKNOWN|07777))
 #endif
 
 #ifdef	__USE_MISC
diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
index a58338c..07d64d8 100644
--- a/sysdeps/mach/hurd/dl-sysdep.c
+++ b/sysdeps/mach/hurd/dl-sysdep.c
@@ -132,8 +132,8 @@ _dl_sysdep_start (void **start_argptr,
 
       __tunables_init (_environ);
 
-      if (_dl_hurd_data->flags & EXEC_STACK_ARGS &&
-	  _dl_hurd_data->user_entry == 0)
+      if (_dl_hurd_data->flags & EXEC_STACK_ARGS
+	  && _dl_hurd_data->user_entry == 0)
 	_dl_hurd_data->user_entry = (vm_address_t) ENTRY_POINT;
 
 unfmh();			/* XXX */
@@ -319,8 +319,8 @@ open_file (const char *file_name, int flags,
 
   assert (!(flags & ~(O_READ | O_CLOEXEC)));
 
-  startdir = _dl_hurd_data->portarray[file_name[0] == '/' ?
-				      INIT_PORT_CRDIR : INIT_PORT_CWDIR];
+  startdir = _dl_hurd_data->portarray[file_name[0] == '/'
+				      ? INIT_PORT_CRDIR : INIT_PORT_CWDIR];
 
   while (file_name[0] == '/')
     file_name++;
diff --git a/sysdeps/mach/hurd/htl/pt-mutexattr-setprotocol.c b/sysdeps/mach/hurd/htl/pt-mutexattr-setprotocol.c
index d407f7b..67ec39e 100644
--- a/sysdeps/mach/hurd/htl/pt-mutexattr-setprotocol.c
+++ b/sysdeps/mach/hurd/htl/pt-mutexattr-setprotocol.c
@@ -27,7 +27,8 @@ int
 pthread_mutexattr_setprotocol (pthread_mutexattr_t *attrp, int proto)
 {
   (void) attrp;
-  return proto == PTHREAD_PRIO_NONE ? 0 :
-	 proto != PTHREAD_PRIO_INHERIT &&
-	 proto != PTHREAD_PRIO_PROTECT ? EINVAL : ENOTSUP;
+  return (proto == PTHREAD_PRIO_NONE
+	  ? 0
+	  : (proto != PTHREAD_PRIO_INHERIT
+	     && proto != PTHREAD_PRIO_PROTECT) ? EINVAL : ENOTSUP);
 }
diff --git a/sysdeps/mach/hurd/ioctl.c b/sysdeps/mach/hurd/ioctl.c
index 6253331..cd630e1 100644
--- a/sysdeps/mach/hurd/ioctl.c
+++ b/sysdeps/mach/hurd/ioctl.c
@@ -199,9 +199,9 @@ __ioctl (int fd, unsigned long int request, ...)
 	return MIG_TYPE_ERROR;
 
 #ifdef MACH_MSG_TYPE_BIT
-      if (msg.header_typecheck.RetCodeType !=
-	  ((union { mach_msg_type_t t; int i; })
-	   { t: io2mach_type (1, _IOTS (msg.header.RetCode)) }).i)
+      if (msg.header_typecheck.RetCodeType
+	  != ((union { mach_msg_type_t t; int i; })
+	    { t: io2mach_type (1, _IOTS (msg.header.RetCode)) }).i)
 	return MIG_TYPE_ERROR;
 #endif
       return msg.header.RetCode;
diff --git a/sysdeps/mach/hurd/mmap.c b/sysdeps/mach/hurd/mmap.c
index 071e3c3..8eb741f 100644
--- a/sysdeps/mach/hurd/mmap.c
+++ b/sysdeps/mach/hurd/mmap.c
@@ -120,8 +120,8 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset)
 		/* Remove extra reference.  */
 		__mach_port_deallocate (__mach_task_self (), memobj);
 	      }
-	    else if (wobj == MACH_PORT_NULL && /* Not writable by mapping.  */
-		     !(flags & MAP_SHARED))
+	    else if (wobj == MACH_PORT_NULL /* Not writable by mapping.  */
+		     && !(flags & MAP_SHARED))
 	      /* The file can only be mapped for reading.  Since we are
 		 making a private mapping, we will never try to write the
 		 object anyway, so we don't care.  */
diff --git a/sysdeps/mach/hurd/ptrace.c b/sysdeps/mach/hurd/ptrace.c
index 3778726..a47f7b5 100644
--- a/sysdeps/mach/hurd/ptrace.c
+++ b/sysdeps/mach/hurd/ptrace.c
@@ -178,8 +178,8 @@ ptrace (enum __ptrace_request request, ... )
 	if (! err)
 	  {
 	    err = __msg_set_init_int (msgport, task, INIT_TRACEMASK,
-				      request == PTRACE_DETACH ? 0 :
-				      ~(sigset_t) 0);
+				      request == PTRACE_DETACH ? 0
+				      : ~(sigset_t) 0);
 	    if (! err)
 	      {
 		if (request == PTRACE_ATTACH)
diff --git a/sysdeps/mach/hurd/spawni.c b/sysdeps/mach/hurd/spawni.c
index 4e818ec..af0b993 100644
--- a/sysdeps/mach/hurd/spawni.c
+++ b/sysdeps/mach/hurd/spawni.c
@@ -264,8 +264,8 @@ __spawni (pid_t *pid, const char *file,
     {
       error_t use_init_port (int which, error_t (*operate) (mach_port_t))
 	{
-	  return (which == INIT_PORT_CWDIR ? (*operate) (startdir) :
-		  child_init_port (which, operate));
+	  return (which == INIT_PORT_CWDIR ? (*operate) (startdir)
+		  : child_init_port (which, operate));
 	}
 
       return __hurd_file_name_lookup (&use_init_port, &child_fd, 0,
diff --git a/sysdeps/microblaze/dl-machine.h b/sysdeps/microblaze/dl-machine.h
index cb4609e..58c203e 100644
--- a/sysdeps/microblaze/dl-machine.h
+++ b/sysdeps/microblaze/dl-machine.h
@@ -153,10 +153,10 @@ _dl_start_user:\n\
    of the main executable's symbols, as for a COPY reloc.  */
 #ifndef RTLD_BOOTSTRAP
 # define elf_machine_type_class(type) \
-  (((type) == R_MICROBLAZE_JUMP_SLOT || \
-    (type) == R_MICROBLAZE_TLSDTPREL32 || \
-    (type) == R_MICROBLAZE_TLSDTPMOD32 || \
-    (type) == R_MICROBLAZE_TLSTPREL32) \
+  (((type) == R_MICROBLAZE_JUMP_SLOT \
+    || (type) == R_MICROBLAZE_TLSDTPREL32 \
+    || (type) == R_MICROBLAZE_TLSDTPMOD32 \
+    || (type) == R_MICROBLAZE_TLSTPREL32) \
     * ELF_RTYPE_CLASS_PLT \
    | ((type) == R_MICROBLAZE_COPY) * ELF_RTYPE_CLASS_COPY)
 #else
@@ -226,9 +226,9 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
       Elf32_Addr value = SYMBOL_ADDRESS (sym_map, sym, true);
 
       value += reloc->r_addend;
-      if (r_type == R_MICROBLAZE_GLOB_DAT ||
-          r_type == R_MICROBLAZE_JUMP_SLOT ||
-          r_type == R_MICROBLAZE_32)
+      if (r_type == R_MICROBLAZE_GLOB_DAT
+          || r_type == R_MICROBLAZE_JUMP_SLOT
+          || r_type == R_MICROBLAZE_32)
 	{
 	  *reloc_addr = value;
 	}
diff --git a/sysdeps/mips/mips32/sfp-machine.h b/sysdeps/mips/mips32/sfp-machine.h
index 5215655..8fa429a 100644
--- a/sysdeps/mips/mips32/sfp-machine.h
+++ b/sysdeps/mips/mips32/sfp-machine.h
@@ -56,8 +56,8 @@
    NaNs is sNaN,  in which case the result is NANSIGN/NANFRAC.  */
 # define _FP_CHOOSENAN(fs, wc, R, X, Y, OP)			\
   do {								\
-    if ((_FP_FRAC_HIGH_RAW_##fs(X) |				\
-	 _FP_FRAC_HIGH_RAW_##fs(Y)) & _FP_QNANBIT_##fs)		\
+    if ((_FP_FRAC_HIGH_RAW_##fs(X)				\
+	 | _FP_FRAC_HIGH_RAW_##fs(Y)) & _FP_QNANBIT_##fs)	\
       {								\
 	R##_s = _FP_NANSIGN_##fs;				\
         _FP_FRAC_SET_##wc(R,_FP_NANFRAC_##fs);			\
diff --git a/sysdeps/mips/mips64/sfp-machine.h b/sysdeps/mips/mips64/sfp-machine.h
index c769ee8..4d1f90f 100644
--- a/sysdeps/mips/mips64/sfp-machine.h
+++ b/sysdeps/mips/mips64/sfp-machine.h
@@ -59,8 +59,8 @@
    NaNs is sNaN,  in which case the result is NANSIGN/NANFRAC.  */
 # define _FP_CHOOSENAN(fs, wc, R, X, Y, OP)			\
   do {								\
-    if ((_FP_FRAC_HIGH_RAW_##fs(X) |				\
-	 _FP_FRAC_HIGH_RAW_##fs(Y)) & _FP_QNANBIT_##fs)		\
+    if ((_FP_FRAC_HIGH_RAW_##fs(X)				\
+	 | _FP_FRAC_HIGH_RAW_##fs(Y)) & _FP_QNANBIT_##fs)	\
       {								\
 	R##_s = _FP_NANSIGN_##fs;				\
         _FP_FRAC_SET_##wc(R,_FP_NANFRAC_##fs);			\
diff --git a/sysdeps/mips/sys/asm.h b/sysdeps/mips/sys/asm.h
index a7fdcc0..f6ec1e7 100644
--- a/sysdeps/mips/sys/asm.h
+++ b/sysdeps/mips/sys/asm.h
@@ -232,8 +232,8 @@ symbol		=	value
  * MIPS IV implementations are free to treat this as a nop.  The R5000
  * is one of them.  So we should have an option not to use this instruction.
  */
-#if (_MIPS_ISA == _MIPS_ISA_MIPS4) || (_MIPS_ISA == _MIPS_ISA_MIPS5) || \
-    (_MIPS_ISA == _MIPS_ISA_MIPS32) || (_MIPS_ISA == _MIPS_ISA_MIPS64)
+#if (_MIPS_ISA == _MIPS_ISA_MIPS4) || (_MIPS_ISA == _MIPS_ISA_MIPS5) \
+    || (_MIPS_ISA == _MIPS_ISA_MIPS32) || (_MIPS_ISA == _MIPS_ISA_MIPS64)
 # define PREF(hint,addr)                                 \
 		pref	hint,addr
 # define PREFX(hint,addr)                                \
@@ -278,8 +278,8 @@ symbol		=	value
 		.set	pop;				\
 9:
 #endif /* (_MIPS_ISA == _MIPS_ISA_MIPS2) || (_MIPS_ISA == _MIPS_ISA_MIPS3) */
-#if (_MIPS_ISA == _MIPS_ISA_MIPS4) || (_MIPS_ISA == _MIPS_ISA_MIPS5) || \
-    (_MIPS_ISA == _MIPS_ISA_MIPS32) || (_MIPS_ISA == _MIPS_ISA_MIPS64)
+#if (_MIPS_ISA == _MIPS_ISA_MIPS4) || (_MIPS_ISA == _MIPS_ISA_MIPS5) \
+    || (_MIPS_ISA == _MIPS_ISA_MIPS32) || (_MIPS_ISA == _MIPS_ISA_MIPS64)
 # define MOVN(rd,rs,rt)					\
 		movn	rd,rs,rt
 # define MOVZ(rd,rs,rt)					\
@@ -468,13 +468,13 @@ symbol		=	value
 /*
  * Some cp0 registers were extended to 64bit for MIPS III.
  */
-#if (_MIPS_ISA == _MIPS_ISA_MIPS1) || (_MIPS_ISA == _MIPS_ISA_MIPS2) || \
-    (_MIPS_ISA == _MIPS_ISA_MIPS32)
+#if (_MIPS_ISA == _MIPS_ISA_MIPS1) || (_MIPS_ISA == _MIPS_ISA_MIPS2) \
+    || (_MIPS_ISA == _MIPS_ISA_MIPS32)
 # define MFC0	mfc0
 # define MTC0	mtc0
 #endif
-#if (_MIPS_ISA == _MIPS_ISA_MIPS3) || (_MIPS_ISA == _MIPS_ISA_MIPS4) || \
-    (_MIPS_ISA == _MIPS_ISA_MIPS5) || (_MIPS_ISA == _MIPS_ISA_MIPS64)
+#if (_MIPS_ISA == _MIPS_ISA_MIPS3) || (_MIPS_ISA == _MIPS_ISA_MIPS4) \
+    || (_MIPS_ISA == _MIPS_ISA_MIPS5) || (_MIPS_ISA == _MIPS_ISA_MIPS64)
 # define MFC0	dmfc0
 # define MTC0	dmtc0
 #endif
diff --git a/sysdeps/posix/rename.c b/sysdeps/posix/rename.c
index 2dfc8ae..e326157 100644
--- a/sysdeps/posix/rename.c
+++ b/sysdeps/posix/rename.c
@@ -30,8 +30,8 @@ rename (const char *old, const char *new)
 	{
 	  __set_errno (save);
 	  /* Race condition, required for 1003.1 conformance.  */
-	  if (__unlink (new) < 0 ||
-	      __link (old, new) < 0)
+	  if (__unlink (new) < 0
+	      || __link (old, new) < 0)
 	    return -1;
 	}
       else
diff --git a/sysdeps/powerpc/novmx-sigjmp.c b/sysdeps/powerpc/novmx-sigjmp.c
index de9a8dd..0bdb4fa 100644
--- a/sysdeps/powerpc/novmx-sigjmp.c
+++ b/sysdeps/powerpc/novmx-sigjmp.c
@@ -33,9 +33,9 @@
 int
 __novmx__sigjmp_save (__novmx__sigjmp_buf env, int savemask)
 {
-  env[0].__mask_was_saved = (savemask &&
-			     __sigprocmask (SIG_BLOCK, (sigset_t *) NULL,
-					    &env[0].__saved_mask) == 0);
+  env[0].__mask_was_saved = (savemask
+			     && __sigprocmask (SIG_BLOCK, (sigset_t *) NULL,
+					       &env[0].__saved_mask) == 0);
 
   return 0;
 }
diff --git a/sysdeps/powerpc/sigjmp.c b/sysdeps/powerpc/sigjmp.c
index 44b0931..a425c06 100644
--- a/sysdeps/powerpc/sigjmp.c
+++ b/sysdeps/powerpc/sigjmp.c
@@ -29,9 +29,9 @@
 int
 __vmx__sigjmp_save (sigjmp_buf env, int savemask)
 {
-  env[0].__mask_was_saved = (savemask &&
-			     __sigprocmask (SIG_BLOCK, (sigset_t *) NULL,
-					    &env[0].__saved_mask) == 0);
+  env[0].__mask_was_saved = (savemask
+			     && __sigprocmask (SIG_BLOCK, (sigset_t *) NULL,
+					       &env[0].__saved_mask) == 0);
 
   return 0;
 }
diff --git a/sysdeps/s390/fpu/fenv_libc.h b/sysdeps/s390/fpu/fenv_libc.h
index d791361..83679b4 100644
--- a/sysdeps/s390/fpu/fenv_libc.h
+++ b/sysdeps/s390/fpu/fenv_libc.h
@@ -28,8 +28,8 @@
 #define FPC_FLAGS_MASK		0x00F80000
 #define FPC_DXC_MASK		0x0000FF00
 #define FPC_RM_MASK		0x00000003
-#define FPC_VALID_MASK		((FPC_EXCEPTION_MASK|FPC_FLAGS_MASK| \
-				 FPC_DXC_MASK|FPC_RM_MASK))
+#define FPC_VALID_MASK		((FPC_EXCEPTION_MASK|FPC_FLAGS_MASK \
+				  |FPC_DXC_MASK|FPC_RM_MASK))
 
 #define FPC_EXCEPTION_MASK_SHIFT	24
 #define FPC_FLAGS_SHIFT			16
diff --git a/sysdeps/s390/utf8-utf16-z9.c b/sysdeps/s390/utf8-utf16-z9.c
index de76bba..be26bfb 100644
--- a/sysdeps/s390/utf8-utf16-z9.c
+++ b/sysdeps/s390/utf8-utf16-z9.c
@@ -443,8 +443,8 @@ gconv_end (struct __gconv_step *data)
 	      }								\
 									\
 	    /* See Principles of Operations cu12.  */			\
-	    zabcd = (((inptr[0] & 0x7) << 2) |				\
-		     ((inptr[1] & 0x30) >> 4)) - 1;			\
+	    zabcd = (((inptr[0] & 0x7) << 2)				\
+		     | ((inptr[1] & 0x30) >> 4)) - 1;			\
 									\
 	    /* z-bit must be zero after subtracting 1.  */		\
 	    if (zabcd & 0x10)						\
diff --git a/sysdeps/unix/grantpt.c b/sysdeps/unix/grantpt.c
index e2e6df1..3214ab0 100644
--- a/sysdeps/unix/grantpt.c
+++ b/sysdeps/unix/grantpt.c
@@ -178,8 +178,8 @@ grantpt (int fd)
      owner.  For security reasons, make it writable by the group only
      when originally writable and when the group of the device is that
      special group.  */
-  mode_t mode = S_IRUSR|S_IWUSR|
-	        ((st.st_gid == gid) ? (st.st_mode & S_IWGRP) : 0);
+  mode_t mode = S_IRUSR|S_IWUSR
+	        |((st.st_gid == gid) ? (st.st_mode & S_IWGRP) : 0);
 #endif
 
   if ((st.st_mode & ACCESSPERMS) != mode)
diff --git a/sysdeps/unix/sysv/linux/a.out.h b/sysdeps/unix/sysv/linux/a.out.h
index e3f4bdd..79df485 100644
--- a/sysdeps/unix/sysv/linux/a.out.h
+++ b/sysdeps/unix/sysv/linux/a.out.h
@@ -64,8 +64,8 @@ enum machine_type
    && N_MAGIC(x) != ZMAGIC && N_MAGIC(x) != QMAGIC)
 #define _N_HDROFF(x)	(1024 - sizeof (struct exec))
 #define N_TXTOFF(x) \
-  (N_MAGIC(x) == ZMAGIC ? _N_HDROFF((x)) + sizeof (struct exec) :	\
-   (N_MAGIC(x) == QMAGIC ? 0 : sizeof (struct exec)))
+  (N_MAGIC(x) == ZMAGIC ? _N_HDROFF((x)) + sizeof (struct exec)		\
+   : (N_MAGIC(x) == QMAGIC ? 0 : sizeof (struct exec)))
 #define N_DATOFF(x)	(N_TXTOFF(x) + (x).a_text)
 #define N_TRELOFF(x)	(N_DATOFF(x) + (x).a_data)
 #define N_DRELOFF(x)	(N_TRELOFF(x) + N_TRSIZE(x))
diff --git a/sysdeps/unix/sysv/linux/updwtmp.c b/sysdeps/unix/sysv/linux/updwtmp.c
index 93fb454..87791dc 100644
--- a/sysdeps/unix/sysv/linux/updwtmp.c
+++ b/sysdeps/unix/sysv/linux/updwtmp.c
@@ -19,15 +19,19 @@
 #include <string.h>
 #include <unistd.h>
 
-#define TRANSFORM_UTMP_FILE_NAME(file_name) \
-    ((strcmp (file_name, _PATH_UTMP) == 0 \
-      && __access (_PATH_UTMP "x", F_OK) == 0) ? (_PATH_UTMP "x") : \
-     ((strcmp (file_name, _PATH_WTMP) == 0 \
-       && __access ( _PATH_WTMP "x", F_OK) == 0) ? (_PATH_WTMP "x") : \
-      ((strcmp (file_name, _PATH_UTMP "x") == 0 \
-	&& __access (_PATH_UTMP "x", F_OK) != 0) ? _PATH_UTMP : \
-       ((strcmp (file_name, _PATH_WTMP "x") == 0 \
-	 && __access (_PATH_WTMP "x", F_OK) != 0) ? _PATH_WTMP : \
-	file_name))))
+#define TRANSFORM_UTMP_FILE_NAME(file_name)		\
+  ((strcmp (file_name, _PATH_UTMP) == 0			\
+    && __access (_PATH_UTMP "x", F_OK) == 0)		\
+   ? (_PATH_UTMP "x")					\
+   : ((strcmp (file_name, _PATH_WTMP) == 0		\
+       && __access ( _PATH_WTMP "x", F_OK) == 0)	\
+      ? (_PATH_WTMP "x")				\
+      : ((strcmp (file_name, _PATH_UTMP "x") == 0	\
+	  && __access (_PATH_UTMP "x", F_OK) != 0)	\
+	 ? _PATH_UTMP					\
+	 : ((strcmp (file_name, _PATH_WTMP "x") == 0	\
+	     && __access (_PATH_WTMP "x", F_OK) != 0)	\
+	    ? _PATH_WTMP				\
+	    : file_name))))
 
 #include <login/updwtmp.c>
diff --git a/sysdeps/unix/sysv/linux/utmp_file.c b/sysdeps/unix/sysv/linux/utmp_file.c
index 751a302..a88e934 100644
--- a/sysdeps/unix/sysv/linux/utmp_file.c
+++ b/sysdeps/unix/sysv/linux/utmp_file.c
@@ -19,15 +19,19 @@
 #include <string.h>
 #include <unistd.h>
 
-#define TRANSFORM_UTMP_FILE_NAME(file_name) \
-    ((strcmp (file_name, _PATH_UTMP) == 0 \
-      && __access (_PATH_UTMP "x", F_OK) == 0) ? (_PATH_UTMP "x") : \
-     ((strcmp (file_name, _PATH_WTMP) == 0 \
-       && __access ( _PATH_WTMP "x", F_OK) == 0) ? (_PATH_WTMP "x") : \
-      ((strcmp (file_name, _PATH_UTMP "x") == 0 \
-	&& __access (_PATH_UTMP "x", F_OK) != 0) ? _PATH_UTMP : \
-       ((strcmp (file_name, _PATH_WTMP "x") == 0 \
-	 && __access (_PATH_WTMP "x", F_OK) != 0) ? _PATH_WTMP : \
-	file_name))))
+#define TRANSFORM_UTMP_FILE_NAME(file_name)		\
+  ((strcmp (file_name, _PATH_UTMP) == 0			\
+    && __access (_PATH_UTMP "x", F_OK) == 0)		\
+   ? (_PATH_UTMP "x")					\
+   : ((strcmp (file_name, _PATH_WTMP) == 0		\
+       && __access ( _PATH_WTMP "x", F_OK) == 0)	\
+      ? (_PATH_WTMP "x")				\
+      : ((strcmp (file_name, _PATH_UTMP "x") == 0	\
+	  && __access (_PATH_UTMP "x", F_OK) != 0)	\
+	 ? _PATH_UTMP					\
+	 : ((strcmp (file_name, _PATH_WTMP "x") == 0	\
+	     && __access (_PATH_WTMP "x", F_OK) != 0)	\
+	    ? _PATH_WTMP				\
+	    : file_name))))
 
 #include <login/utmp_file.c>
diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c
index 4c7d93a..4bab154 100644
--- a/sysdeps/x86/cpu-features.c
+++ b/sysdeps/x86/cpu-features.c
@@ -111,8 +111,8 @@ get_common_indices (struct cpu_features *cpu_features,
       unsigned int xcrhigh;
       asm ("xgetbv" : "=a" (xcrlow), "=d" (xcrhigh) : "c" (0));
       /* Is YMM and XMM state usable?  */
-      if ((xcrlow & (bit_YMM_state | bit_XMM_state)) ==
-	  (bit_YMM_state | bit_XMM_state))
+      if ((xcrlow & (bit_YMM_state | bit_XMM_state))
+	  == (bit_YMM_state | bit_XMM_state))
 	{
 	  /* Determine if AVX is usable.  */
 	  if (CPU_FEATURES_CPU_P (cpu_features, AVX))
@@ -152,8 +152,8 @@ get_common_indices (struct cpu_features *cpu_features,
 	  /* Check if OPMASK state, upper 256-bit of ZMM0-ZMM15 and
 	     ZMM16-ZMM31 state are enabled.  */
 	  if ((xcrlow & (bit_Opmask_state | bit_ZMM0_15_state
-			 | bit_ZMM16_31_state)) ==
-	      (bit_Opmask_state | bit_ZMM0_15_state | bit_ZMM16_31_state))
+			 | bit_ZMM16_31_state))
+	      == (bit_Opmask_state | bit_ZMM0_15_state | bit_ZMM16_31_state))
 	    {
 	      /* Determine if AVX512F is usable.  */
 	      if (CPU_FEATURES_CPU_P (cpu_features, AVX512F))