mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-27 07:20:11 +00:00
9090848d06
posix/wordexp-test.c used libc-internal.h for PTR_ALIGN_DOWN; similar
to what was done with libc-diag.h, I have split the definitions of
cast_to_integer, ALIGN_UP, ALIGN_DOWN, PTR_ALIGN_UP, and PTR_ALIGN_DOWN
to a new header, libc-pointer-arith.h.
It then occurred to me that the remaining declarations in libc-internal.h
are mostly to do with early initialization, and probably most of the
files including it, even in the core code, don't need it anymore. Indeed,
only 19 files actually need what remains of libc-internal.h. 23 others
need libc-diag.h instead, and 12 need libc-pointer-arith.h instead.
No file needs more than one of them, and 16 don't need any of them!
So, with this patch, libc-internal.h stops including libc-diag.h as
well as losing the pointer arithmetic macros, and all including files
are adjusted.
* include/libc-pointer-arith.h: New file. Define
cast_to_integer, ALIGN_UP, ALIGN_DOWN, PTR_ALIGN_UP, and
PTR_ALIGN_DOWN here.
* include/libc-internal.h: Definitions of above macros
moved from here. Don't include libc-diag.h anymore either.
* posix/wordexp-test.c: Include stdint.h and libc-pointer-arith.h.
Don't include libc-internal.h.
* debug/pcprofile.c, elf/dl-tunables.c, elf/soinit.c, io/openat.c
* io/openat64.c, misc/ptrace.c, nptl/pthread_clock_gettime.c
* nptl/pthread_clock_settime.c, nptl/pthread_cond_common.c
* string/strcoll_l.c, sysdeps/nacl/brk.c
* sysdeps/unix/clock_settime.c
* sysdeps/unix/sysv/linux/i386/get_clockfreq.c
* sysdeps/unix/sysv/linux/ia64/get_clockfreq.c
* sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c
* sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c:
Don't include libc-internal.h.
* elf/get-dynamic-info.h, iconv/loop.c
* iconvdata/iso-2022-cn-ext.c, locale/weight.h, locale/weightwc.h
* misc/reboot.c, nis/nis_table.c, nptl_db/thread_dbP.h
* nscd/connections.c, resolv/res_send.c, soft-fp/fmadf4.c
* soft-fp/fmasf4.c, soft-fp/fmatf4.c, stdio-common/vfscanf.c
* sysdeps/ieee754/dbl-64/e_lgamma_r.c
* sysdeps/ieee754/dbl-64/k_rem_pio2.c
* sysdeps/ieee754/flt-32/e_lgammaf_r.c
* sysdeps/ieee754/flt-32/k_rem_pio2f.c
* sysdeps/ieee754/ldbl-128/k_tanl.c
* sysdeps/ieee754/ldbl-128ibm/k_tanl.c
* sysdeps/ieee754/ldbl-96/e_lgammal_r.c
* sysdeps/ieee754/ldbl-96/k_tanl.c, sysdeps/nptl/futex-internal.h:
Include libc-diag.h instead of libc-internal.h.
* elf/dl-load.c, elf/dl-reloc.c, locale/programs/locarchive.c
* nptl/nptl-init.c, string/strcspn.c, string/strspn.c
* malloc/malloc.c, sysdeps/i386/nptl/tls.h
* sysdeps/nacl/dl-map-segments.h, sysdeps/x86_64/atomic-machine.h
* sysdeps/unix/sysv/linux/spawni.c
* sysdeps/x86_64/nptl/tls.h:
Include libc-pointer-arith.h instead of libc-internal.h.
* elf/get-dynamic-info.h, sysdeps/nacl/dl-map-segments.h
* sysdeps/x86_64/atomic-machine.h:
Add multiple include guard.
77 lines
2.2 KiB
C
77 lines
2.2 KiB
C
/* Copyright (C) 1991-2017 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
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/>. */
|
|
|
|
#include <string.h>
|
|
#include <stdint.h>
|
|
#include <libc-pointer-arith.h>
|
|
|
|
#undef strspn
|
|
#ifndef STRSPN
|
|
# define STRSPN strspn
|
|
#endif
|
|
|
|
/* Return the length of the maximum initial segment
|
|
of S which contains only characters in ACCEPT. */
|
|
size_t
|
|
STRSPN (const char *str, const char *accept)
|
|
{
|
|
if (accept[0] == '\0')
|
|
return 0;
|
|
if (__glibc_unlikely (accept[1] == '\0'))
|
|
{
|
|
const char *a = str;
|
|
for (; *str == *accept; str++);
|
|
return str - a;
|
|
}
|
|
|
|
/* Use multiple small memsets to enable inlining on most targets. */
|
|
unsigned char table[256];
|
|
unsigned char *p = memset (table, 0, 64);
|
|
memset (p + 64, 0, 64);
|
|
memset (p + 128, 0, 64);
|
|
memset (p + 192, 0, 64);
|
|
|
|
unsigned char *s = (unsigned char*) accept;
|
|
/* Different from strcspn it does not add the NULL on the table
|
|
so can avoid check if str[i] is NULL, since table['\0'] will
|
|
be 0 and thus stopping the loop check. */
|
|
do
|
|
p[*s++] = 1;
|
|
while (*s);
|
|
|
|
s = (unsigned char*) str;
|
|
if (!p[s[0]]) return 0;
|
|
if (!p[s[1]]) return 1;
|
|
if (!p[s[2]]) return 2;
|
|
if (!p[s[3]]) return 3;
|
|
|
|
s = (unsigned char *) PTR_ALIGN_DOWN (s, 4);
|
|
|
|
unsigned int c0, c1, c2, c3;
|
|
do {
|
|
s += 4;
|
|
c0 = p[s[0]];
|
|
c1 = p[s[1]];
|
|
c2 = p[s[2]];
|
|
c3 = p[s[3]];
|
|
} while ((c0 & c1 & c2 & c3) != 0);
|
|
|
|
size_t count = s - (unsigned char *) str;
|
|
return (c0 & c1) == 0 ? count + c0 : count + c2 + 2;
|
|
}
|
|
libc_hidden_builtin_def (strspn)
|