lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Break further lines before not after operators.

Browse Source 
This patch continues the process of fixing coding style to break lines
before not after operators in accordance with the GNU Coding
Standards, fixing such issues in a non-exhaustive selection of sysdeps
files that had them.

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

	* sysdeps/arm/sysdep.h (#if condition): Break lines before rather
	than after operators.
	* sysdeps/mach/hurd/fork.c (__fork): Likewise.
	* sysdeps/mach/hurd/getcwd.c
	(__hurd_canonicalize_directory_name_internal): Likewise.
	* sysdeps/mach/hurd/htl/pt-mutex-consistent.c
	(pthread_mutex_consistent): Likewise.
	* sysdeps/mach/hurd/htl/pt-mutex-init.c (_pthread_mutex_init):
	Likewise.
	* sysdeps/mach/hurd/htl/pt-mutex-transfer-np.c
	(__pthread_mutex_transfer_np): Likewise.
	* sysdeps/mach/hurd/htl/pt-mutex-unlock.c
	(__pthread_mutex_unlock): Likewise.
	* sysdeps/mach/hurd/htl/pt-mutex.h (ROBUST_LOCK): Likewise.
	(mtx_owned_p): Likewise.
	* sysdeps/mach/hurd/htl/pt-mutexattr-getrobust.c
	(pthread_mutexattr_getrobust): Likewise.
	* sysdeps/mach/hurd/i386/init-first.c (init1): Likewise.
	* sysdeps/mach/hurd/i386/trampoline.c (_hurd_setup_sighandler):
	Likewise.
	* sysdeps/mach/hurd/ioctl.c (__ioctl): Likewise.
	* sysdeps/mach/hurd/jmp-unwind.c (_longjmp_unwind): Likewise.
	* sysdeps/mach/hurd/kill.c (__kill): Likewise.
	* sysdeps/mach/hurd/mig-reply.c (__mig_get_reply_port): Likewise.
	* sysdeps/mach/hurd/ptrace.c (ptrace): Likewise.
	* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Likewise.
	* sysdeps/unix/sysv/linux/aarch64/sysdep.h (#if condition):
	Likewise.
	* sysdeps/unix/sysv/linux/alpha/ioperm.c (process_cpuinfo):
	Likewise.
	* sysdeps/unix/sysv/linux/bits/timex.h (STA_RONLY): Likewise.
	* sysdeps/unix/sysv/linux/csky/sysdep.h (#if condition): Likewise.
	* sysdeps/unix/sysv/linux/generic/____longjmp_chk.c
	(____longjmp_chk): Likewise.
	* sysdeps/unix/sysv/linux/generic/futimesat.c (futimesat):
	Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
	(INTERNAL_SYSCALL): Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
	(INTERNAL_SYSCALL): Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c
	(__get_clockfreq_via_cpuinfo): Likewise.
This commit is contained in:
Joseph Myers
2019-02-26 15:01:50 +00:00
parent e0cb7b6131
commit aa0e46636a
27 changed files with 192 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sysdeps/unix/sysv/linux/aarch64/sysdep.h
View File

@ -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. */

13
sysdeps/unix/sysv/linux/alpha/ioperm.c
View File

@ -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;
}

4
sysdeps/unix/sysv/linux/bits/timex.h
View File

@ -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 */

4
sysdeps/unix/sysv/linux/csky/sysdep.h
View File

@ -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; \

4
sysdeps/unix/sysv/linux/generic/____longjmp_chk.c
View File

@ -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");

4
sysdeps/unix/sysv/linux/generic/futimesat.c
View File

@ -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;

6
sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
View File

@ -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) \

6
sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
View File

@ -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) \

4
sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c
View File

@ -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')