AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 12:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Break more lines before not after operators.

Browse Source 
This patch makes further coding style fixes where code was breaking
lines after an operator, contrary to the GNU Coding Standards.  As
with the previous patch, it is limited to files following a reasonable
approximation to GNU style already, and is not exhaustive; more such
issues remain to be fixed.

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

	* dirent/dirent.h [!_DIRENT_HAVE_D_NAMLEN
	&& _DIRENT_HAVE_D_RECLEN] (_D_ALLOC_NAMLEN): Break lines before
	rather than after operators.
	* elf/cache.c (print_cache): Likewise.
	* gshadow/fgetsgent_r.c (__fgetsgent_r): Likewise.
	* htl/pt-getattr.c (__pthread_getattr_np): Likewise.
	* hurd/hurdinit.c (_hurd_setproc): Likewise.
	* hurd/hurdkill.c (_hurd_sig_post): Likewise.
	* hurd/hurdlookup.c (__file_name_lookup_under): Likewise.
	* hurd/hurdsig.c (_hurd_internal_post_signal): Likewise.
	(reauth_proc): Likewise.
	* hurd/lookup-at.c (__file_name_lookup_at): Likewise.
	(__file_name_split_at): Likewise.
	(__directory_name_split_at): Likewise.
	* hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Likewise.
	* hurd/port2fd.c (_hurd_port2fd): Likewise.
	* iconv/gconv_dl.c (do_print): Likewise.
	* inet/netinet/in.h (struct sockaddr_in): Likewise.
	* libio/wstrops.c (_IO_wstr_seekoff): Likewise.
	* locale/setlocale.c (new_composite_name): Likewise.
	* malloc/memusagestat.c (main): Likewise.
	* misc/fstab.c (fstab_convert): Likewise.
	* nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock_usercnt):
	Likewise.
	* nss/nss_compat/compat-grp.c (getgrent_next_nss): Likewise.
	(getgrent_next_file): Likewise.
	(internal_getgrnam_r): Likewise.
	(internal_getgrgid_r): Likewise.
	* nss/nss_compat/compat-initgroups.c (getgrent_next_nss):
	Likewise.
	(internal_getgrent_r): Likewise.
	* nss/nss_compat/compat-pwd.c (getpwent_next_nss_netgr): Likewise.
	(getpwent_next_nss): Likewise.
	(getpwent_next_file): Likewise.
	(internal_getpwnam_r): Likewise.
	(internal_getpwuid_r): Likewise.
	* nss/nss_compat/compat-spwd.c (getspent_next_nss_netgr):
	Likewise.
	(getspent_next_nss): Likewise.
	(internal_getspnam_r): Likewise.
	* pwd/fgetpwent_r.c (__fgetpwent_r): Likewise.
	* shadow/fgetspent_r.c (__fgetspent_r): Likewise.
	* string/strchr.c (STRCHR): Likewise.
	* string/strchrnul.c (STRCHRNUL): Likewise.
	* sysdeps/aarch64/fpu/fpu_control.h (_FPU_FPCR_IEEE): Likewise.
	* sysdeps/aarch64/sfp-machine.h (_FP_CHOOSENAN): Likewise.
	* sysdeps/csky/dl-machine.h (elf_machine_rela): Likewise.
	* sysdeps/generic/memcopy.h (PAGE_COPY_FWD_MAYBE): Likewise.
	* sysdeps/generic/symbol-hacks.h (__stack_chk_fail_local):
	Likewise.
	* sysdeps/gnu/netinet/ip_icmp.h (ICMP_INFOTYPE): Likewise.
	* sysdeps/gnu/updwtmp.c (TRANSFORM_UTMP_FILE_NAME): Likewise.
	* sysdeps/gnu/utmp_file.c (TRANSFORM_UTMP_FILE_NAME): Likewise.
	* sysdeps/hppa/jmpbuf-unwind.h (_JMPBUF_UNWINDS): Likewise.
	* sysdeps/mach/hurd/bits/stat.h (S_ISPARE): Likewise.
	* sysdeps/mach/hurd/dl-sysdep.c (_dl_sysdep_start): Likewise.
	(open_file): Likewise.
	* sysdeps/mach/hurd/htl/pt-mutexattr-setprotocol.c
	(pthread_mutexattr_setprotocol): Likewise.
	* sysdeps/mach/hurd/ioctl.c (__ioctl): Likewise.
	* sysdeps/mach/hurd/mmap.c (__mmap): Likewise.
	* sysdeps/mach/hurd/ptrace.c (ptrace): Likewise.
	* sysdeps/mach/hurd/spawni.c (__spawni): Likewise.
	* sysdeps/microblaze/dl-machine.h (elf_machine_type_class):
	Likewise.
	(elf_machine_rela): Likewise.
	* sysdeps/mips/mips32/sfp-machine.h (_FP_CHOOSENAN): Likewise.
	* sysdeps/mips/mips64/sfp-machine.h (_FP_CHOOSENAN): Likewise.
	* sysdeps/mips/sys/asm.h (multiple #if conditionals): Likewise.
	* sysdeps/posix/rename.c (rename): Likewise.
	* sysdeps/powerpc/novmx-sigjmp.c (__novmx__sigjmp_save): Likewise.
	* sysdeps/powerpc/sigjmp.c (__vmx__sigjmp_save): Likewise.
	* sysdeps/s390/fpu/fenv_libc.h (FPC_VALID_MASK): Likewise.
	* sysdeps/s390/utf8-utf16-z9.c (gconv_end): Likewise.
	* sysdeps/unix/grantpt.c (grantpt): Likewise.
	* sysdeps/unix/sysv/linux/a.out.h (N_TXTOFF): Likewise.
	* sysdeps/unix/sysv/linux/updwtmp.c (TRANSFORM_UTMP_FILE_NAME):
	Likewise.
	* sysdeps/unix/sysv/linux/utmp_file.c (TRANSFORM_UTMP_FILE_NAME):
	Likewise.
	* sysdeps/x86/cpu-features.c (get_common_indices): Likewise.
	* time/tzfile.c (__tzfile_compute): Likewise.
This commit is contained in:
Joseph Myers 2019-02-25 13:19:19 +00:00
parent 34a5a1460e
commit a04549c194
58 changed files with 323 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
ChangeLog
View File

@ -1,3 +1,88 @@
2019-02-25 Joseph Myers <joseph@codesourcery.com>
* dirent/dirent.h [!_DIRENT_HAVE_D_NAMLEN
&& _DIRENT_HAVE_D_RECLEN] (_D_ALLOC_NAMLEN): Break lines before
rather than after operators.
* elf/cache.c (print_cache): Likewise.
* gshadow/fgetsgent_r.c (__fgetsgent_r): Likewise.
* htl/pt-getattr.c (__pthread_getattr_np): Likewise.
* hurd/hurdinit.c (_hurd_setproc): Likewise.
* hurd/hurdkill.c (_hurd_sig_post): Likewise.
* hurd/hurdlookup.c (__file_name_lookup_under): Likewise.
* hurd/hurdsig.c (_hurd_internal_post_signal): Likewise.
(reauth_proc): Likewise.
* hurd/lookup-at.c (__file_name_lookup_at): Likewise.
(__file_name_split_at): Likewise.
(__directory_name_split_at): Likewise.
* hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Likewise.
* hurd/port2fd.c (_hurd_port2fd): Likewise.
* iconv/gconv_dl.c (do_print): Likewise.
* inet/netinet/in.h (struct sockaddr_in): Likewise.
* libio/wstrops.c (_IO_wstr_seekoff): Likewise.
* locale/setlocale.c (new_composite_name): Likewise.
* malloc/memusagestat.c (main): Likewise.
* misc/fstab.c (fstab_convert): Likewise.
* nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock_usercnt):
Likewise.
* nss/nss_compat/compat-grp.c (getgrent_next_nss): Likewise.
(getgrent_next_file): Likewise.
(internal_getgrnam_r): Likewise.
(internal_getgrgid_r): Likewise.
* nss/nss_compat/compat-initgroups.c (getgrent_next_nss):
Likewise.
(internal_getgrent_r): Likewise.
* nss/nss_compat/compat-pwd.c (getpwent_next_nss_netgr): Likewise.
(getpwent_next_nss): Likewise.
(getpwent_next_file): Likewise.
(internal_getpwnam_r): Likewise.
(internal_getpwuid_r): Likewise.
* nss/nss_compat/compat-spwd.c (getspent_next_nss_netgr):
Likewise.
(getspent_next_nss): Likewise.
(internal_getspnam_r): Likewise.
* pwd/fgetpwent_r.c (__fgetpwent_r): Likewise.
* shadow/fgetspent_r.c (__fgetspent_r): Likewise.
* string/strchr.c (STRCHR): Likewise.
* string/strchrnul.c (STRCHRNUL): Likewise.
* sysdeps/aarch64/fpu/fpu_control.h (_FPU_FPCR_IEEE): Likewise.
* sysdeps/aarch64/sfp-machine.h (_FP_CHOOSENAN): Likewise.
* sysdeps/csky/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/generic/memcopy.h (PAGE_COPY_FWD_MAYBE): Likewise.
* sysdeps/generic/symbol-hacks.h (__stack_chk_fail_local):
Likewise.
* sysdeps/gnu/netinet/ip_icmp.h (ICMP_INFOTYPE): Likewise.
* sysdeps/gnu/updwtmp.c (TRANSFORM_UTMP_FILE_NAME): Likewise.
* sysdeps/gnu/utmp_file.c (TRANSFORM_UTMP_FILE_NAME): Likewise.
* sysdeps/hppa/jmpbuf-unwind.h (_JMPBUF_UNWINDS): Likewise.
* sysdeps/mach/hurd/bits/stat.h (S_ISPARE): Likewise.
* sysdeps/mach/hurd/dl-sysdep.c (_dl_sysdep_start): Likewise.
(open_file): Likewise.
* sysdeps/mach/hurd/htl/pt-mutexattr-setprotocol.c
(pthread_mutexattr_setprotocol): Likewise.
* sysdeps/mach/hurd/ioctl.c (__ioctl): Likewise.
* sysdeps/mach/hurd/mmap.c (__mmap): Likewise.
* sysdeps/mach/hurd/ptrace.c (ptrace): Likewise.
* sysdeps/mach/hurd/spawni.c (__spawni): Likewise.
* sysdeps/microblaze/dl-machine.h (elf_machine_type_class):
Likewise.
(elf_machine_rela): Likewise.
* sysdeps/mips/mips32/sfp-machine.h (_FP_CHOOSENAN): Likewise.
* sysdeps/mips/mips64/sfp-machine.h (_FP_CHOOSENAN): Likewise.
* sysdeps/mips/sys/asm.h (multiple #if conditionals): Likewise.
* sysdeps/posix/rename.c (rename): Likewise.
* sysdeps/powerpc/novmx-sigjmp.c (__novmx__sigjmp_save): Likewise.
* sysdeps/powerpc/sigjmp.c (__vmx__sigjmp_save): Likewise.
* sysdeps/s390/fpu/fenv_libc.h (FPC_VALID_MASK): Likewise.
* sysdeps/s390/utf8-utf16-z9.c (gconv_end): Likewise.
* sysdeps/unix/grantpt.c (grantpt): Likewise.
* sysdeps/unix/sysv/linux/a.out.h (N_TXTOFF): Likewise.
* sysdeps/unix/sysv/linux/updwtmp.c (TRANSFORM_UTMP_FILE_NAME):
Likewise.
* sysdeps/unix/sysv/linux/utmp_file.c (TRANSFORM_UTMP_FILE_NAME):
Likewise.
* sysdeps/x86/cpu-features.c (get_common_indices): Likewise.
* time/tzfile.c (__tzfile_compute): Likewise.
2019-02-22 Joseph Myers <joseph@codesourcery.com>
* benchtests/bench-memmem.c (simple_memmem): Break lines before

4
dirent/dirent.h
View File

@ -86,8 +86,8 @@ typedef __ino64_t ino64_t;
# ifdef _DIRENT_HAVE_D_RECLEN
# define _D_ALLOC_NAMLEN(d) (((char *) (d) + (d)->d_reclen) - &(d)->d_name[0])
# else
# define _D_ALLOC_NAMLEN(d) (sizeof (d)->d_name > 1 ? sizeof (d)->d_name : \
_D_EXACT_NAMLEN (d) + 1)
# define _D_ALLOC_NAMLEN(d) (sizeof (d)->d_name > 1 ? sizeof (d)->d_name \
: _D_EXACT_NAMLEN (d) + 1)
# endif
#endif

4
elf/cache.c
View File

@ -211,8 +211,8 @@ print_cache (const char *cache_name)
cache_data = (const char *) &cache->libs[cache->nlibs];
/* Check for a new cache embedded in the old format. */
if (cache_size >
(offset + sizeof (struct cache_file_new)))
if (cache_size
> (offset + sizeof (struct cache_file_new)))
{
cache_new = (struct cache_file_new *) ((void *)cache + offset);

6
gshadow/fgetsgent_r.c
View File

@ -61,11 +61,11 @@ __fgetsgent_r (FILE *stream, struct sgrp *resbuf, char *buffer, size_t buflen,
/* Skip leading blanks. */
while (isspace (*p))
++p;
} while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */
} while (*p == '\0' || *p == '#' /* Ignore empty and comment lines. */
/* Parse the line. If it is invalid, loop to
get the next line of the file to parse. */
! parse_line (buffer, (void *) resbuf, (void *) buffer, buflen,
&errno));
|| ! parse_line (buffer, (void *) resbuf, (void *) buffer, buflen,
&errno));
_IO_funlockfile (stream);

6
htl/pt-getattr.c
View File

@ -38,9 +38,9 @@ __pthread_getattr_np (pthread_t thread, pthread_attr_t *attr)
are not supported yet, so fill them with our default values. */
*attr = __pthread_default_attr;
attr->__stackaddr = pthread->stackaddr +
((pthread->guardsize + __vm_page_size - 1)
/ __vm_page_size * __vm_page_size);
attr->__stackaddr = (pthread->stackaddr
+ ((pthread->guardsize + __vm_page_size - 1)
/ __vm_page_size * __vm_page_size));
attr->__stacksize = pthread->stacksize;
attr->__guardsize = pthread->guardsize;
attr->__detachstate = (pthread->state == PTHREAD_DETACHED

8
hurd/hurdinit.c
View File

@ -198,10 +198,10 @@ _hurd_setproc (process_t procserver)
/* Tell the proc server where our args and environment are. */
if (err = __proc_set_arg_locations (procserver,
_hide_arguments ? 0 :
(vm_address_t) __libc_argv,
_hide_environment ? 0 :
(vm_address_t) __environ))
_hide_arguments ? 0
: (vm_address_t) __libc_argv,
_hide_environment ? 0
: (vm_address_t) __environ))
return err;
/* Those calls worked, so the port looks good. */

4
hurd/hurdkill.c
View File

@ -40,8 +40,8 @@ _hurd_sig_post (pid_t pid, int sig, mach_port_t arg_refport)
err = HURD_MSGPORT_RPC (__proc_getmsgport (proc, pid, &msgport),
(refport = arg_refport, 0), 0,
/* If no message port we cannot send signals. */
msgport == MACH_PORT_NULL ? EPERM :
__msg_sig_post (msgport, sig, 0, refport));
msgport == MACH_PORT_NULL ? EPERM
: __msg_sig_post (msgport, sig, 0, refport));
if (! err)
delivered = 1;
}

4
hurd/hurdlookup.c
View File

@ -268,8 +268,8 @@ __file_name_lookup_under (file_t startdir,
error_t use_init_port (int which, error_t (*operate) (mach_port_t))
{
return (which == INIT_PORT_CWDIR ? (*operate) (startdir) :
_hurd_ports_use (which, operate));
return (which == INIT_PORT_CWDIR ? (*operate) (startdir)
: _hurd_ports_use (which, operate));
}
err = __hurd_file_name_lookup (&use_init_port, &__getdport, 0,

24
hurd/hurdsig.c
View File

@ -538,8 +538,8 @@ _hurd_internal_post_signal (struct hurd_sigstate *ss,
assert_perror (err);
for (i = 0; i < nthreads; ++i)
{
if (threads[i] != _hurd_msgport_thread &&
(act != handle || threads[i] != ss->thread))
if (threads[i] != _hurd_msgport_thread
&& (act != handle || threads[i] != ss->thread))
{
err = __thread_resume (threads[i]);
assert_perror (err);
@ -715,9 +715,9 @@ _hurd_internal_post_signal (struct hurd_sigstate *ss,
}
}
if (_hurd_orphaned && act == stop &&
(__sigmask (signo) & (__sigmask (SIGTTIN) | __sigmask (SIGTTOU) |
__sigmask (SIGTSTP))))
if (_hurd_orphaned && act == stop
&& (__sigmask (signo) & (__sigmask (SIGTTIN) | __sigmask (SIGTTOU)
| __sigmask (SIGTSTP))))
{
/* If we would ordinarily stop for a job control signal, but we are
orphaned so noone would ever notice and continue us again, we just
@ -728,9 +728,9 @@ _hurd_internal_post_signal (struct hurd_sigstate *ss,
}
/* Handle receipt of a blocked signal, or any signal while stopped. */
if (act != ignore && /* Signals ignored now are forgotten now. */
__sigismember (&ss->blocked, signo) ||
(signo != SIGKILL && _hurd_stopped))
if (act != ignore /* Signals ignored now are forgotten now. */
&& __sigismember (&ss->blocked, signo)
|| (signo != SIGKILL && _hurd_stopped))
{
mark_pending ();
act = ignore;
@ -1368,10 +1368,10 @@ reauth_proc (mach_port_t new)
ref = __mach_reply_port ();
if (! HURD_PORT_USE (&_hurd_ports[INIT_PORT_PROC],
__proc_reauthenticate (port, ref,
MACH_MSG_TYPE_MAKE_SEND) ||
__auth_user_authenticate (new, ref,
MACH_MSG_TYPE_MAKE_SEND,
&ignore))
MACH_MSG_TYPE_MAKE_SEND)
|| __auth_user_authenticate (new, ref,
MACH_MSG_TYPE_MAKE_SEND,
&ignore))
&& ignore != MACH_PORT_NULL)
__mach_port_deallocate (__mach_task_self (), ignore);
__mach_port_destroy (__mach_task_self (), ref);

12
hurd/lookup-at.c
View File

@ -59,8 +59,8 @@ __file_name_lookup_at (int fd, int at_flags,
file_t startdir;
error_t use_init_port (int which, error_t (*operate) (mach_port_t))
{
return (which == INIT_PORT_CWDIR ? (*operate) (startdir) :
_hurd_ports_use (which, operate));
return (which == INIT_PORT_CWDIR ? (*operate) (startdir)
: _hurd_ports_use (which, operate));
}
err = HURD_DPORT_USE (fd, (startdir = port,
@ -89,8 +89,8 @@ __file_name_split_at (int fd, const char *file_name, char **name)
file_t startdir;
error_t use_init_port (int which, error_t (*operate) (mach_port_t))
{
return (which == INIT_PORT_CWDIR ? (*operate) (startdir) :
_hurd_ports_use (which, operate));
return (which == INIT_PORT_CWDIR ? (*operate) (startdir)
: _hurd_ports_use (which, operate));
}
err = HURD_DPORT_USE (fd, (startdir = port,
@ -114,8 +114,8 @@ __directory_name_split_at (int fd, const char *directory_name, char **name)
file_t startdir;
error_t use_init_port (int which, error_t (*operate) (mach_port_t))
{
return (which == INIT_PORT_CWDIR ? (*operate) (startdir) :
_hurd_ports_use (which, operate));
return (which == INIT_PORT_CWDIR ? (*operate) (startdir)
: _hurd_ports_use (which, operate));
}
err = HURD_DPORT_USE (fd, (startdir = port,

8
hurd/lookup-retry.c
View File

@ -213,11 +213,11 @@ __hurd_file_name_lookup_retry (error_t (*use_init_port)
int save = errno;
errno = 0;
fd = (int) __strtoul_internal (&retryname[3], &end, 10, 0);
if (end == NULL || errno || /* Malformed number. */
if (end == NULL || errno /* Malformed number. */
/* Check for excess text after the number. A slash
is valid; it ends the component. Anything else
does not name a numeric file descriptor. */
(*end != '/' && *end != '\0'))
|| (*end != '/' && *end != '\0'))
{
errno = save;
err = ENOENT;
@ -327,8 +327,8 @@ __hurd_file_name_lookup_retry (error_t (*use_init_port)
break;
case 'p':
if (retryname[1] == 'i' && retryname[2] == 'd' &&
(retryname[3] == '/' || retryname[3] == 0))
if (retryname[1] == 'i' && retryname[2] == 'd'
&& (retryname[3] == '/' || retryname[3] == 0))
{
char *p, buf[1024]; /* XXX */
size_t len;

5
hurd/port2fd.c
View File

@ -34,8 +34,9 @@ _hurd_port2fd (struct hurd_fd *d, io_t dport, int flags)
if (!(flags & O_IGNORE_CTTY))
__USEPORT (CTTYID,
({
if (port != MACH_PORT_NULL && /* Do we have a ctty? */
! __term_getctty (dport, &cttyid)) /* Could this be it? */
if (port != MACH_PORT_NULL /* Do we have a ctty? */
&& ! __term_getctty (dport, &cttyid))
/* Could this be it? */
{
__mach_port_deallocate (__mach_task_self (), cttyid);
/* This port is capable of being a controlling tty.

6
iconv/gconv_dl.c
View File

@ -224,9 +224,9 @@ do_print (const void *nodep, VISIT value, int level)
struct __gconv_loaded_object *obj = *(struct __gconv_loaded_object **) nodep;
printf ("%10s: \"%s\", %d\n",
value == leaf ? "leaf" :
value == preorder ? "preorder" :
value == postorder ? "postorder" : "endorder",
value == leaf ? "leaf"
: value == preorder ? "preorder"
: value == postorder ? "postorder" : "endorder",
obj->name, obj->counter);
}

8
inet/netinet/in.h
View File

@ -241,10 +241,10 @@ struct sockaddr_in
struct in_addr sin_addr; /* Internet address. */
/* Pad to size of `struct sockaddr'. */
unsigned char sin_zero[sizeof (struct sockaddr) -
__SOCKADDR_COMMON_SIZE -
sizeof (in_port_t) -
sizeof (struct in_addr)];
unsigned char sin_zero[sizeof (struct sockaddr)
- __SOCKADDR_COMMON_SIZE
- sizeof (in_port_t)
- sizeof (struct in_addr)];
};
#if !__USE_KERNEL_IPV6_DEFS

4
libio/wstrops.c
View File

@ -256,8 +256,8 @@ _IO_wstr_seekoff (FILE *fp, off64_t offset, int dir, int mode)
if (mode == 0 && (fp->_flags & _IO_TIED_PUT_GET))
mode = (fp->_flags & _IO_CURRENTLY_PUTTING ? _IOS_OUTPUT : _IOS_INPUT);
bool was_writing = (fp->_wide_data->_IO_write_ptr >
fp->_wide_data->_IO_write_base
bool was_writing = ((fp->_wide_data->_IO_write_ptr
> fp->_wide_data->_IO_write_base)
|| _IO_in_put_mode (fp));
if (was_writing)
_IO_wstr_switch_to_get_mode (fp);

12
locale/setlocale.c
View File

@ -148,9 +148,9 @@ new_composite_name (int category, const char *newnames[__LC_LAST])
for (i = 0; i < __LC_LAST; ++i)
if (i != LC_ALL)
{
const char *name = (category == LC_ALL ? newnames[i] :
category == i ? newnames[0] :
_nl_global_locale.__names[i]);
const char *name = (category == LC_ALL ? newnames[i]
: category == i ? newnames[0]
: _nl_global_locale.__names[i]);
last_len = strlen (name);
cumlen += _nl_category_name_sizes[i] + 1 + last_len + 1;
if (same && name != newnames[0] && strcmp (name, newnames[0]) != 0)
@ -177,9 +177,9 @@ new_composite_name (int category, const char *newnames[__LC_LAST])
if (i != LC_ALL)
{
/* Add "CATEGORY=NAME;" to the string. */
const char *name = (category == LC_ALL ? newnames[i] :
category == i ? newnames[0] :
_nl_global_locale.__names[i]);
const char *name = (category == LC_ALL ? newnames[i]
: category == i ? newnames[0]
: _nl_global_locale.__names[i]);
p = __stpcpy (p, _nl_category_names.str + _nl_category_name_idxs[i]);
*p++ = '=';
p = __stpcpy (p, name);

4
malloc/memusagestat.c
View File

@ -346,8 +346,8 @@ main (int argc, char *argv[])
if (cnt != cnt2)
gdImageDashedLine (im_out, 40, ysize - 20 - cnt2, xsize - 40,
ysize - 20 - cnt2, green);
snprintf (buf, sizeof (buf), stack_format, maxsize_stack / 4 * line /
stack_scale);
snprintf (buf, sizeof (buf), stack_format,
maxsize_stack / 4 * line / stack_scale);
gdImageString (im_out, gdFontSmall, xsize - 37, ysize - 26 - cnt2,
(unsigned char *) buf, green);
}

12
misc/fstab.c
View File

@ -163,12 +163,12 @@ fstab_convert (struct fstab_state *state)
f->fs_file = m->mnt_dir;
f->fs_vfstype = m->mnt_type;
f->fs_mntops = m->mnt_opts;
f->fs_type = (__hasmntopt (m, FSTAB_RW) ? FSTAB_RW :
__hasmntopt (m, FSTAB_RQ) ? FSTAB_RQ :
__hasmntopt (m, FSTAB_RO) ? FSTAB_RO :
__hasmntopt (m, FSTAB_SW) ? FSTAB_SW :
__hasmntopt (m, FSTAB_XX) ? FSTAB_XX :
"??");
f->fs_type = (__hasmntopt (m, FSTAB_RW) ? FSTAB_RW
: __hasmntopt (m, FSTAB_RQ) ? FSTAB_RQ
: __hasmntopt (m, FSTAB_RO) ? FSTAB_RO
: __hasmntopt (m, FSTAB_SW) ? FSTAB_SW
: __hasmntopt (m, FSTAB_XX) ? FSTAB_XX
: "??");
f->fs_freq = m->mnt_freq;
f->fs_passno = m->mnt_passno;
return f;

5
nptl/pthread_mutex_unlock.c
View File

@ -38,8 +38,9 @@ __pthread_mutex_unlock_usercnt (pthread_mutex_t *mutex, int decr)
/* See concurrency notes regarding mutex type which is loaded from __kind
in struct __pthread_mutex_s in sysdeps/nptl/bits/thread-shared-types.h. */
int type = PTHREAD_MUTEX_TYPE_ELISION (mutex);
if (__builtin_expect (type &
~(PTHREAD_MUTEX_KIND_MASK_NP|PTHREAD_MUTEX_ELISION_FLAGS_NP), 0))
if (__builtin_expect (type
& ~(PTHREAD_MUTEX_KIND_MASK_NP
|PTHREAD_MUTEX_ELISION_FLAGS_NP), 0))
return __pthread_mutex_unlock_full (mutex, decr);
if (__builtin_expect (type, PTHREAD_MUTEX_TIMED_NP)

22
nss/nss_compat/compat-grp.c
View File

@ -196,8 +196,8 @@ getgrent_next_nss (struct group *result, ent_t *ent, char *buffer,
{
enum nss_status status;
if ((status = nss_getgrent_r (result, buffer, buflen, errnop)) !=
NSS_STATUS_SUCCESS)
if ((status = nss_getgrent_r (result, buffer, buflen, errnop))
!= NSS_STATUS_SUCCESS)
return status;
}
while (in_blacklist (result->gr_name, strlen (result->gr_name), ent));
@ -266,11 +266,11 @@ getgrent_next_file (struct group *result, ent_t *ent,
while (isspace (*p))
++p;
}
while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */
while (*p == '\0' || *p == '#' /* Ignore empty and comment lines. */
/* Parse the line. If it is invalid, loop to
get the next line of the file to parse. */
!(parse_res = _nss_files_parse_grent (p, result, data, buflen,
errnop)));
|| !(parse_res = _nss_files_parse_grent (p, result, data, buflen,
errnop)));
if (__glibc_unlikely (parse_res == -1))
/* The parser ran out of space. */
@ -399,11 +399,11 @@ internal_getgrnam_r (const char *name, struct group *result, ent_t *ent,
while (isspace (*p))
++p;
}
while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */
while (*p == '\0' || *p == '#' /* Ignore empty and comment lines. */
/* Parse the line. If it is invalid, loop to
get the next line of the file to parse. */
!(parse_res = _nss_files_parse_grent (p, result, data, buflen,
errnop)));
|| !(parse_res = _nss_files_parse_grent (p, result, data, buflen,
errnop)));
if (__glibc_unlikely (parse_res == -1))
/* The parser ran out of space. */
@ -530,11 +530,11 @@ internal_getgrgid_r (gid_t gid, struct group *result, ent_t *ent,
while (isspace (*p))
++p;
}
while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */
while (*p == '\0' || *p == '#' /* Ignore empty and comment lines. */
/* Parse the line. If it is invalid, loop to
get the next line of the file to parse. */
!(parse_res = _nss_files_parse_grent (p, result, data, buflen,
errnop)));
|| !(parse_res = _nss_files_parse_grent (p, result, data, buflen,
errnop)));
if (__glibc_unlikely (parse_res == -1))
/* The parser ran out of space. */

10
nss/nss_compat/compat-initgroups.c
View File

@ -334,8 +334,8 @@ getgrent_next_nss (ent_t *ent, char *buffer, size_t buflen, const char *user,
iter:
do
{
if ((status = nss_getgrent_r (&grpbuf, buffer, buflen, errnop)) !=
NSS_STATUS_SUCCESS)
if ((status = nss_getgrent_r (&grpbuf, buffer, buflen, errnop))
!= NSS_STATUS_SUCCESS)
break;
}
while (in_blacklist (grpbuf.gr_name, strlen (grpbuf.gr_name), ent));
@ -394,11 +394,11 @@ internal_getgrent_r (ent_t *ent, char *buffer, size_t buflen, const char *user,
while (isspace (*p))
++p;
}
while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */
while (*p == '\0' || *p == '#' /* Ignore empty and comment lines. */
/* Parse the line. If it is invalid, loop to
get the next line of the file to parse. */
!(parse_res = _nss_files_parse_grent (p, &grpbuf, data, buflen,
errnop)));
|| !(parse_res = _nss_files_parse_grent (p, &grpbuf, data, buflen,
errnop)));
if (__glibc_unlikely (parse_res == -1))
/* The parser ran out of space. */

26
nss/nss_compat/compat-pwd.c
View File

@ -370,8 +370,8 @@ getpwent_next_nss_netgr (const char *name, struct passwd *result, ent_t *ent,
p2 = buffer + (buflen - p2len);
buflen -= p2len;
if (nss_getpwnam_r (user, result, buffer, buflen, errnop) !=
NSS_STATUS_SUCCESS)
if (nss_getpwnam_r (user, result, buffer, buflen, errnop)
!= NSS_STATUS_SUCCESS)
continue;
if (!in_blacklist (result->pw_name, strlen (result->pw_name), ent))
@ -418,8 +418,8 @@ getpwent_next_nss (struct passwd *result, ent_t *ent, char *buffer,
do
{
if ((status = nss_getpwent_r (result, buffer, buflen, errnop)) !=
NSS_STATUS_SUCCESS)
if ((status = nss_getpwent_r (result, buffer, buflen, errnop))
!= NSS_STATUS_SUCCESS)
return status;
}
while (in_blacklist (result->pw_name, strlen (result->pw_name), ent));
@ -506,11 +506,11 @@ getpwent_next_file (struct passwd *result, ent_t *ent,
while (isspace (*p))
++p;
}
while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */
while (*p == '\0' || *p == '#' /* Ignore empty and comment lines. */
/* Parse the line. If it is invalid, loop to
get the next line of the file to parse. */
!(parse_res = _nss_files_parse_pwent (p, result, data, buflen,
errnop)));
|| !(parse_res = _nss_files_parse_pwent (p, result, data, buflen,
errnop)));
if (__glibc_unlikely (parse_res == -1))
/* The parser ran out of space. */
@ -706,11 +706,11 @@ internal_getpwnam_r (const char *name, struct passwd *result, ent_t *ent,
while (isspace (*p))
++p;
}
while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */
while (*p == '\0' || *p == '#' /* Ignore empty and comment lines. */
/* Parse the line. If it is invalid, loop to
get the next line of the file to parse. */
!(parse_res = _nss_files_parse_pwent (p, result, data, buflen,
errnop)));
|| !(parse_res = _nss_files_parse_pwent (p, result, data, buflen,
errnop)));
if (__glibc_unlikely (parse_res == -1))
/* The parser ran out of space. */
@ -912,11 +912,11 @@ internal_getpwuid_r (uid_t uid, struct passwd *result, ent_t *ent,
while (isspace (*p))
++p;
}
while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */
while (*p == '\0' || *p == '#' /* Ignore empty and comment lines. */
/* Parse the line. If it is invalid, loop to
get the next line of the file to parse. */
!(parse_res = _nss_files_parse_pwent (p, result, data, buflen,
errnop)));
|| !(parse_res = _nss_files_parse_pwent (p, result, data, buflen,
errnop)));
if (__glibc_unlikely (parse_res == -1))
/* The parser ran out of space. */

14
nss/nss_compat/compat-spwd.c
View File

@ -330,8 +330,8 @@ getspent_next_nss_netgr (const char *name, struct spwd *result, ent_t *ent,
p2 = buffer + (buflen - p2len);
buflen -= p2len;
if (nss_getspnam_r (user, result, buffer, buflen, errnop) !=
NSS_STATUS_SUCCESS)
if (nss_getspnam_r (user, result, buffer, buflen, errnop)
!= NSS_STATUS_SUCCESS)
continue;
if (!in_blacklist (result->sp_namp, strlen (result->sp_namp), ent))
@ -369,8 +369,8 @@ getspent_next_nss (struct spwd *result, ent_t *ent,
buflen -= p2len;
do
{
if ((status = nss_getspent_r (result, buffer, buflen, errnop)) !=
NSS_STATUS_SUCCESS)
if ((status = nss_getspent_r (result, buffer, buflen, errnop))
!= NSS_STATUS_SUCCESS)
return status;
}
while (in_blacklist (result->sp_namp, strlen (result->sp_namp), ent));
@ -663,11 +663,11 @@ internal_getspnam_r (const char *name, struct spwd *result, ent_t *ent,
while (isspace (*p))
++p;
}
while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */
while (*p == '\0' || *p == '#' /* Ignore empty and comment lines. */
/* Parse the line. If it is invalid, loop to
get the next line of the file to parse. */
!(parse_res = _nss_files_parse_spent (p, result, data, buflen,
errnop)));
|| !(parse_res = _nss_files_parse_spent (p, result, data, buflen,
errnop)));
if (__glibc_unlikely (parse_res == -1))
/* The parser ran out of space. */

4
pwd/fgetpwent_r.c
View File

@ -97,10 +97,10 @@ __fgetpwent_r (FILE *stream, struct passwd *resbuf, char *buffer,
/* Skip leading blanks. */
while (isspace (*p))
++p;
} while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */
} while (*p == '\0' || *p == '#' /* Ignore empty and comment lines. */
/* Parse the line. If it is invalid, loop to
get the next line of the file to parse. */
! parse_line (p, resbuf, (void *) buffer, buflen, &errno));
|| ! parse_line (p, resbuf, (void *) buffer, buflen, &errno));
funlockfile (stream);

4
shadow/fgetspent_r.c
View File

@ -64,10 +64,10 @@ __fgetspent_r (FILE *stream, struct spwd *resbuf, char *buffer, size_t buflen,
/* Skip leading blanks. */
while (isspace (*p))
++p;
} while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */
} while (*p == '\0' || *p == '#' /* Ignore empty and comment lines. */
/* Parse the line. If it is invalid, loop to
get the next line of the file to parse. */
! parse_line (buffer, (void *) resbuf, NULL, 0, &errno));
|| ! parse_line (buffer, (void *) resbuf, NULL, 0, &errno));
funlockfile (stream);

6
string/strchr.c
View File

@ -126,11 +126,11 @@ STRCHR (const char *s, int c_in)
/* Look at only the hole bits. If any of the hole bits
are unchanged, most likely one of the bytes was a
zero. */
& ~magic_bits) != 0 ||
& ~magic_bits) != 0
/* That caught zeroes. Now test for C. */
((((longword ^ charmask) + magic_bits) ^ ~(longword ^ charmask))
& ~magic_bits) != 0)
|| ((((longword ^ charmask) + magic_bits) ^ ~(longword ^ charmask))
& ~magic_bits) != 0)
{
/* Which of the bytes was C or zero?
If none of them were, it was a misfire; continue the search. */

6
string/strchrnul.c
View File

@ -126,11 +126,11 @@ STRCHRNUL (const char *s, int c_in)
/* Look at only the hole bits. If any of the hole bits
are unchanged, most likely one of the bytes was a
zero. */
& ~magic_bits) != 0 ||
& ~magic_bits) != 0
/* That caught zeroes. Now test for C. */
((((longword ^ charmask) + magic_bits) ^ ~(longword ^ charmask))
& ~magic_bits) != 0)
|| ((((longword ^ charmask) + magic_bits) ^ ~(longword ^ charmask))
& ~magic_bits) != 0)
{
/* Which of the bytes was C or zero?
If none of them were, it was a misfire; continue the search. */

6
sysdeps/aarch64/fpu/fpu_control.h
View File

@ -75,9 +75,9 @@
#define _FPU_FPCR_MASK_IOE 0x0100
#define _FPU_FPCR_IEEE \
(_FPU_DEFAULT | _FPU_FPCR_MASK_IXE | \
_FPU_FPCR_MASK_UFE | _FPU_FPCR_MASK_OFE | \
_FPU_FPCR_MASK_DZE | _FPU_FPCR_MASK_IOE)
(_FPU_DEFAULT | _FPU_FPCR_MASK_IXE \
| _FPU_FPCR_MASK_UFE | _FPU_FPCR_MASK_OFE \
| _FPU_FPCR_MASK_DZE | _FPU_FPCR_MASK_IOE)
#define _FPU_FPSR_IEEE 0

4
sysdeps/aarch64/sfp-machine.h
View File

@ -31,8 +31,8 @@
NaNs is sNaN, in which case the result is NANSIGN/NANFRAC. */
#define _FP_CHOOSENAN(fs, wc, R, X, Y, OP) \
do { \
if ((_FP_FRAC_HIGH_RAW_##fs(X) | \
_FP_FRAC_HIGH_RAW_##fs(Y)) & _FP_QNANBIT_##fs) \
if ((_FP_FRAC_HIGH_RAW_##fs(X) \
| _FP_FRAC_HIGH_RAW_##fs(Y)) & _FP_QNANBIT_##fs) \
{ \
R##_s = _FP_NANSIGN_##fs; \
_FP_FRAC_SET_##wc(R,_FP_NANFRAC_##fs); \

4
sysdeps/csky/dl-machine.h
View File

@ -282,8 +282,8 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
break;
case R_CKCORE_PCREL_IMM26BY2:
{
unsigned int offset = ((value + reloc->r_addend -
(unsigned int)reloc_addr) >> 1);
unsigned int offset = ((value + reloc->r_addend
- (unsigned int)reloc_addr) >> 1);
insn_opcode = (*opcode16_addr << 16) | (*(opcode16_addr + 1));
if (offset > 0x3ffffff){
const char *strtab;

4
sysdeps/generic/memcopy.h
View File

@ -164,8 +164,8 @@ extern void _wordcopy_bwd_dest_aligned (long int, long int, size_t)
# define PAGE_COPY_FWD_MAYBE(dstp, srcp, nbytes_left, nbytes) \
do \
{ \
if ((nbytes) >= PAGE_COPY_THRESHOLD && \
PAGE_OFFSET ((dstp) - (srcp)) == 0) \
if ((nbytes) >= PAGE_COPY_THRESHOLD \
&& PAGE_OFFSET ((dstp) - (srcp)) == 0) \
{ \
/* The amount to copy is past the threshold for copying \
pages virtually with kernel VM operations, and the \

4
sysdeps/generic/symbol-hacks.h
View File

@ -11,8 +11,8 @@ asm ("memcpy = __GI_memcpy");
__stack_chk_fail itself is a global symbol, exported from libc.so,
and cannot be made hidden. */
# if IS_IN (libc) && defined SHARED && \
defined STACK_PROTECTOR_LEVEL && STACK_PROTECTOR_LEVEL > 0
# if IS_IN (libc) && defined SHARED \
&& defined STACK_PROTECTOR_LEVEL && STACK_PROTECTOR_LEVEL > 0
asm (".hidden __stack_chk_fail_local\n"
"__stack_chk_fail = __stack_chk_fail_local");
# endif

10
sysdeps/gnu/netinet/ip_icmp.h
View File

@ -269,11 +269,11 @@ struct icmp
#define ICMP_PARAMPROB_OPTABSENT 1 /* req. opt. absent */
#define ICMP_INFOTYPE(type) \
((type) == ICMP_ECHOREPLY || (type) == ICMP_ECHO || \
(type) == ICMP_ROUTERADVERT || (type) == ICMP_ROUTERSOLICIT || \
(type) == ICMP_TSTAMP || (type) == ICMP_TSTAMPREPLY || \
(type) == ICMP_IREQ || (type) == ICMP_IREQREPLY || \
(type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY)
((type) == ICMP_ECHOREPLY || (type) == ICMP_ECHO \
|| (type) == ICMP_ROUTERADVERT || (type) == ICMP_ROUTERSOLICIT \
|| (type) == ICMP_TSTAMP || (type) == ICMP_TSTAMPREPLY \
|| (type) == ICMP_IREQ || (type) == ICMP_IREQREPLY \
|| (type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY)
#endif /* __USE_MISC */

14
sysdeps/gnu/updwtmp.c
View File

@ -19,11 +19,13 @@
#include <string.h>
#include <unistd.h>
#define TRANSFORM_UTMP_FILE_NAME(file_name) \
((strcmp (file_name, _PATH_UTMP "x") == 0 \
&& __access (_PATH_UTMP "x", F_OK) != 0) ? _PATH_UTMP : \
((strcmp (file_name, _PATH_WTMP "x") == 0 \
&& __access (_PATH_WTMP "x", F_OK) != 0) ? _PATH_WTMP : \
file_name))
#define TRANSFORM_UTMP_FILE_NAME(file_name) \
((strcmp (file_name, _PATH_UTMP "x") == 0 \
&& __access (_PATH_UTMP "x", F_OK) != 0) \
? _PATH_UTMP \
: ((strcmp (file_name, _PATH_WTMP "x") == 0 \
&& __access (_PATH_WTMP "x", F_OK) != 0) \
? _PATH_WTMP \
: file_name))
#include <login/updwtmp.c>

14
sysdeps/gnu/utmp_file.c
View File

@ -19,11 +19,13 @@
#include <string.h>
#include <unistd.h>
#define TRANSFORM_UTMP_FILE_NAME(file_name) \
((strcmp (file_name, _PATH_UTMP "x") == 0 \
&& __access (_PATH_UTMP "x", F_OK) != 0) ? _PATH_UTMP : \
((strcmp (file_name, _PATH_WTMP "x") == 0 \
&& __access (_PATH_WTMP "x", F_OK) != 0) ? _PATH_WTMP : \
file_name))
#define TRANSFORM_UTMP_FILE_NAME(file_name) \
((strcmp (file_name, _PATH_UTMP "x") == 0 \
&& __access (_PATH_UTMP "x", F_OK) != 0) \
? _PATH_UTMP \
: ((strcmp (file_name, _PATH_WTMP "x") == 0 \
&& __access (_PATH_WTMP "x", F_OK) != 0) \
? _PATH_WTMP \
: file_name))
#include <login/utmp_file.c>

4
sysdeps/hppa/jmpbuf-unwind.h
View File

@ -22,5 +22,5 @@
/* Test if longjmp to JMPBUF would unwind the frame containing a local
variable at ADDRESS. */
#define _JMPBUF_UNWINDS(_jmpbuf, _address, _demangle) \
((void *) (_address) > \
(void *) _demangle ((((unsigned long *) _jmpbuf)[JB_SP])))
((void *) (_address) \
> (void *) _demangle ((((unsigned long *) _jmpbuf)[JB_SP])))

4
sysdeps/mach/hurd/bits/stat.h
View File

@ -218,8 +218,8 @@ struct stat64
#define S_IMMAP0 000100000000
/* ALL the unused bits. */
#define S_ISPARE (~(S_IFMT|S_ITRANS|S_INOCACHE|S_IMMAP0| \
S_IUSEUNK|S_IUNKNOWN|07777))
#define S_ISPARE (~(S_IFMT|S_ITRANS|S_INOCACHE|S_IMMAP0 \
|S_IUSEUNK|S_IUNKNOWN|07777))
#endif
#ifdef __USE_MISC

8
sysdeps/mach/hurd/dl-sysdep.c
View File

@ -132,8 +132,8 @@ _dl_sysdep_start (void **start_argptr,
__tunables_init (_environ);
if (_dl_hurd_data->flags & EXEC_STACK_ARGS &&
_dl_hurd_data->user_entry == 0)
if (_dl_hurd_data->flags & EXEC_STACK_ARGS
&& _dl_hurd_data->user_entry == 0)
_dl_hurd_data->user_entry = (vm_address_t) ENTRY_POINT;
unfmh(); /* XXX */
@ -319,8 +319,8 @@ open_file (const char *file_name, int flags,
assert (!(flags & ~(O_READ | O_CLOEXEC)));
startdir = _dl_hurd_data->portarray[file_name[0] == '/' ?
INIT_PORT_CRDIR : INIT_PORT_CWDIR];
startdir = _dl_hurd_data->portarray[file_name[0] == '/'
? INIT_PORT_CRDIR : INIT_PORT_CWDIR];
while (file_name[0] == '/')
file_name++;

7
sysdeps/mach/hurd/htl/pt-mutexattr-setprotocol.c
View File

@ -27,7 +27,8 @@ int
pthread_mutexattr_setprotocol (pthread_mutexattr_t *attrp, int proto)
{
(void) attrp;
return proto == PTHREAD_PRIO_NONE ? 0 :
proto != PTHREAD_PRIO_INHERIT &&
proto != PTHREAD_PRIO_PROTECT ? EINVAL : ENOTSUP;
return (proto == PTHREAD_PRIO_NONE
? 0
: (proto != PTHREAD_PRIO_INHERIT
&& proto != PTHREAD_PRIO_PROTECT) ? EINVAL : ENOTSUP);
}

6
sysdeps/mach/hurd/ioctl.c
View File

@ -199,9 +199,9 @@ __ioctl (int fd, unsigned long int request, ...)
return MIG_TYPE_ERROR;
#ifdef MACH_MSG_TYPE_BIT
if (msg.header_typecheck.RetCodeType !=
((union { mach_msg_type_t t; int i; })
{ t: io2mach_type (1, _IOTS (msg.header.RetCode)) }).i)
if (msg.header_typecheck.RetCodeType
!= ((union { mach_msg_type_t t; int i; })
{ t: io2mach_type (1, _IOTS (msg.header.RetCode)) }).i)
return MIG_TYPE_ERROR;
#endif
return msg.header.RetCode;

4
sysdeps/mach/hurd/mmap.c
View File

@ -120,8 +120,8 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset)
/* Remove extra reference. */
__mach_port_deallocate (__mach_task_self (), memobj);
}
else if (wobj == MACH_PORT_NULL && /* Not writable by mapping. */
!(flags & MAP_SHARED))
else if (wobj == MACH_PORT_NULL /* Not writable by mapping. */
&& !(flags & MAP_SHARED))
/* The file can only be mapped for reading. Since we are
making a private mapping, we will never try to write the
object anyway, so we don't care. */

4
sysdeps/mach/hurd/ptrace.c
View File

@ -178,8 +178,8 @@ ptrace (enum __ptrace_request request, ... )
if (! err)
{
err = __msg_set_init_int (msgport, task, INIT_TRACEMASK,
request == PTRACE_DETACH ? 0 :
~(sigset_t) 0);
request == PTRACE_DETACH ? 0
: ~(sigset_t) 0);
if (! err)
{
if (request == PTRACE_ATTACH)

4
sysdeps/mach/hurd/spawni.c
View File

@ -264,8 +264,8 @@ __spawni (pid_t *pid, const char *file,
{
error_t use_init_port (int which, error_t (*operate) (mach_port_t))
{
return (which == INIT_PORT_CWDIR ? (*operate) (startdir) :
child_init_port (which, operate));
return (which == INIT_PORT_CWDIR ? (*operate) (startdir)
: child_init_port (which, operate));
}
return __hurd_file_name_lookup (&use_init_port, &child_fd, 0,

14
sysdeps/microblaze/dl-machine.h
View File

@ -153,10 +153,10 @@ _dl_start_user:\n\
of the main executable's symbols, as for a COPY reloc. */
#ifndef RTLD_BOOTSTRAP
# define elf_machine_type_class(type) \
(((type) == R_MICROBLAZE_JUMP_SLOT || \
(type) == R_MICROBLAZE_TLSDTPREL32 || \
(type) == R_MICROBLAZE_TLSDTPMOD32 || \
(type) == R_MICROBLAZE_TLSTPREL32) \
(((type) == R_MICROBLAZE_JUMP_SLOT \
|| (type) == R_MICROBLAZE_TLSDTPREL32 \
|| (type) == R_MICROBLAZE_TLSDTPMOD32 \
|| (type) == R_MICROBLAZE_TLSTPREL32) \
* ELF_RTYPE_CLASS_PLT \
| ((type) == R_MICROBLAZE_COPY) * ELF_RTYPE_CLASS_COPY)
#else
@ -226,9 +226,9 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
Elf32_Addr value = SYMBOL_ADDRESS (sym_map, sym, true);
value += reloc->r_addend;
if (r_type == R_MICROBLAZE_GLOB_DAT ||
r_type == R_MICROBLAZE_JUMP_SLOT ||
r_type == R_MICROBLAZE_32)
if (r_type == R_MICROBLAZE_GLOB_DAT
|| r_type == R_MICROBLAZE_JUMP_SLOT
|| r_type == R_MICROBLAZE_32)
{
*reloc_addr = value;
}

4
sysdeps/mips/mips32/sfp-machine.h
View File

@ -56,8 +56,8 @@
NaNs is sNaN, in which case the result is NANSIGN/NANFRAC. */
# define _FP_CHOOSENAN(fs, wc, R, X, Y, OP) \
do { \
if ((_FP_FRAC_HIGH_RAW_##fs(X) | \
_FP_FRAC_HIGH_RAW_##fs(Y)) & _FP_QNANBIT_##fs) \
if ((_FP_FRAC_HIGH_RAW_##fs(X) \
| _FP_FRAC_HIGH_RAW_##fs(Y)) & _FP_QNANBIT_##fs) \
{ \
R##_s = _FP_NANSIGN_##fs; \
_FP_FRAC_SET_##wc(R,_FP_NANFRAC_##fs); \

4
sysdeps/mips/mips64/sfp-machine.h
View File

@ -59,8 +59,8 @@
NaNs is sNaN, in which case the result is NANSIGN/NANFRAC. */
# define _FP_CHOOSENAN(fs, wc, R, X, Y, OP) \
do { \
if ((_FP_FRAC_HIGH_RAW_##fs(X) | \
_FP_FRAC_HIGH_RAW_##fs(Y)) & _FP_QNANBIT_##fs) \
if ((_FP_FRAC_HIGH_RAW_##fs(X) \
| _FP_FRAC_HIGH_RAW_##fs(Y)) & _FP_QNANBIT_##fs) \
{ \
R##_s = _FP_NANSIGN_##fs; \
_FP_FRAC_SET_##wc(R,_FP_NANFRAC_##fs); \

16
sysdeps/mips/sys/asm.h
View File

@ -232,8 +232,8 @@ symbol = value
* MIPS IV implementations are free to treat this as a nop. The R5000
* is one of them. So we should have an option not to use this instruction.
*/
#if (_MIPS_ISA == _MIPS_ISA_MIPS4) || (_MIPS_ISA == _MIPS_ISA_MIPS5) || \
(_MIPS_ISA == _MIPS_ISA_MIPS32) || (_MIPS_ISA == _MIPS_ISA_MIPS64)
#if (_MIPS_ISA == _MIPS_ISA_MIPS4) || (_MIPS_ISA == _MIPS_ISA_MIPS5) \
|| (_MIPS_ISA == _MIPS_ISA_MIPS32) || (_MIPS_ISA == _MIPS_ISA_MIPS64)
# define PREF(hint,addr) \
pref hint,addr
# define PREFX(hint,addr) \
@ -278,8 +278,8 @@ symbol = value
.set pop; \
9:
#endif /* (_MIPS_ISA == _MIPS_ISA_MIPS2) || (_MIPS_ISA == _MIPS_ISA_MIPS3) */
#if (_MIPS_ISA == _MIPS_ISA_MIPS4) || (_MIPS_ISA == _MIPS_ISA_MIPS5) || \
(_MIPS_ISA == _MIPS_ISA_MIPS32) || (_MIPS_ISA == _MIPS_ISA_MIPS64)
#if (_MIPS_ISA == _MIPS_ISA_MIPS4) || (_MIPS_ISA == _MIPS_ISA_MIPS5) \
|| (_MIPS_ISA == _MIPS_ISA_MIPS32) || (_MIPS_ISA == _MIPS_ISA_MIPS64)
# define MOVN(rd,rs,rt) \
movn rd,rs,rt
# define MOVZ(rd,rs,rt) \
@ -468,13 +468,13 @@ symbol = value
/*
* Some cp0 registers were extended to 64bit for MIPS III.
*/
#if (_MIPS_ISA == _MIPS_ISA_MIPS1) || (_MIPS_ISA == _MIPS_ISA_MIPS2) || \
(_MIPS_ISA == _MIPS_ISA_MIPS32)
#if (_MIPS_ISA == _MIPS_ISA_MIPS1) || (_MIPS_ISA == _MIPS_ISA_MIPS2) \
|| (_MIPS_ISA == _MIPS_ISA_MIPS32)
# define MFC0 mfc0
# define MTC0 mtc0
#endif
#if (_MIPS_ISA == _MIPS_ISA_MIPS3) || (_MIPS_ISA == _MIPS_ISA_MIPS4) || \
(_MIPS_ISA == _MIPS_ISA_MIPS5) || (_MIPS_ISA == _MIPS_ISA_MIPS64)
#if (_MIPS_ISA == _MIPS_ISA_MIPS3) || (_MIPS_ISA == _MIPS_ISA_MIPS4) \
|| (_MIPS_ISA == _MIPS_ISA_MIPS5) || (_MIPS_ISA == _MIPS_ISA_MIPS64)
# define MFC0 dmfc0
# define MTC0 dmtc0
#endif

4
sysdeps/posix/rename.c
View File

@ -30,8 +30,8 @@ rename (const char *old, const char *new)
{
__set_errno (save);
/* Race condition, required for 1003.1 conformance. */
if (__unlink (new) < 0 ||
__link (old, new) < 0)
if (__unlink (new) < 0
|| __link (old, new) < 0)
return -1;
}
else

6
sysdeps/powerpc/novmx-sigjmp.c
View File

@ -33,9 +33,9 @@
int
__novmx__sigjmp_save (__novmx__sigjmp_buf env, int savemask)
{
env[0].__mask_was_saved = (savemask &&
__sigprocmask (SIG_BLOCK, (sigset_t *) NULL,
&env[0].__saved_mask) == 0);
env[0].__mask_was_saved = (savemask
&& __sigprocmask (SIG_BLOCK, (sigset_t *) NULL,
&env[0].__saved_mask) == 0);
return 0;
}

6
sysdeps/powerpc/sigjmp.c
View File

@ -29,9 +29,9 @@
int
__vmx__sigjmp_save (sigjmp_buf env, int savemask)
{
env[0].__mask_was_saved = (savemask &&
__sigprocmask (SIG_BLOCK, (sigset_t *) NULL,
&env[0].__saved_mask) == 0);
env[0].__mask_was_saved = (savemask
&& __sigprocmask (SIG_BLOCK, (sigset_t *) NULL,
&env[0].__saved_mask) == 0);
return 0;
}

4
sysdeps/s390/fpu/fenv_libc.h
View File

@ -28,8 +28,8 @@
#define FPC_FLAGS_MASK 0x00F80000
#define FPC_DXC_MASK 0x0000FF00
#define FPC_RM_MASK 0x00000003
#define FPC_VALID_MASK ((FPC_EXCEPTION_MASK|FPC_FLAGS_MASK| \
FPC_DXC_MASK|FPC_RM_MASK))
#define FPC_VALID_MASK ((FPC_EXCEPTION_MASK|FPC_FLAGS_MASK \
|FPC_DXC_MASK|FPC_RM_MASK))
#define FPC_EXCEPTION_MASK_SHIFT 24
#define FPC_FLAGS_SHIFT 16

4
sysdeps/s390/utf8-utf16-z9.c
View File

@ -443,8 +443,8 @@ gconv_end (struct __gconv_step *data)
} \
\
/* See Principles of Operations cu12. */ \
zabcd = (((inptr[0] & 0x7) << 2) | \
((inptr[1] & 0x30) >> 4)) - 1; \
zabcd = (((inptr[0] & 0x7) << 2) \
| ((inptr[1] & 0x30) >> 4)) - 1; \
\
/* z-bit must be zero after subtracting 1. */ \
if (zabcd & 0x10) \

4
sysdeps/unix/grantpt.c
View File

@ -178,8 +178,8 @@ grantpt (int fd)
owner. For security reasons, make it writable by the group only
when originally writable and when the group of the device is that
special group. */
mode_t mode = S_IRUSR|S_IWUSR|
((st.st_gid == gid) ? (st.st_mode & S_IWGRP) : 0);
mode_t mode = S_IRUSR|S_IWUSR
|((st.st_gid == gid) ? (st.st_mode & S_IWGRP) : 0);
#endif
if ((st.st_mode & ACCESSPERMS) != mode)

4
sysdeps/unix/sysv/linux/a.out.h
View File

@ -64,8 +64,8 @@ enum machine_type
&& N_MAGIC(x) != ZMAGIC && N_MAGIC(x) != QMAGIC)
#define _N_HDROFF(x) (1024 - sizeof (struct exec))
#define N_TXTOFF(x) \
(N_MAGIC(x) == ZMAGIC ? _N_HDROFF((x)) + sizeof (struct exec) : \
(N_MAGIC(x) == QMAGIC ? 0 : sizeof (struct exec)))
(N_MAGIC(x) == ZMAGIC ? _N_HDROFF((x)) + sizeof (struct exec) \
: (N_MAGIC(x) == QMAGIC ? 0 : sizeof (struct exec)))
#define N_DATOFF(x) (N_TXTOFF(x) + (x).a_text)
#define N_TRELOFF(x) (N_DATOFF(x) + (x).a_data)
#define N_DRELOFF(x) (N_TRELOFF(x) + N_TRSIZE(x))

24
sysdeps/unix/sysv/linux/updwtmp.c
View File

@ -19,15 +19,19 @@
#include <string.h>
#include <unistd.h>
#define TRANSFORM_UTMP_FILE_NAME(file_name) \
((strcmp (file_name, _PATH_UTMP) == 0 \
&& __access (_PATH_UTMP "x", F_OK) == 0) ? (_PATH_UTMP "x") : \
((strcmp (file_name, _PATH_WTMP) == 0 \
&& __access ( _PATH_WTMP "x", F_OK) == 0) ? (_PATH_WTMP "x") : \
((strcmp (file_name, _PATH_UTMP "x") == 0 \
&& __access (_PATH_UTMP "x", F_OK) != 0) ? _PATH_UTMP : \
((strcmp (file_name, _PATH_WTMP "x") == 0 \
&& __access (_PATH_WTMP "x", F_OK) != 0) ? _PATH_WTMP : \
file_name))))
#define TRANSFORM_UTMP_FILE_NAME(file_name) \
((strcmp (file_name, _PATH_UTMP) == 0 \
&& __access (_PATH_UTMP "x", F_OK) == 0) \
? (_PATH_UTMP "x") \
: ((strcmp (file_name, _PATH_WTMP) == 0 \
&& __access ( _PATH_WTMP "x", F_OK) == 0) \
? (_PATH_WTMP "x") \
: ((strcmp (file_name, _PATH_UTMP "x") == 0 \
&& __access (_PATH_UTMP "x", F_OK) != 0) \
? _PATH_UTMP \
: ((strcmp (file_name, _PATH_WTMP "x") == 0 \
&& __access (_PATH_WTMP "x", F_OK) != 0) \
? _PATH_WTMP \
: file_name))))
#include <login/updwtmp.c>

24
sysdeps/unix/sysv/linux/utmp_file.c
View File

@ -19,15 +19,19 @@
#include <string.h>
#include <unistd.h>
#define TRANSFORM_UTMP_FILE_NAME(file_name) \
((strcmp (file_name, _PATH_UTMP) == 0 \
&& __access (_PATH_UTMP "x", F_OK) == 0) ? (_PATH_UTMP "x") : \
((strcmp (file_name, _PATH_WTMP) == 0 \
&& __access ( _PATH_WTMP "x", F_OK) == 0) ? (_PATH_WTMP "x") : \
((strcmp (file_name, _PATH_UTMP "x") == 0 \
&& __access (_PATH_UTMP "x", F_OK) != 0) ? _PATH_UTMP : \
((strcmp (file_name, _PATH_WTMP "x") == 0 \
&& __access (_PATH_WTMP "x", F_OK) != 0) ? _PATH_WTMP : \
file_name))))
#define TRANSFORM_UTMP_FILE_NAME(file_name) \
((strcmp (file_name, _PATH_UTMP) == 0 \
&& __access (_PATH_UTMP "x", F_OK) == 0) \
? (_PATH_UTMP "x") \
: ((strcmp (file_name, _PATH_WTMP) == 0 \
&& __access ( _PATH_WTMP "x", F_OK) == 0) \
? (_PATH_WTMP "x") \
: ((strcmp (file_name, _PATH_UTMP "x") == 0 \
&& __access (_PATH_UTMP "x", F_OK) != 0) \
? _PATH_UTMP \
: ((strcmp (file_name, _PATH_WTMP "x") == 0 \
&& __access (_PATH_WTMP "x", F_OK) != 0) \
? _PATH_WTMP \
: file_name))))
#include <login/utmp_file.c>

8
sysdeps/x86/cpu-features.c
View File

@ -111,8 +111,8 @@ get_common_indices (struct cpu_features *cpu_features,
unsigned int xcrhigh;
asm ("xgetbv" : "=a" (xcrlow), "=d" (xcrhigh) : "c" (0));
/* Is YMM and XMM state usable? */
if ((xcrlow & (bit_YMM_state | bit_XMM_state)) ==
(bit_YMM_state | bit_XMM_state))
if ((xcrlow & (bit_YMM_state | bit_XMM_state))
== (bit_YMM_state | bit_XMM_state))
{
/* Determine if AVX is usable. */
if (CPU_FEATURES_CPU_P (cpu_features, AVX))
@ -152,8 +152,8 @@ get_common_indices (struct cpu_features *cpu_features,
/* Check if OPMASK state, upper 256-bit of ZMM0-ZMM15 and
ZMM16-ZMM31 state are enabled. */
if ((xcrlow & (bit_Opmask_state | bit_ZMM0_15_state
| bit_ZMM16_31_state)) ==
(bit_Opmask_state | bit_ZMM0_15_state | bit_ZMM16_31_state))
| bit_ZMM16_31_state))
== (bit_Opmask_state | bit_ZMM0_15_state | bit_ZMM16_31_state))
{
/* Determine if AVX512F is usable. */
if (CPU_FEATURES_CPU_P (cpu_features, AVX512F))

6
time/tzfile.c
View File

@ -764,9 +764,9 @@ __tzfile_compute (__time64_t timer, int use_localtime,
/* Apply its correction. */
*leap_correct = leaps[i].change;
if (timer == leaps[i].transition && /* Exactly at the transition time. */
((i == 0 && leaps[i].change > 0)
|| leaps[i].change > leaps[i - 1].change))
if (timer == leaps[i].transition /* Exactly at the transition time. */
&& ((i == 0 && leaps[i].change > 0)
|| leaps[i].change > leaps[i - 1].change))
{
*leap_hit = 1;
while (i > 0