summary refs log tree commit diff
path: root/stdio-common
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 /stdio-common
parent27a2f2f34c9e77815c6367cf670e24cbac0db7c0 (diff)
downloadglibc-c5f65462a29fa4b7caa9026b36b2792d79b16d1d.tar.gz
glibc-c5f65462a29fa4b7caa9026b36b2792d79b16d1d.tar.xz
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 'stdio-common')
-rw-r--r--stdio-common/vfscanf-internal.c44
1 files changed, 22 insertions, 22 deletions
diff --git a/stdio-common/vfscanf-internal.c b/stdio-common/vfscanf-internal.c
index 888b2b1d96..f43ceb1820 100644
--- a/stdio-common/vfscanf-internal.c
+++ b/stdio-common/vfscanf-internal.c
@@ -385,32 +385,32 @@ __vfscanf_internal (FILE *s, const char *format, va_list argptr,
 	 For a %N$... spec, this is the Nth argument from the beginning;
 	 otherwise it is the next argument after the state now in ARG.  */
 #ifdef __va_copy
-# define ARG(type)	(argpos == 0 ? va_arg (arg, type) :		      \
-			 ({ unsigned int pos = argpos;			      \
-			    va_list arg;				      \
-			    __va_copy (arg, argptr);			      \
-			    while (--pos > 0)				      \
-			      (void) va_arg (arg, void *);		      \
-			    va_arg (arg, type);				      \
-			  }))
+# define ARG(type)	(argpos == 0 ? va_arg (arg, type)		      \
+			 : ({ unsigned int pos = argpos;		      \
+			      va_list arg;				      \
+			      __va_copy (arg, argptr);			      \
+			      while (--pos > 0)				      \
+				(void) va_arg (arg, void *);		      \
+			      va_arg (arg, type);			      \
+			    }))
 #else
 # if 0
       /* XXX Possible optimization.  */
-#  define ARG(type)	(argpos == 0 ? va_arg (arg, type) :		      \
-			 ({ va_list arg = (va_list) argptr;		      \
-			    arg = (va_list) ((char *) arg		      \
-					     + (argpos - 1)		      \
-					     * __va_rounded_size (void *));   \
-			    va_arg (arg, type);				      \
-			 }))
+#  define ARG(type)	(argpos == 0 ? va_arg (arg, type)		      \
+			 : ({ va_list arg = (va_list) argptr;		      \
+			      arg = (va_list) ((char *) arg		      \
+					       + (argpos - 1)		      \
+					       * __va_rounded_size (void *)); \
+			      va_arg (arg, type);			      \
+			   }))
 # else
-#  define ARG(type)	(argpos == 0 ? va_arg (arg, type) :		      \
-			 ({ unsigned int pos = argpos;			      \
-			    va_list arg = (va_list) argptr;		      \
-			    while (--pos > 0)				      \
-			      (void) va_arg (arg, void *);		      \
-			    va_arg (arg, type);				      \
-			  }))
+#  define ARG(type)	(argpos == 0 ? va_arg (arg, type)		      \
+			 : ({ unsigned int pos = argpos;		      \
+			      va_list arg = (va_list) argptr;		      \
+			      while (--pos > 0)				      \
+				(void) va_arg (arg, void *);		      \
+			      va_arg (arg, type);			      \
+			    }))
 # endif
 #endif