diff options
Diffstat (limited to 'sysdeps/unix')
-rw-r--r-- | sysdeps/unix/sysv/linux/aarch64/sysdep.h | 6 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/alpha/ioperm.c | 13 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/bits/timex.h | 4 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/csky/sysdep.h | 4 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/generic/____longjmp_chk.c | 4 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/generic/futimesat.c | 4 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h | 6 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h | 6 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c | 4 |
9 files changed, 26 insertions, 25 deletions
diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep.h b/sysdeps/unix/sysv/linux/aarch64/sysdep.h index 10646d6..935c507f 100644 --- a/sysdeps/unix/sysv/linux/aarch64/sysdep.h +++ b/sysdeps/unix/sysv/linux/aarch64/sysdep.h @@ -255,9 +255,9 @@ #endif /* __ASSEMBLER__ */ /* Pointer mangling is supported for AArch64. */ -#if (IS_IN (rtld) || \ - (!defined SHARED && (IS_IN (libc) \ - || IS_IN (libpthread)))) +#if (IS_IN (rtld) \ + || (!defined SHARED && (IS_IN (libc) \ + || IS_IN (libpthread)))) # ifdef __ASSEMBLER__ /* Note, dst, src, guard, and tmp are all register numbers rather than register names so they will work with both ILP32 and LP64. */ diff --git a/sysdeps/unix/sysv/linux/alpha/ioperm.c b/sysdeps/unix/sysv/linux/alpha/ioperm.c index ab29cc9..861404e 100644 --- a/sysdeps/unix/sysv/linux/alpha/ioperm.c +++ b/sysdeps/unix/sysv/linux/alpha/ioperm.c @@ -506,14 +506,15 @@ process_cpuinfo(struct cpuinfo_data *data) { if (fgets_unlocked (dummy, 256, fp) == NULL) break; - if (!got_type && - sscanf (dummy, "system type : %256[^\n]\n", data->systype) == 1) + if (!got_type + && sscanf (dummy, "system type : %256[^\n]\n", data->systype) == 1) got_type = 1; - if (!got_vari && - sscanf (dummy, "system variation : %256[^\n]\n", data->sysvari) == 1) + if (!got_vari + && (sscanf (dummy, "system variation : %256[^\n]\n", data->sysvari) + == 1)) got_vari = 1; - if (!got_model && - sscanf (dummy, "cpu model : %256[^\n]\n", data->cpumodel) == 1) + if (!got_model + && sscanf (dummy, "cpu model : %256[^\n]\n", data->cpumodel) == 1) got_model = 1; } diff --git a/sysdeps/unix/sysv/linux/bits/timex.h b/sysdeps/unix/sysv/linux/bits/timex.h index 6b46641..bb272e8 100644 --- a/sysdeps/unix/sysv/linux/bits/timex.h +++ b/sysdeps/unix/sysv/linux/bits/timex.h @@ -104,7 +104,7 @@ struct timex #define STA_CLK 0x8000 /* clock source (0 = A, 1 = B) (ro) */ /* Read-only bits */ -#define STA_RONLY (STA_PPSSIGNAL | STA_PPSJITTER | STA_PPSWANDER | \ - STA_PPSERROR | STA_CLOCKERR | STA_NANO | STA_MODE | STA_CLK) +#define STA_RONLY (STA_PPSSIGNAL | STA_PPSJITTER | STA_PPSWANDER \ + | STA_PPSERROR | STA_CLOCKERR | STA_NANO | STA_MODE | STA_CLK) #endif /* bits/timex.h */ diff --git a/sysdeps/unix/sysv/linux/csky/sysdep.h b/sysdeps/unix/sysv/linux/csky/sysdep.h index 5e37c9a..4faaf85 100644 --- a/sysdeps/unix/sysv/linux/csky/sysdep.h +++ b/sysdeps/unix/sysv/linux/csky/sysdep.h @@ -486,8 +486,8 @@ __local_syscall_error: \ #endif /* __ASSEMBLER__ */ /* Pointer mangling support. */ -#if (IS_IN (rtld) || \ - (!defined SHARED && (IS_IN (libc) || IS_IN (libpthread)))) +#if (IS_IN (rtld) \ + || (!defined SHARED && (IS_IN (libc) || IS_IN (libpthread)))) # ifdef __ASSEMBLER__ # define PTR_MANGLE(dst, src, guard) \ grs t0, 1f; \ 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; diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h index 1481094..640fb52 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h +++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h @@ -233,9 +233,9 @@ #undef INTERNAL_SYSCALL #define INTERNAL_SYSCALL(name, err, nr, args...) \ - (((__NR_##name) < 256) ? \ - INTERNAL_SYSCALL_DIRECT(name, err, nr, args) : \ - INTERNAL_SYSCALL_SVC0(name, err,nr, args)) + (((__NR_##name) < 256) \ + ? INTERNAL_SYSCALL_DIRECT(name, err, nr, args) \ + : INTERNAL_SYSCALL_SVC0(name, err,nr, args)) #undef INTERNAL_SYSCALL_ERROR_P #define INTERNAL_SYSCALL_ERROR_P(val, err) \ diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h index d230192..9a9834c 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h +++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h @@ -239,9 +239,9 @@ #undef INTERNAL_SYSCALL #define INTERNAL_SYSCALL(name, err, nr, args...) \ - (((__NR_##name) < 256) ? \ - INTERNAL_SYSCALL_DIRECT(name, err, nr, args) : \ - INTERNAL_SYSCALL_SVC0(name, err,nr, args)) + (((__NR_##name) < 256) \ + ? INTERNAL_SYSCALL_DIRECT(name, err, nr, args) \ + : INTERNAL_SYSCALL_SVC0(name, err,nr, args)) #undef INTERNAL_SYSCALL_ERROR_P #define INTERNAL_SYSCALL_ERROR_P(val, err) \ diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c b/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c index 87853d6..8c308f5 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c @@ -58,8 +58,8 @@ __get_clockfreq_via_cpuinfo (void) while (mhz < endp && *mhz != '\n') { - if ((*mhz >= '0' && *mhz <= '9') || - (*mhz >= 'a' && *mhz <= 'f')) + if ((*mhz >= '0' && *mhz <= '9') + || (*mhz >= 'a' && *mhz <= 'f')) { result <<= 4; if (*mhz >= '0' && *mhz <= '9') |