diff options
author | Joseph Myers <joseph@codesourcery.com> | 2019-03-07 20:20:25 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2019-03-07 20:20:25 +0000 |
commit | c5f65462a29fa4b7caa9026b36b2792d79b16d1d (patch) | |
tree | 2c380bd19a34653cda14db6c74618ca2f5c761b7 /sysdeps/unix | |
parent | 27a2f2f34c9e77815c6367cf670e24cbac0db7c0 (diff) | |
download | glibc-c5f65462a29fa4b7caa9026b36b2792d79b16d1d.zip glibc-c5f65462a29fa4b7caa9026b36b2792d79b16d1d.tar.gz glibc-c5f65462a29fa4b7caa9026b36b2792d79b16d1d.tar.bz2 |
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/unix')
-rw-r--r-- | sysdeps/unix/sysv/linux/alpha/a.out.h | 6 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/generic/wordsize-32/overflow.h | 16 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/tst-personality.c | 10 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/tst-ttyname.c | 20 |
4 files changed, 26 insertions, 26 deletions
diff --git a/sysdeps/unix/sysv/linux/alpha/a.out.h b/sysdeps/unix/sysv/linux/alpha/a.out.h index 44e19bd..901b914 100644 --- a/sysdeps/unix/sysv/linux/alpha/a.out.h +++ b/sysdeps/unix/sysv/linux/alpha/a.out.h @@ -123,9 +123,9 @@ enum machine_type && N_MAGIC(x) != ZMAGIC && N_MAGIC(x) != QMAGIC) #define _N_HDROFF(x) (1024 - sizeof (struct exec)) #define N_TXTOFF(x) \ - ((long) N_MAGIC(x) == ZMAGIC ? 0 : \ - (sizeof (struct exec) + (x).fh.f_nscns * SCNHSZ + SCNROUND - 1) \ - & ~(SCNROUND - 1)) + ((long) N_MAGIC(x) == ZMAGIC ? 0 \ + : ((sizeof (struct exec) + (x).fh.f_nscns * SCNHSZ + SCNROUND - 1) \ + & ~(SCNROUND - 1))) #define N_DATOFF(x) (N_TXTOFF(x) + (x).a_text) #define N_TRELOFF(x) (N_DATOFF(x) + (x).a_data) diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/overflow.h b/sysdeps/unix/sysv/linux/generic/wordsize-32/overflow.h index 105c7d6..6c17047 100644 --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/overflow.h +++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/overflow.h @@ -36,8 +36,8 @@ static inline off_t lseek_overflow (loff_t res) static inline int stat_overflow (struct stat *buf) { - if (buf->__st_ino_pad == 0 && buf->__st_size_pad == 0 && - buf->__st_blocks_pad == 0) + if (buf->__st_ino_pad == 0 && buf->__st_size_pad == 0 + && buf->__st_blocks_pad == 0) return 0; __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. */ static inline int statfs_overflow (struct statfs *buf) { - if (buf->__f_blocks_pad == 0 && buf->__f_bfree_pad == 0 && - buf->__f_bavail_pad == 0 && - (buf->__f_files_pad == 0 || - (buf->f_files == -1U && buf->__f_files_pad == -1)) && - (buf->__f_ffree_pad == 0 || - (buf->f_ffree == -1U && buf->__f_ffree_pad == -1))) + if (buf->__f_blocks_pad == 0 && buf->__f_bfree_pad == 0 + && buf->__f_bavail_pad == 0 + && (buf->__f_files_pad == 0 + || (buf->f_files == -1U && buf->__f_files_pad == -1)) + && (buf->__f_ffree_pad == 0 + || (buf->f_ffree == -1U && buf->__f_ffree_pad == -1))) return 0; __set_errno (EOVERFLOW); diff --git a/sysdeps/unix/sysv/linux/tst-personality.c b/sysdeps/unix/sysv/linux/tst-personality.c index 29be539..881ddfb 100644 --- a/sysdeps/unix/sysv/linux/tst-personality.c +++ b/sysdeps/unix/sysv/linux/tst-personality.c @@ -30,11 +30,11 @@ do_test (void) errno = 0xdefaced; saved_persona = personality (0xffffffff); - if (personality (test_persona) != saved_persona || - personality (0xffffffff) == -1 || - personality (PER_LINUX) == -1 || - personality (0xffffffff) != PER_LINUX || - 0xdefaced != errno) + if (personality (test_persona) != saved_persona + || personality (0xffffffff) == -1 + || personality (PER_LINUX) == -1 + || personality (0xffffffff) != PER_LINUX + || 0xdefaced != errno) rc = 1; (void) personality (saved_persona); diff --git a/sysdeps/unix/sysv/linux/tst-ttyname.c b/sysdeps/unix/sysv/linux/tst-ttyname.c index 6822b57..872b1fc 100644 --- a/sysdeps/unix/sysv/linux/tst-ttyname.c +++ b/sysdeps/unix/sysv/linux/tst-ttyname.c @@ -103,9 +103,9 @@ eq_ttyname (struct result actual, struct result expected) { char *actual_name, *expected_name; - if ((actual.err == expected.err) && - (!actual.name == !expected.name) && - (actual.name ? strcmp (actual.name, expected.name) == 0 : true)) + if ((actual.err == expected.err) + && (!actual.name == !expected.name) + && (actual.name ? strcmp (actual.name, expected.name) == 0 : true)) { if (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; - if ((actual.err == expected.err) && - (actual.ret == expected.ret) && - (!actual.name == !expected.name) && - (actual.name ? strcmp (actual.name, expected.name) == 0 : true)) + if ((actual.err == expected.err) + && (actual.ret == expected.ret) + && (!actual.name == !expected.name) + && (actual.name ? strcmp (actual.name, expected.name) == 0 : true)) { if (expected.name) expected_name = xasprintf ("\"%s\"", expected.name); @@ -570,9 +570,9 @@ run_chroot_tests (const char *slavename, int slave) struct dirent *d; while ((d = readdir (dirstream)) != NULL && ci < 3) { - if (strcmp (d->d_name, "console1") && - strcmp (d->d_name, "console2") && - strcmp (d->d_name, "console3") ) + if (strcmp (d->d_name, "console1") + && strcmp (d->d_name, "console2") + && strcmp (d->d_name, "console3") ) continue; c[ci++] = xasprintf ("/dev/%s", d->d_name); } |