From c4f50205e10b066654cf59ecde4fd1c2a674f19e Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 27 Feb 2019 13:55:45 +0000 Subject: Add some spaces before '('. This patch fixes various places where a space should have been present before '(' in accordance with the GNU Coding Standards. Most but not all of the fixes in this patch are for calls to sizeof (but it's not exhaustive regarding such calls that should be fixed). Tested for x86_64, and with build-many-glibcs.py. * benchtests/bench-strcpy.c (do_test): Use space before '('. * benchtests/bench-string.h (cmdline_process_function): Likewise. * benchtests/bench-strlen.c (do_test): Likewise. (test_main): Likewise. * catgets/gencat.c (read_old): Likewise. * elf/cache.c (load_aux_cache): Likewise. * iconvdata/bug-iconv8.c (do_test): Likewise. * math/test-tgmath-ret.c (do_test): Likewise. * nis/nis_call.c (rec_dirsearch): Likewise. * nis/nis_findserv.c (__nis_findfastest_with_timeout): Likewise. * nptl/tst-audit-threads.c (do_test): Likewise. * nptl/tst-cancel4-common.h (set_socket_buffer): Likewise. * nss/nss_test1.c (init): Likewise. * nss/test-netdb.c (test_hosts): Likewise. * posix/execvpe.c (maybe_script_execute): Likewise. * stdio-common/tst-fmemopen4.c (do_test): Likewise. * stdio-common/tst-printf.c (do_test): Likewise. * stdio-common/vfscanf-internal.c (__vfscanf_internal): Likewise. * stdlib/fmtmsg.c (NKEYWORDS): Likewise. * stdlib/qsort.c (STACK_SIZE): Likewise. * stdlib/test-canon.c (do_test): Likewise. * stdlib/tst-swapcontext1.c (do_test): Likewise. * string/memcmp.c (OPSIZ): Likewise. * string/test-strcpy.c (do_test): Likewise. (do_random_tests): Likewise. * string/test-strlen.c (do_test): Likewise. (test_main): Likewise. * string/test-strrchr.c (do_test): Likewise. (do_random_tests): Likewise. * string/tester.c (test_memrchr): Likewise. (test_memchr): Likewise. * sysdeps/generic/memcopy.h (OPSIZ): Likewise. * sysdeps/generic/unwind-dw2.c (execute_stack_op): Likewise. * sysdeps/generic/unwind-pe.h (read_sleb128): Likewise. (read_encoded_value_with_base): Likewise. * sysdeps/hppa/dl-machine.h (elf_machine_runtime_setup): Likewise. * sysdeps/hppa/fpu/feupdateenv.c (__feupdateenv): Likewise. * sysdeps/ia64/fpu/sfp-machine.h (TI_BITS): Likewise. * sysdeps/mach/hurd/spawni.c (__spawni): Likewise. * sysdeps/posix/spawni.c (maybe_script_execute): Likewise. * sysdeps/powerpc/fpu/tst-setcontext-fpscr.c (query_auxv): Likewise. * sysdeps/unix/sysv/linux/aarch64/bits/procfs.h (ELF_NGREG): Likewise. * sysdeps/unix/sysv/linux/arm/bits/procfs.h (ELF_NGREG): Likewise. * sysdeps/unix/sysv/linux/arm/ioperm.c (init_iosys): Likewise. * sysdeps/unix/sysv/linux/csky/bits/procfs.h (ELF_NGREG): Likewise. * sysdeps/unix/sysv/linux/m68k/bits/procfs.h (ELF_NGREG): Likewise. * sysdeps/unix/sysv/linux/nios2/bits/procfs.h (ELF_NGREG): Likewise. * sysdeps/unix/sysv/linux/spawni.c (maybe_script_execute): Likewise. * sysdeps/unix/sysv/linux/x86/bits/procfs.h (ELF_NGREG): Likewise. * sysdeps/unix/sysv/linux/x86/bits/sigcontext.h (FP_XSTATE_MAGIC2_SIZE): Likewise. * sysdeps/x86/fpu/sfp-machine.h (TI_BITS): Likewise. * time/test_time.c (main): Likewise. --- benchtests/bench-strcpy.c | 7 ++++--- benchtests/bench-string.h | 2 +- benchtests/bench-strlen.c | 10 +++++----- 3 files changed, 10 insertions(+), 9 deletions(-) (limited to 'benchtests') diff --git a/benchtests/bench-strcpy.c b/benchtests/bench-strcpy.c index 92cad4cc65..9fe999e5f4 100644 --- a/benchtests/bench-strcpy.c +++ b/benchtests/bench-strcpy.c @@ -102,11 +102,11 @@ do_test (size_t align1, size_t align2, size_t len, int max_char) but in wchar_ts, in bytes it will equal to align * (sizeof (wchar_t)) len for wcschr here isn't in bytes but it's number of wchar_t symbols. */ align1 &= 7; - if ((align1 + len) * sizeof(CHAR) >= page_size) + if ((align1 + len) * sizeof (CHAR) >= page_size) return; align2 &= 7; - if ((align2 + len) * sizeof(CHAR) >= page_size) + if ((align2 + len) * sizeof (CHAR) >= page_size) return; s1 = (CHAR *) (buf1) + align1; @@ -116,7 +116,8 @@ do_test (size_t align1, size_t align2, size_t len, int max_char) s1[i] = 32 + 23 * i % (max_char - 32); s1[len] = 0; - printf ("Length %4zd, alignments in bytes %2zd/%2zd:", len, align1 * sizeof(CHAR), align2 * sizeof(CHAR)); + printf ("Length %4zd, alignments in bytes %2zd/%2zd:", len, + align1 * sizeof (CHAR), align2 * sizeof (CHAR)); FOR_EACH_IMPL (impl, 0) do_one_test (impl, s2, s1, len); diff --git a/benchtests/bench-string.h b/benchtests/bench-string.h index e1014ead77..9d3332a624 100644 --- a/benchtests/bench-string.h +++ b/benchtests/bench-string.h @@ -156,7 +156,7 @@ cmdline_process_function (int c) case OPT_RANDOM: { int fdr = open ("/dev/urandom", O_RDONLY); - if (fdr < 0 || read (fdr, &seed, sizeof(seed)) != sizeof (seed)) + if (fdr < 0 || read (fdr, &seed, sizeof (seed)) != sizeof (seed)) seed = time (NULL); if (fdr >= 0) close (fdr); diff --git a/benchtests/bench-strlen.c b/benchtests/bench-strlen.c index f86095a5d3..f6a8bf5dff 100644 --- a/benchtests/bench-strlen.c +++ b/benchtests/bench-strlen.c @@ -75,7 +75,7 @@ do_test (json_ctx_t *json_ctx, size_t align, size_t len) size_t i; align &= 63; - if (align + sizeof(CHAR) * len >= page_size) + if (align + sizeof (CHAR) * len >= page_size) return; json_element_object_begin (json_ctx); @@ -127,16 +127,16 @@ test_main (void) for (i = 1; i < 8; ++i) { - do_test (&json_ctx, sizeof(CHAR) * i, i); + do_test (&json_ctx, sizeof (CHAR) * i, i); do_test (&json_ctx, 0, i); } for (i = 2; i <= 12; ++i) { do_test (&json_ctx, 0, 1 << i); - do_test (&json_ctx, sizeof(CHAR) * 7, 1 << i); - do_test (&json_ctx, sizeof(CHAR) * i, 1 << i); - do_test (&json_ctx, sizeof(CHAR) * i, (size_t)((1 << i) / 1.5)); + do_test (&json_ctx, sizeof (CHAR) * 7, 1 << i); + do_test (&json_ctx, sizeof (CHAR) * i, 1 << i); + do_test (&json_ctx, sizeof (CHAR) * i, (size_t)((1 << i) / 1.5)); } json_array_end (&json_ctx); -- cgit 1.4.1