Break some lines before not after operators

System Internals / glibc - Joseph Myers [codesourcery.com] - 22 February 2019 01:32 EST

The GNU Coding Standards specify that line breaks in expressions should go before an operator, not after one. This patch fixes various code to do this. It only changes code that appears to be mostly following GNU style anyway, not files and directories with substantially different formatting. It is not exhaustive even for files using GNU style (for example, changes to sysdeps files are deferred for subsequent cleanups). Some files changed are shared with gnulib, but most are specific to glibc. Changes were made manually, with places to change found by grep (so some cases, e.g. where the operator was followed by a comment at end of line, are particularly liable to have been missed by grep, but I did include cases where the operator was followed by backslash-newline).

This patch generally does not attempt to address other coding style issues in the expressions changed (for example, missing spaces before '(', or lack of parentheses to ensure indentation of continuation lines properly reflects operator precedence).

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

- benchtests/bench-memmem.c (simple_memmem): Break lines before rather than after operators.
- benchtests/bench-skeleton.c (TIMESPEC_AFTER): Likewise.
- crypt/md5.c (md5_finish_ctx): Likewise.
- crypt/sha256.c (__sha256_finish_ctx): Likewise.
- crypt/sha512.c (__sha512_finish_ctx): Likewise.
- elf/cache.c (load_aux_cache): Likewise.
- elf/dl-load.c (open_verify): Likewise.
- elf/get-dynamic-info.h (elf_get_dynamic_info): Likewise.
- elf/readelflib.c (process_elf_file): Likewise.
- elf/rtld.c (dl_main): Likewise.
- elf/sprof.c (generate_call_graph): Likewise.
- hurd/ctty-input.c (_hurd_ctty_input): Likewise.
- hurd/ctty-output.c (_hurd_ctty_output): Likewise.
- hurd/dtable.c (reauth_dtable): Likewise.
- hurd/getdport.c (__getdport): Likewise.
- hurd/hurd/signal.h (_hurd_interrupted_rpc_timeout): Likewise.
- hurd/hurd/sigpreempt.h (HURD_PREEMPT_SIGNAL_P): Likewise.
- hurd/hurdfault.c (_hurdsig_fault_catch_exception_raise): Likewise.
- hurd/hurdioctl.c (fioctl): Likewise.
- hurd/hurdselect.c (_hurd_select): Likewise.
- hurd/hurdsig.c (_hurdsig_abort_rpcs): Likewise. (STOPSIGS): Likewise.
- hurd/hurdstartup.c (_hurd_startup): Likewise.
- hurd/intr-msg.c (_hurd_intr_rpc_mach_msg): Likewise.
- hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Likewise.
- hurd/msgportdemux.c (msgport_server): Likewise.
- hurd/setauth.c (_hurd_setauth): Likewise.
- include/features.h (__GLIBC_USE_DEPRECATED_SCANF): Likewise.
- libio/libioP.h [IO_DEBUG] (CHECK_FILE): Likewise.
- locale/programs/ld-ctype.c (set_class_defaults): Likewise.
- localedata/tests-mbwc/tst_swscanf.c (tst_swscanf): Likewise.
- login/tst-utmp.c (do_check): Likewise. (simulate_login): Likewise.
- mach/lowlevellock.h (lll_lock): Likewise. (lll_trylock): Likewise.
- math/test-fenv.c (ALL_EXC): Likewise.
- math/test-fenvinline.c (ALL_EXC): Likewise.
- misc/sys/cdefs.h (__attribute_deprecated_msg__): Likewise.
- nis/nis_call.c (__do_niscall3): Likewise.
- nis/nis_callback.c (cb_prog_1): Likewise.
- nis/nis_defaults.c (searchaccess): Likewise.
- nis/nis_findserv.c (__nis_findfastest_with_timeout): Likewise.
- nis/nis_ismember.c (internal_ismember): Likewise.
- nis/nis_local_names.c (nis_local_principal): Likewise.
- nis/nss_nis/nis-rpc.c (_nss_nis_getrpcbyname_r): Likewise.
- nis/nss_nisplus/nisplus-netgrp.c (_nss_nisplus_getnetgrent_r): Likewise.
- nis/ypclnt.c (yp_match): Likewise. (yp_first): Likewise. (yp_next): Likewise. (yp_master): Likewise. (yp_order): Likewise.
- nscd/hstcache.c (cache_addhst): Likewise.
- nscd/initgrcache.c (addinitgroupsX): Likewise.
- nss/nss_compat/compat-pwd.c (copy_pwd_changes): Likewise. (internal_getpwuid_r): Likewise.
- nss/nss_compat/compat-spwd.c (copy_spwd_changes): Likewise.
- posix/glob.h (__GLOB_FLAGS): Likewise.
- posix/regcomp.c (peek_token): Likewise. (peek_token_bracket): Likewise. (parse_expression): Likewise.
- posix/regexec.c (sift_states_iter_mb): Likewise. (check_node_accept_bytes): Likewise.
- posix/tst-spawn3.c (do_test): Likewise.
- posix/wordexp-test.c (testit): Likewise.
- posix/wordexp.c (parse_tilde): Likewise. (exec_comm): Likewise.
- posix/wordexp.h (__WRDE_FLAGS): Likewise.
- resource/vtimes.c (TIMEVAL_TO_VTIMES): Likewise.
- setjmp/sigjmp.c (__sigjmp_save): Likewise.
- stdio-common/printf_fp.c (__printf_fp_l): Likewise.
- stdio-common/tst-fileno.c (do_test): Likewise.
- stdio-common/vfprintf-internal.c (vfprintf): Likewise.
- stdlib/strfmon_l.c (__vstrfmon_l_internal): Likewise.
- stdlib/strtod_l.c (round_and_return): Likewise. (____STRTOF_INTERNAL): Likewise.
- stdlib/tst-strfrom.h (TEST_STRFROM): Likewise.
- string/strcspn.c (STRCSPN): Likewise.
- string/test-memmem.c (simple_memmem): Likewise.
- termios/tcsetattr.c (tcsetattr): Likewise.
- time/alt_digit.c (_nl_parse_alt_digit): Likewise.
- time/asctime.c (asctime_internal): Likewise.
- time/strptime_l.c (__strptime_internal): Likewise.
- time/sys/time.h (timercmp): Likewise.
- time/tzfile.c (__tzfile_compute): Likewise.

34a5a1460e Break some lines before not after operators.
ChangeLog | 90 +++++++++++++++++++++++++++++++++++++
benchtests/bench-memmem.c | 8 ++--
benchtests/bench-skeleton.c | 6 +--
crypt/md5.c | 4 +-
crypt/sha256.c | 4 +-
crypt/sha512.c | 4 +-
elf/cache.c | 6 +--
elf/dl-load.c | 16 +++----
elf/get-dynamic-info.h | 4 +-
elf/readelflib.c | 8 ++--
elf/rtld.c | 4 +-
elf/sprof.c | 4 +-
hurd/ctty-input.c | 4 +-
hurd/ctty-output.c | 4 +-
hurd/dtable.c | 28 ++++++------
hurd/getdport.c | 4 +-
hurd/hurd/signal.h | 4 +-
hurd/hurd/sigpreempt.h | 4 +-
hurd/hurdfault.c | 4 +-
hurd/hurdioctl.c | 12 ++---
hurd/hurdselect.c | 24 +++++-----
hurd/hurdsig.c | 12 ++---
hurd/hurdstartup.c | 6 +--
hurd/intr-msg.c | 8 ++--
hurd/lookup-retry.c | 12 ++---
hurd/msgportdemux.c | 4 +-
hurd/setauth.c | 28 ++++++------
include/features.h | 8 ++--
libio/libioP.h | 14 +++---
locale/programs/ld-ctype.c | 22 ++++-----
localedata/tests-mbwc/tst_swscanf.c | 10 ++---
login/tst-utmp.c | 8 ++--
mach/lowlevellock.h | 8 ++--
math/test-fenv.c | 4 +-
math/test-fenvinline.c | 4 +-
misc/sys/cdefs.h | 4 +-
nis/nis_call.c | 4 +-
nis/nis_callback.c | 4 +-
nis/nis_defaults.c | 16 +++----
nis/nis_findserv.c | 6 +--
nis/nis_ismember.c | 4 +-
nis/nis_local_names.c | 4 +-
nis/nss_nis/nis-rpc.c | 6 +--
nis/nss_nisplus/nisplus-netgrp.c | 18 ++++----
nis/ypclnt.c | 24 +++++-----
nscd/hstcache.c | 6 +--
nscd/initgrcache.c | 4 +-
nss/nss_compat/compat-pwd.c | 20 ++++-----
nss/nss_compat/compat-spwd.c | 4 +-
posix/glob.h | 14 +++---
posix/regcomp.c | 20 ++++-----
posix/regexec.c | 14 +++---
posix/tst-spawn3.c | 4 +-
posix/wordexp-test.c | 12 ++---
posix/wordexp.c | 8 ++--
posix/wordexp.h | 4 +-
resource/vtimes.c | 4 +-
setjmp/sigjmp.c | 6 +--
stdio-common/printf_fp.c | 20 ++++-----
stdio-common/tst-fileno.c | 6 +--
stdio-common/vfprintf-internal.c | 4 +-
stdlib/strfmon_l.c | 16 +++----
stdlib/strtod_l.c | 25 ++++++-----
stdlib/tst-strfrom.h | 8 ++--
string/strcspn.c | 4 +-
string/test-memmem.c | 8 ++--
termios/tcsetattr.c | 6 +--
time/alt_digit.c | 4 +-
time/asctime.c | 8 ++--
time/strptime_l.c | 10 ++---
time/sys/time.h | 6 +--
time/tzfile.c | 4 +-
72 files changed, 413 insertions(+), 320 deletions(-)

Upstream: sourceware.org


  • Share