mirror of
https://sourceware.org/git/glibc.git
synced 2025-06-13 19:21:36 +03:00
Remove all traces of reg_char.
* sysdeps/generic/memcopy.h (reg_char): Delete. * debug/strcat_chk.c: Use char, not reg_char. * debug/strcpy_chk.c: Likewise. * debug/strncat_chk.c: Likewise. * debug/strncpy_chk.c: Likewise. * string/memchr.c: Likewise. * string/memrchr.c: Likewise. * string/rawmemchr.c: Likewise. * string/strcat.c: Likewise. * string/strchr.c: Likewise. * string/strchrnul.c: Likewise. * string/strcmp.c: Likewise. * string/strcpy.c: Likewise. * string/strncat.c: Likewise. * string/strncmp.c: Likewise. * string/strncpy.c: Likewise.
This commit is contained in:
@ -30,8 +30,6 @@
|
||||
#if defined _LIBC
|
||||
# include <string.h>
|
||||
# include <memcopy.h>
|
||||
#else
|
||||
# define reg_char char
|
||||
#endif
|
||||
|
||||
#if HAVE_STDLIB_H || defined _LIBC
|
||||
@ -68,7 +66,7 @@ __memchr (s, c_in, n)
|
||||
const unsigned char *char_ptr;
|
||||
const unsigned long int *longword_ptr;
|
||||
unsigned long int longword, magic_bits, charmask;
|
||||
unsigned reg_char c;
|
||||
unsigned char c;
|
||||
|
||||
c = (unsigned char) c_in;
|
||||
|
||||
|
@ -33,8 +33,6 @@
|
||||
#if defined _LIBC
|
||||
# include <string.h>
|
||||
# include <memcopy.h>
|
||||
#else
|
||||
# define reg_char char
|
||||
#endif
|
||||
|
||||
#if defined HAVE_LIMITS_H || defined _LIBC
|
||||
@ -71,7 +69,7 @@ MEMRCHR
|
||||
const unsigned char *char_ptr;
|
||||
const unsigned long int *longword_ptr;
|
||||
unsigned long int longword, magic_bits, charmask;
|
||||
unsigned reg_char c;
|
||||
unsigned char c;
|
||||
|
||||
c = (unsigned char) c_in;
|
||||
|
||||
|
@ -31,8 +31,6 @@
|
||||
# include <string.h>
|
||||
# include <memcopy.h>
|
||||
# include <stdlib.h>
|
||||
#else
|
||||
# define reg_char char
|
||||
#endif
|
||||
|
||||
#if defined (HAVE_LIMITS_H) || defined (_LIBC)
|
||||
@ -59,7 +57,7 @@ __rawmemchr (s, c_in)
|
||||
const unsigned char *char_ptr;
|
||||
const unsigned long int *longword_ptr;
|
||||
unsigned long int longword, magic_bits, charmask;
|
||||
unsigned reg_char c;
|
||||
unsigned char c;
|
||||
|
||||
c = (unsigned char) c_in;
|
||||
|
||||
|
@ -28,7 +28,7 @@ strcat (dest, src)
|
||||
{
|
||||
char *s1 = dest;
|
||||
const char *s2 = src;
|
||||
reg_char c;
|
||||
char c;
|
||||
|
||||
/* Find the end of the string. */
|
||||
do
|
||||
|
@ -36,7 +36,7 @@ strchr (s, c_in)
|
||||
const unsigned char *char_ptr;
|
||||
const unsigned long int *longword_ptr;
|
||||
unsigned long int longword, magic_bits, charmask;
|
||||
unsigned reg_char c;
|
||||
unsigned char c;
|
||||
|
||||
c = (unsigned char) c_in;
|
||||
|
||||
|
@ -36,7 +36,7 @@ __strchrnul (s, c_in)
|
||||
const unsigned char *char_ptr;
|
||||
const unsigned long int *longword_ptr;
|
||||
unsigned long int longword, magic_bits, charmask;
|
||||
unsigned reg_char c;
|
||||
unsigned char c;
|
||||
|
||||
c = (unsigned char) c_in;
|
||||
|
||||
|
@ -30,7 +30,7 @@ strcmp (p1, p2)
|
||||
{
|
||||
register const unsigned char *s1 = (const unsigned char *) p1;
|
||||
register const unsigned char *s2 = (const unsigned char *) p2;
|
||||
unsigned reg_char c1, c2;
|
||||
unsigned char c1, c2;
|
||||
|
||||
do
|
||||
{
|
||||
|
@ -28,7 +28,7 @@ strcpy (dest, src)
|
||||
char *dest;
|
||||
const char *src;
|
||||
{
|
||||
reg_char c;
|
||||
char c;
|
||||
char *__unbounded s = (char *__unbounded) CHECK_BOUNDS_LOW (src);
|
||||
const ptrdiff_t off = CHECK_BOUNDS_LOW (dest) - s - 1;
|
||||
size_t n;
|
||||
|
@ -19,8 +19,6 @@
|
||||
|
||||
#ifdef _LIBC
|
||||
# include <memcopy.h>
|
||||
#else
|
||||
typedef char reg_char;
|
||||
#endif
|
||||
|
||||
#ifndef STRNCAT
|
||||
@ -31,7 +29,7 @@ typedef char reg_char;
|
||||
char *
|
||||
STRNCAT (char *s1, const char *s2, size_t n)
|
||||
{
|
||||
reg_char c;
|
||||
char c;
|
||||
char *s = s1;
|
||||
|
||||
/* Find the end of S1. */
|
||||
|
@ -31,8 +31,8 @@
|
||||
int
|
||||
STRNCMP (const char *s1, const char *s2, size_t n)
|
||||
{
|
||||
unsigned reg_char c1 = '\0';
|
||||
unsigned reg_char c2 = '\0';
|
||||
unsigned char c1 = '\0';
|
||||
unsigned char c2 = '\0';
|
||||
|
||||
if (n >= 4)
|
||||
{
|
||||
|
@ -27,7 +27,7 @@
|
||||
char *
|
||||
STRNCPY (char *s1, const char *s2, size_t n)
|
||||
{
|
||||
reg_char c;
|
||||
char c;
|
||||
char *s = s1;
|
||||
|
||||
--s1;
|
||||
|
Reference in New Issue
Block a user