mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-15 04:20:28 +08:00
34a5a1460e
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.
185 lines
4.8 KiB
C
185 lines
4.8 KiB
C
/* Test and measure memmem functions.
|
|
Copyright (C) 2008-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Written by Ulrich Drepper <drepper@redhat.com>, 2008.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#define TEST_MAIN
|
|
#define TEST_NAME "memmem"
|
|
#define BUF1PAGES 20
|
|
#define ITERATIONS 500
|
|
#include "test-string.h"
|
|
|
|
typedef char *(*proto_t) (const void *, size_t, const void *, size_t);
|
|
void *simple_memmem (const void *, size_t, const void *, size_t);
|
|
|
|
IMPL (simple_memmem, 0)
|
|
IMPL (memmem, 1)
|
|
|
|
void *
|
|
simple_memmem (const void *haystack, size_t haystack_len, const void *needle,
|
|
size_t needle_len)
|
|
{
|
|
const char *begin;
|
|
const char *const last_possible
|
|
= (const char *) haystack + haystack_len - needle_len;
|
|
|
|
if (needle_len == 0)
|
|
/* The first occurrence of the empty string is deemed to occur at
|
|
the beginning of the string. */
|
|
return (void *) haystack;
|
|
|
|
/* Sanity check, otherwise the loop might search through the whole
|
|
memory. */
|
|
if (__glibc_unlikely (haystack_len < needle_len))
|
|
return NULL;
|
|
|
|
for (begin = (const char *) haystack; begin <= last_possible; ++begin)
|
|
if (begin[0] == ((const char *) needle)[0]
|
|
&& !memcmp ((const void *) &begin[1],
|
|
(const void *) ((const char *) needle + 1),
|
|
needle_len - 1))
|
|
return (void *) begin;
|
|
|
|
return NULL;
|
|
}
|
|
|
|
static int
|
|
check_result (impl_t *impl, const void *haystack, size_t haystack_len,
|
|
const void *needle, size_t needle_len, const void *expected)
|
|
{
|
|
void *res;
|
|
|
|
res = CALL (impl, haystack, haystack_len, needle, needle_len);
|
|
if (res != expected)
|
|
{
|
|
error (0, 0, "Wrong result in function %s %p %p", impl->name,
|
|
res, expected);
|
|
ret = 1;
|
|
return -1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void
|
|
do_one_test (impl_t *impl, const void *haystack, size_t haystack_len,
|
|
const void *needle, size_t needle_len, const void *expected)
|
|
{
|
|
if (check_result (impl, haystack, haystack_len, needle, needle_len,
|
|
expected) < 0)
|
|
return;
|
|
}
|
|
|
|
static void
|
|
do_test (const char *str, size_t len, size_t idx)
|
|
{
|
|
char tmpbuf[len];
|
|
|
|
memcpy (tmpbuf, buf1 + idx, len);
|
|
memcpy (buf1 + idx, str, len);
|
|
|
|
FOR_EACH_IMPL (impl, 0)
|
|
do_one_test (impl, buf1, BUF1PAGES * page_size, str, len, buf1 + idx);
|
|
|
|
memcpy (buf1 + idx, tmpbuf, len);
|
|
}
|
|
|
|
static void
|
|
do_random_tests (void)
|
|
{
|
|
for (size_t n = 0; n < ITERATIONS; ++n)
|
|
{
|
|
char tmpbuf[32];
|
|
|
|
size_t shift = random () % 11;
|
|
size_t rel = random () % ((2 << (shift + 1)) * 64);
|
|
size_t idx = MIN ((2 << shift) * 64 + rel, BUF1PAGES * page_size - 2);
|
|
size_t len = random () % (sizeof (tmpbuf) - 1) + 1;
|
|
len = MIN (len, BUF1PAGES * page_size - idx - 1);
|
|
memcpy (tmpbuf, buf1 + idx, len);
|
|
for (size_t i = random () % len / 2 + 1; i > 0; --i)
|
|
{
|
|
size_t off = random () % len;
|
|
char ch = '0' + random () % 10;
|
|
|
|
buf1[idx + off] = ch;
|
|
}
|
|
|
|
FOR_EACH_IMPL (impl, 0)
|
|
do_one_test (impl, buf1, BUF1PAGES * page_size, buf1 + idx, len,
|
|
buf1 + idx);
|
|
|
|
memcpy (buf1 + idx, tmpbuf, len);
|
|
}
|
|
}
|
|
|
|
static void
|
|
check1 (void)
|
|
{
|
|
|
|
const char search_buf_data[5] = { 0x56, 0x34, 0x12, 0x78, 0x78 };
|
|
const char pattern[2] = { 0x78, 0x56 };
|
|
void *search_buf = (void *) buf1 + page_size - sizeof search_buf_data;
|
|
void *exp_result;
|
|
|
|
memcpy (search_buf, search_buf_data, sizeof search_buf_data);
|
|
exp_result = simple_memmem (search_buf, sizeof search_buf_data,
|
|
pattern, sizeof pattern);
|
|
FOR_EACH_IMPL (impl, 0)
|
|
check_result (impl, search_buf, sizeof search_buf_data,
|
|
pattern, sizeof pattern, exp_result);
|
|
}
|
|
|
|
static const char *const strs[] =
|
|
{
|
|
"00000", "00112233", "0123456789", "0000111100001111",
|
|
"00000111110000022222", "012345678901234567890",
|
|
"abc0", "aaaa0", "abcabc0"
|
|
};
|
|
|
|
|
|
int
|
|
test_main (void)
|
|
{
|
|
size_t i;
|
|
|
|
test_init ();
|
|
|
|
check1 ();
|
|
|
|
printf ("%23s", "");
|
|
FOR_EACH_IMPL (impl, 0)
|
|
printf ("\t%s", impl->name);
|
|
putchar ('\n');
|
|
|
|
for (i = 0; i < BUF1PAGES * page_size; ++i)
|
|
buf1[i] = 60 + random () % 32;
|
|
|
|
for (i = 0; i < sizeof (strs) / sizeof (strs[0]); ++i)
|
|
for (size_t j = 0; j < 120; j += 7)
|
|
{
|
|
size_t len = strlen (strs[i]);
|
|
|
|
do_test (strs[i], len, j);
|
|
}
|
|
|
|
do_random_tests ();
|
|
return ret;
|
|
}
|
|
|
|
#include <support/test-driver.c>
|