AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-24 22:10:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Break lines before not after operators, batch 4.

Browse Source 
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.
This commit is contained in:
Joseph Myers 2019-03-07 20:20:25 +00:00
parent 27a2f2f34c
commit c5f65462a2
12 changed files with 95 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ChangeLog
View File

@ -1,3 +1,24 @@
2019-03-07 Joseph Myers <joseph@codesourcery.com>
* 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.
2019-03-07 Florian Weimer <fweimer@redhat.com> 2019-03-07 Florian Weimer <fweimer@redhat.com>
* scripts/check-wrapper-headers.py (check_headers): Adjust Fortran * scripts/check-wrapper-headers.py (check_headers): Adjust Fortran

44
stdio-common/vfscanf-internal.c
View File

@ -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; For a %N$... spec, this is the Nth argument from the beginning;
otherwise it is the next argument after the state now in ARG. */ otherwise it is the next argument after the state now in ARG. */
#ifdef __va_copy #ifdef __va_copy
# define ARG(type) (argpos == 0 ? va_arg (arg, type) : \ # define ARG(type) (argpos == 0 ? va_arg (arg, type) \
({ unsigned int pos = argpos; \ : ({ unsigned int pos = argpos; \
va_list arg; \ va_list arg; \
__va_copy (arg, argptr); \ __va_copy (arg, argptr); \
while (--pos > 0) \ while (--pos > 0) \
(void) va_arg (arg, void *); \ (void) va_arg (arg, void *); \
va_arg (arg, type); \ va_arg (arg, type); \
})) }))
#else #else
# if 0 # if 0
/* XXX Possible optimization. */ /* XXX Possible optimization. */
# define ARG(type) (argpos == 0 ? va_arg (arg, type) : \ # define ARG(type) (argpos == 0 ? va_arg (arg, type) \
({ va_list arg = (va_list) argptr; \ : ({ va_list arg = (va_list) argptr; \
arg = (va_list) ((char *) arg \ arg = (va_list) ((char *) arg \
+ (argpos - 1) \ + (argpos - 1) \
* __va_rounded_size (void *)); \ * __va_rounded_size (void *)); \
va_arg (arg, type); \ va_arg (arg, type); \
})) }))
# else # else
# define ARG(type) (argpos == 0 ? va_arg (arg, type) : \ # define ARG(type) (argpos == 0 ? va_arg (arg, type) \
({ unsigned int pos = argpos; \ : ({ unsigned int pos = argpos; \
va_list arg = (va_list) argptr; \ va_list arg = (va_list) argptr; \
while (--pos > 0) \ while (--pos > 0) \
(void) va_arg (arg, void *); \ (void) va_arg (arg, void *); \
va_arg (arg, type); \ va_arg (arg, type); \
})) }))
# endif # endif
#endif #endif

12
sysdeps/mach/hurd/setitimer.c
View File

@ -89,8 +89,8 @@ timer_thread (void)
err = __mach_msg (&msg.header, err = __mach_msg (&msg.header,
MACH_RCV_MSG|MACH_RCV_TIMEOUT|MACH_RCV_INTERRUPT, MACH_RCV_MSG|MACH_RCV_TIMEOUT|MACH_RCV_INTERRUPT,
0, 0, _hurd_itimer_port, 0, 0, _hurd_itimer_port,
_hurd_itimerval.it_value.tv_sec * 1000 + _hurd_itimerval.it_value.tv_sec * 1000
_hurd_itimerval.it_value.tv_usec / 1000, + _hurd_itimerval.it_value.tv_usec / 1000,
MACH_PORT_NULL); MACH_PORT_NULL);
switch (err) 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 kernel context so that when the thread is resumed, mach_msg
will return to timer_thread (below) and it will fetch new will return to timer_thread (below) and it will fetch new
values from _hurd_itimerval. */ values from _hurd_itimerval. */
if ((err = __thread_suspend (_hurd_itimer_thread)) || if ((err = __thread_suspend (_hurd_itimer_thread))
(err = __thread_abort (_hurd_itimer_thread))) || (err = __thread_abort (_hurd_itimer_thread)))
/* If we can't save it for later, nuke it. */ /* If we can't save it for later, nuke it. */
kill_itimer_thread (); kill_itimer_thread ();
else 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. */ /* See if the timeout changed. If so, we must alert the itimer thread. */
else if (remaining.tv_sec != newval.it_value.tv_sec || else if (remaining.tv_sec != newval.it_value.tv_sec
remaining.tv_usec != newval.it_value.tv_usec) || remaining.tv_usec != newval.it_value.tv_usec)
{ {
/* The timeout value is changing. Tell the itimer thread to /* The timeout value is changing. Tell the itimer thread to
reexamine it and start counting down. If the itimer thread is reexamine it and start counting down. If the itimer thread is

12
sysdeps/mach/hurd/sigaction.c
View File

@ -30,10 +30,10 @@ __sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
struct sigaction a, old; struct sigaction a, old;
sigset_t pending; sigset_t pending;
if (sig <= 0 || sig >= NSIG || if (sig <= 0 || sig >= NSIG
(act != NULL && act->sa_handler != SIG_DFL && || (act != NULL && act->sa_handler != SIG_DFL
((__sigmask (sig) & _SIG_CANT_MASK) || && ((__sigmask (sig) & _SIG_CANT_MASK)
act->sa_handler == SIG_ERR))) || act->sa_handler == SIG_ERR)))
{ {
errno = EINVAL; errno = EINVAL;
return -1; return -1;
@ -51,8 +51,8 @@ __sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
if (act != NULL) if (act != NULL)
ss->actions[sig] = a; ss->actions[sig] = a;
if (act != NULL && sig == SIGCHLD && if (act != NULL && sig == SIGCHLD
(a.sa_flags & SA_NOCLDSTOP) != (old.sa_flags & SA_NOCLDSTOP)) && (a.sa_flags & SA_NOCLDSTOP) != (old.sa_flags & SA_NOCLDSTOP))
{ {
__spin_unlock (&ss->lock); __spin_unlock (&ss->lock);

5
sysdeps/mach/hurd/sigaltstack.c
View File

@ -36,8 +36,9 @@ __sigaltstack (const stack_t *argss, stack_t *oss)
s = _hurd_self_sigstate (); s = _hurd_self_sigstate ();
__spin_lock (&s->lock); __spin_lock (&s->lock);
if (argss != NULL && if (argss != NULL
(ss.ss_flags & SS_DISABLE) && (s->sigaltstack.ss_flags & SS_ONSTACK)) && (ss.ss_flags & SS_DISABLE)
&& (s->sigaltstack.ss_flags & SS_ONSTACK))
{ {
/* Can't disable a stack that is in use. */ /* Can't disable a stack that is in use. */
__spin_unlock (&s->lock); __spin_unlock (&s->lock);

12
sysdeps/mach/pagecopy.h
View File

@ -24,9 +24,9 @@
#define PAGE_SIZE __vm_page_size #define PAGE_SIZE __vm_page_size
#define PAGE_COPY_FWD(dstp, srcp, nbytes_left, nbytes) \ #define PAGE_COPY_FWD(dstp, srcp, nbytes_left, nbytes) \
((nbytes_left) = ((nbytes) - \ ((nbytes_left) = ((nbytes) \
(__vm_copy (__mach_task_self (), \ - (__vm_copy (__mach_task_self (), \
(vm_address_t) srcp, trunc_page (nbytes), \ (vm_address_t) srcp, trunc_page (nbytes), \
(vm_address_t) dstp) == KERN_SUCCESS \ (vm_address_t) dstp) == KERN_SUCCESS \
? trunc_page (nbytes) \ ? trunc_page (nbytes) \
: 0))) : 0)))

4
sysdeps/mach/thread_state.h
View File

@ -82,8 +82,8 @@ machine_get_basic_state (thread_t thread,
count = MACHINE_THREAD_STATE_COUNT; count = MACHINE_THREAD_STATE_COUNT;
if (__thread_get_state (thread, MACHINE_THREAD_STATE_FLAVOR, if (__thread_get_state (thread, MACHINE_THREAD_STATE_FLAVOR,
(natural_t *) &state->basic, (natural_t *) &state->basic,
&count) != KERN_SUCCESS || &count) != KERN_SUCCESS
count != MACHINE_THREAD_STATE_COUNT) || count != MACHINE_THREAD_STATE_COUNT)
/* What kind of thread?? */ /* What kind of thread?? */
return 0; /* XXX */ return 0; /* XXX */

6
sysdeps/powerpc/powerpc64/tst-ucontext-ppc64-vscr.c
View File

@ -27,9 +27,9 @@
#define SAT 0x1 #define SAT 0x1
/* This test is supported only on POWER 5 or higher. */ /* This test is supported only on POWER 5 or higher. */
#define PPC_CPU_SUPPORTED (PPC_FEATURE_POWER5 | PPC_FEATURE_POWER5_PLUS | \ #define PPC_CPU_SUPPORTED (PPC_FEATURE_POWER5 | PPC_FEATURE_POWER5_PLUS \
PPC_FEATURE_ARCH_2_05 | PPC_FEATURE_ARCH_2_06 | \ | PPC_FEATURE_ARCH_2_05 | PPC_FEATURE_ARCH_2_06 \
PPC_FEATURE2_ARCH_2_07) | PPC_FEATURE2_ARCH_2_07)
static int static int
do_test (void) do_test (void)
{ {

6
sysdeps/unix/sysv/linux/alpha/a.out.h
View File

@ -123,9 +123,9 @@ enum machine_type
&& N_MAGIC(x) != ZMAGIC && N_MAGIC(x) != QMAGIC) && N_MAGIC(x) != ZMAGIC && N_MAGIC(x) != QMAGIC)
#define _N_HDROFF(x) (1024 - sizeof (struct exec)) #define _N_HDROFF(x) (1024 - sizeof (struct exec))
#define N_TXTOFF(x) \ #define N_TXTOFF(x) \
((long) N_MAGIC(x) == ZMAGIC ? 0 : \ ((long) N_MAGIC(x) == ZMAGIC ? 0 \
(sizeof (struct exec) + (x).fh.f_nscns * SCNHSZ + SCNROUND - 1) \ : ((sizeof (struct exec) + (x).fh.f_nscns * SCNHSZ + SCNROUND - 1) \
& ~(SCNROUND - 1)) & ~(SCNROUND - 1)))
#define N_DATOFF(x) (N_TXTOFF(x) + (x).a_text) #define N_DATOFF(x) (N_TXTOFF(x) + (x).a_text)
#define N_TRELOFF(x) (N_DATOFF(x) + (x).a_data) #define N_TRELOFF(x) (N_DATOFF(x) + (x).a_data)

16
sysdeps/unix/sysv/linux/generic/wordsize-32/overflow.h
View File

@ -36,8 +36,8 @@ static inline off_t lseek_overflow (loff_t res)
static inline int stat_overflow (struct stat *buf) static inline int stat_overflow (struct stat *buf)
{ {
if (buf->__st_ino_pad == 0 && buf->__st_size_pad == 0 && if (buf->__st_ino_pad == 0 && buf->__st_size_pad == 0
buf->__st_blocks_pad == 0) && buf->__st_blocks_pad == 0)
return 0; return 0;
__set_errno (EOVERFLOW); __set_errno (EOVERFLOW);
@ -47,12 +47,12 @@ static inline int stat_overflow (struct stat *buf)
/* Note that f_files and f_ffree may validly be a sign-extended -1. */ /* Note that f_files and f_ffree may validly be a sign-extended -1. */
static inline int statfs_overflow (struct statfs *buf) static inline int statfs_overflow (struct statfs *buf)
{ {
if (buf->__f_blocks_pad == 0 && buf->__f_bfree_pad == 0 && if (buf->__f_blocks_pad == 0 && buf->__f_bfree_pad == 0
buf->__f_bavail_pad == 0 && && buf->__f_bavail_pad == 0
(buf->__f_files_pad == 0 || && (buf->__f_files_pad == 0
(buf->f_files == -1U && buf->__f_files_pad == -1)) && || (buf->f_files == -1U && buf->__f_files_pad == -1))
(buf->__f_ffree_pad == 0 || && (buf->__f_ffree_pad == 0
(buf->f_ffree == -1U && buf->__f_ffree_pad == -1))) || (buf->f_ffree == -1U && buf->__f_ffree_pad == -1)))
return 0; return 0;
__set_errno (EOVERFLOW); __set_errno (EOVERFLOW);

10
sysdeps/unix/sysv/linux/tst-personality.c
View File

@ -30,11 +30,11 @@ do_test (void)
errno = 0xdefaced; errno = 0xdefaced;
saved_persona = personality (0xffffffff); saved_persona = personality (0xffffffff);
if (personality (test_persona) != saved_persona || if (personality (test_persona) != saved_persona
personality (0xffffffff) == -1 || || personality (0xffffffff) == -1
personality (PER_LINUX) == -1 || || personality (PER_LINUX) == -1
personality (0xffffffff) != PER_LINUX || || personality (0xffffffff) != PER_LINUX
0xdefaced != errno) || 0xdefaced != errno)
rc = 1; rc = 1;
(void) personality (saved_persona); (void) personality (saved_persona);

20
sysdeps/unix/sysv/linux/tst-ttyname.c
View File

@ -103,9 +103,9 @@ eq_ttyname (struct result actual, struct result expected)
{ {
char *actual_name, *expected_name; char *actual_name, *expected_name;
if ((actual.err == expected.err) && if ((actual.err == expected.err)
(!actual.name == !expected.name) && && (!actual.name == !expected.name)
(actual.name ? strcmp (actual.name, expected.name) == 0 : true)) && (actual.name ? strcmp (actual.name, expected.name) == 0 : true))
{ {
if (expected.name) if (expected.name)
expected_name = xasprintf ("\"%s\"", expected.name); expected_name = xasprintf ("\"%s\"", expected.name);
@ -169,10 +169,10 @@ eq_ttyname_r (struct result_r actual, struct result_r expected)
{ {
char *actual_name, *expected_name; char *actual_name, *expected_name;
if ((actual.err == expected.err) && if ((actual.err == expected.err)
(actual.ret == expected.ret) && && (actual.ret == expected.ret)
(!actual.name == !expected.name) && && (!actual.name == !expected.name)
(actual.name ? strcmp (actual.name, expected.name) == 0 : true)) && (actual.name ? strcmp (actual.name, expected.name) == 0 : true))
{ {
if (expected.name) if (expected.name)
expected_name = xasprintf ("\"%s\"", expected.name); expected_name = xasprintf ("\"%s\"", expected.name);
@ -570,9 +570,9 @@ run_chroot_tests (const char *slavename, int slave)
struct dirent *d; struct dirent *d;
while ((d = readdir (dirstream)) != NULL && ci < 3) while ((d = readdir (dirstream)) != NULL && ci < 3)
{ {
if (strcmp (d->d_name, "console1") && if (strcmp (d->d_name, "console1")
strcmp (d->d_name, "console2") && && strcmp (d->d_name, "console2")
strcmp (d->d_name, "console3") ) && strcmp (d->d_name, "console3") )
continue; continue;
c[ci++] = xasprintf ("/dev/%s", d->d_name); c[ci++] = xasprintf ("/dev/%s", d->d_name);
} }