diff options
58 files changed, 323 insertions, 223 deletions
@@ -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 diff --git a/dirent/dirent.h b/dirent/dirent.h index 9494360ce8..fc4d4859fe 100644 --- a/dirent/dirent.h +++ b/dirent/dirent.h @@ -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 diff --git a/elf/cache.c b/elf/cache.c index b8934898b6..a64d67ecbe 100644 --- a/elf/cache.c +++ b/elf/cache.c @@ -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); diff --git a/gshadow/fgetsgent_r.c b/gshadow/fgetsgent_r.c index 7ecfb217e3..19a663f048 100644 --- a/gshadow/fgetsgent_r.c +++ b/gshadow/fgetsgent_r.c @@ -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); diff --git a/htl/pt-getattr.c b/htl/pt-getattr.c index 7fb4a9f6e8..33fd87a9fb 100644 --- a/htl/pt-getattr.c +++ b/htl/pt-getattr.c @@ -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 diff --git a/hurd/hurdinit.c b/hurd/hurdinit.c index 773bb1c37f..f4a3607ae6 100644 --- a/hurd/hurdinit.c +++ b/hurd/hurdinit.c @@ -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. */ diff --git a/hurd/hurdkill.c b/hurd/hurdkill.c index 8b2743f0e9..cd67f9b9bd 100644 --- a/hurd/hurdkill.c +++ b/hurd/hurdkill.c @@ -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; } diff --git a/hurd/hurdlookup.c b/hurd/hurdlookup.c index 7be42afd12..983f6a6506 100644 --- a/hurd/hurdlookup.c +++ b/hurd/hurdlookup.c @@ -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, diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c index 86c1179c02..1b511d1e8f 100644 --- a/hurd/hurdsig.c +++ b/hurd/hurdsig.c @@ -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, + MAC |