summaryrefslogtreecommitdiffstats
path: root/lib/libc/string
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2002-03-21 18:49:23 +0000
committerobrien <obrien@FreeBSD.org>2002-03-21 18:49:23 +0000
commit1196344bb37334ed0f8808056a53ca058758843c (patch)
tree12b252b7426e8a8904ef257bea10fea6038142f4 /lib/libc/string
parent8ee1755c8ef3729bb2d3c4bfae2b85b786fdaf70 (diff)
downloadFreeBSD-src-1196344bb37334ed0f8808056a53ca058758843c.zip
FreeBSD-src-1196344bb37334ed0f8808056a53ca058758843c.tar.gz
Remove 'register' keyword.
Diffstat (limited to 'lib/libc/string')
-rw-r--r--lib/libc/string/bcmp.c4
-rw-r--r--lib/libc/string/bcopy.c8
-rw-r--r--lib/libc/string/ffs.c4
-rw-r--r--lib/libc/string/index.c2
-rw-r--r--lib/libc/string/memccpy.c8
-rw-r--r--lib/libc/string/memchr.c6
-rw-r--r--lib/libc/string/memcmp.c2
-rw-r--r--lib/libc/string/memset.c12
-rw-r--r--lib/libc/string/rindex.c6
-rw-r--r--lib/libc/string/strcasecmp.c6
-rw-r--r--lib/libc/string/strcasestr.c6
-rw-r--r--lib/libc/string/strcat.c4
-rw-r--r--lib/libc/string/strcmp.c2
-rw-r--r--lib/libc/string/strcpy.c4
-rw-r--r--lib/libc/string/strcspn.c6
-rw-r--r--lib/libc/string/strlcat.c6
-rw-r--r--lib/libc/string/strlcpy.c6
-rw-r--r--lib/libc/string/strlen.c2
-rw-r--r--lib/libc/string/strmode.c4
-rw-r--r--lib/libc/string/strncat.c6
-rw-r--r--lib/libc/string/strncmp.c4
-rw-r--r--lib/libc/string/strncpy.c6
-rw-r--r--lib/libc/string/strpbrk.c6
-rw-r--r--lib/libc/string/strsep.c10
-rw-r--r--lib/libc/string/strsignal.c4
-rw-r--r--lib/libc/string/strspn.c6
-rw-r--r--lib/libc/string/strstr.c6
-rw-r--r--lib/libc/string/swab.c6
28 files changed, 76 insertions, 76 deletions
diff --git a/lib/libc/string/bcmp.c b/lib/libc/string/bcmp.c
index 6fd1265..013d0d6 100644
--- a/lib/libc/string/bcmp.c
+++ b/lib/libc/string/bcmp.c
@@ -45,9 +45,9 @@ __FBSDID("$FreeBSD$");
int
bcmp(b1, b2, length)
const void *b1, *b2;
- register size_t length;
+ size_t length;
{
- register char *p1, *p2;
+ char *p1, *p2;
if (length == 0)
return(0);
diff --git a/lib/libc/string/bcopy.c b/lib/libc/string/bcopy.c
index 23cc00f..2a6343b 100644
--- a/lib/libc/string/bcopy.c
+++ b/lib/libc/string/bcopy.c
@@ -70,11 +70,11 @@ bcopy(src0, dst0, length)
#endif
void *dst0;
const void *src0;
- register size_t length;
+ size_t length;
{
- register char *dst = dst0;
- register const char *src = src0;
- register size_t t;
+ char *dst = dst0;
+ const char *src = src0;
+ size_t t;
if (length == 0 || dst == src) /* nothing to do */
goto done;
diff --git a/lib/libc/string/ffs.c b/lib/libc/string/ffs.c
index 231bc25..14985a4 100644
--- a/lib/libc/string/ffs.c
+++ b/lib/libc/string/ffs.c
@@ -44,9 +44,9 @@ __FBSDID("$FreeBSD$");
*/
int
ffs(mask)
- register int mask;
+ int mask;
{
- register int bit;
+ int bit;
if (mask == 0)
return(0);
diff --git a/lib/libc/string/index.c b/lib/libc/string/index.c
index 1f7973a..7eaf3d7 100644
--- a/lib/libc/string/index.c
+++ b/lib/libc/string/index.c
@@ -46,7 +46,7 @@ strchr(p, ch)
#else
index(p, ch)
#endif
- register const char *p, ch;
+ const char *p, ch;
{
for (;; ++p) {
if (*p == ch)
diff --git a/lib/libc/string/memccpy.c b/lib/libc/string/memccpy.c
index 665fdb2..62c47a1 100644
--- a/lib/libc/string/memccpy.c
+++ b/lib/libc/string/memccpy.c
@@ -44,13 +44,13 @@ memccpy(t, f, c, n)
void *t;
const void *f;
int c;
- register size_t n;
+ size_t n;
{
if (n) {
- register unsigned char *tp = t;
- register const unsigned char *fp = f;
- register unsigned char uc = c;
+ unsigned char *tp = t;
+ const unsigned char *fp = f;
+ unsigned char uc = c;
do {
if ((*tp++ = *fp++) == uc)
return (tp);
diff --git a/lib/libc/string/memchr.c b/lib/libc/string/memchr.c
index 16b2c77..a217a80 100644
--- a/lib/libc/string/memchr.c
+++ b/lib/libc/string/memchr.c
@@ -45,11 +45,11 @@ __FBSDID("$FreeBSD$");
void *
memchr(s, c, n)
const void *s;
- register unsigned char c;
- register size_t n;
+ unsigned char c;
+ size_t n;
{
if (n != 0) {
- register const unsigned char *p = s;
+ const unsigned char *p = s;
do {
if (*p++ == c)
diff --git a/lib/libc/string/memcmp.c b/lib/libc/string/memcmp.c
index 9711308..6b28c31 100644
--- a/lib/libc/string/memcmp.c
+++ b/lib/libc/string/memcmp.c
@@ -51,7 +51,7 @@ memcmp(s1, s2, n)
size_t n;
{
if (n != 0) {
- register const unsigned char *p1 = s1, *p2 = s2;
+ const unsigned char *p1 = s1, *p2 = s2;
do {
if (*p1++ != *p2++)
diff --git a/lib/libc/string/memset.c b/lib/libc/string/memset.c
index e08259d..462dbe9 100644
--- a/lib/libc/string/memset.c
+++ b/lib/libc/string/memset.c
@@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$");
void
bzero(dst0, length)
void *dst0;
- register size_t length;
+ size_t length;
#else
#define RETURN return (dst0)
#define VAL c0
@@ -65,15 +65,15 @@ bzero(dst0, length)
void *
memset(dst0, c0, length)
void *dst0;
- register int c0;
- register size_t length;
+ int c0;
+ size_t length;
#endif
{
- register size_t t;
+ size_t t;
#ifndef BZERO
- register u_int c;
+ u_int c;
#endif
- register u_char *dst;
+ u_char *dst;
dst = dst0;
/*
diff --git a/lib/libc/string/rindex.c b/lib/libc/string/rindex.c
index fbf698b..1b08dd1 100644
--- a/lib/libc/string/rindex.c
+++ b/lib/libc/string/rindex.c
@@ -46,10 +46,10 @@ strrchr(p, ch)
#else
rindex(p, ch)
#endif
- register const char *p;
- register int ch;
+ const char *p;
+ int ch;
{
- register char *save;
+ char *save;
for (save = NULL;; ++p) {
if (*p == ch)
diff --git a/lib/libc/string/strcasecmp.c b/lib/libc/string/strcasecmp.c
index c280ef4..830b8a5 100644
--- a/lib/libc/string/strcasecmp.c
+++ b/lib/libc/string/strcasecmp.c
@@ -46,7 +46,7 @@ int
strcasecmp(s1, s2)
const char *s1, *s2;
{
- register const u_char
+ const u_char
*us1 = (const u_char *)s1,
*us2 = (const u_char *)s2;
@@ -59,10 +59,10 @@ strcasecmp(s1, s2)
int
strncasecmp(s1, s2, n)
const char *s1, *s2;
- register size_t n;
+ size_t n;
{
if (n != 0) {
- register const u_char
+ const u_char
*us1 = (const u_char *)s1,
*us2 = (const u_char *)s2;
diff --git a/lib/libc/string/strcasestr.c b/lib/libc/string/strcasestr.c
index bbe25cb..d950766 100644
--- a/lib/libc/string/strcasestr.c
+++ b/lib/libc/string/strcasestr.c
@@ -45,10 +45,10 @@ __FBSDID("$FreeBSD$");
*/
char *
strcasestr(s, find)
- register const char *s, *find;
+ const char *s, *find;
{
- register char c, sc;
- register size_t len;
+ char c, sc;
+ size_t len;
if ((c = *find++) != 0) {
c = tolower((unsigned char)c);
diff --git a/lib/libc/string/strcat.c b/lib/libc/string/strcat.c
index 4237d8a..2bfd7b7 100644
--- a/lib/libc/string/strcat.c
+++ b/lib/libc/string/strcat.c
@@ -41,8 +41,8 @@ __FBSDID("$FreeBSD$");
char *
strcat(s, append)
- register char *s;
- register const char *append;
+ char *s;
+ const char *append;
{
char *save = s;
diff --git a/lib/libc/string/strcmp.c b/lib/libc/string/strcmp.c
index d444cc1..a6bb0d5 100644
--- a/lib/libc/string/strcmp.c
+++ b/lib/libc/string/strcmp.c
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
*/
int
strcmp(s1, s2)
- register const char *s1, *s2;
+ const char *s1, *s2;
{
while (*s1 == *s2++)
if (*s1++ == 0)
diff --git a/lib/libc/string/strcpy.c b/lib/libc/string/strcpy.c
index ce54d59..590a5fb 100644
--- a/lib/libc/string/strcpy.c
+++ b/lib/libc/string/strcpy.c
@@ -41,8 +41,8 @@ __FBSDID("$FreeBSD$");
char *
strcpy(to, from)
- register char *to;
- register const char *from;
+ char *to;
+ const char *from;
{
char *save = to;
diff --git a/lib/libc/string/strcspn.c b/lib/libc/string/strcspn.c
index d4dac4d..2ec9326 100644
--- a/lib/libc/string/strcspn.c
+++ b/lib/libc/string/strcspn.c
@@ -48,10 +48,10 @@ __FBSDID("$FreeBSD$");
size_t
strcspn(s1, s2)
const char *s1;
- register const char *s2;
+ const char *s2;
{
- register const char *p, *spanp;
- register char c, sc;
+ const char *p, *spanp;
+ char c, sc;
/*
* Stop as soon as we find any character from s2. Note that there
diff --git a/lib/libc/string/strlcat.c b/lib/libc/string/strlcat.c
index 71c502c..2c2fa56 100644
--- a/lib/libc/string/strlcat.c
+++ b/lib/libc/string/strlcat.c
@@ -49,9 +49,9 @@ strlcat(dst, src, siz)
const char *src;
size_t siz;
{
- register char *d = dst;
- register const char *s = src;
- register size_t n = siz;
+ char *d = dst;
+ const char *s = src;
+ size_t n = siz;
size_t dlen;
/* Find the end of dst and adjust bytes left but don't go past end */
diff --git a/lib/libc/string/strlcpy.c b/lib/libc/string/strlcpy.c
index 30ec341..a8a6cb7 100644
--- a/lib/libc/string/strlcpy.c
+++ b/lib/libc/string/strlcpy.c
@@ -46,9 +46,9 @@ size_t strlcpy(dst, src, siz)
const char *src;
size_t siz;
{
- register char *d = dst;
- register const char *s = src;
- register size_t n = siz;
+ char *d = dst;
+ const char *s = src;
+ size_t n = siz;
/* Copy as many bytes as will fit */
if (n != 0 && --n != 0) {
diff --git a/lib/libc/string/strlen.c b/lib/libc/string/strlen.c
index 96076af..841c7c2 100644
--- a/lib/libc/string/strlen.c
+++ b/lib/libc/string/strlen.c
@@ -43,7 +43,7 @@ size_t
strlen(str)
const char *str;
{
- register const char *s;
+ const char *s;
for (s = str; *s; ++s);
return(s - str);
diff --git a/lib/libc/string/strmode.c b/lib/libc/string/strmode.c
index 55b72c2..fe2cf9e 100644
--- a/lib/libc/string/strmode.c
+++ b/lib/libc/string/strmode.c
@@ -43,8 +43,8 @@ __FBSDID("$FreeBSD$");
void
strmode(mode, p)
- register mode_t mode;
- register char *p;
+ mode_t mode;
+ char *p;
{
/* print type */
switch (mode & S_IFMT) {
diff --git a/lib/libc/string/strncat.c b/lib/libc/string/strncat.c
index a03848f..cc5ab67 100644
--- a/lib/libc/string/strncat.c
+++ b/lib/libc/string/strncat.c
@@ -50,11 +50,11 @@ char *
strncat(dst, src, n)
char *dst;
const char *src;
- register size_t n;
+ size_t n;
{
if (n != 0) {
- register char *d = dst;
- register const char *s = src;
+ char *d = dst;
+ const char *s = src;
while (*d != 0)
d++;
diff --git a/lib/libc/string/strncmp.c b/lib/libc/string/strncmp.c
index fff21f9..60d09c1 100644
--- a/lib/libc/string/strncmp.c
+++ b/lib/libc/string/strncmp.c
@@ -41,8 +41,8 @@ __FBSDID("$FreeBSD$");
int
strncmp(s1, s2, n)
- register const char *s1, *s2;
- register size_t n;
+ const char *s1, *s2;
+ size_t n;
{
if (n == 0)
diff --git a/lib/libc/string/strncpy.c b/lib/libc/string/strncpy.c
index c9a0525..771ebe6 100644
--- a/lib/libc/string/strncpy.c
+++ b/lib/libc/string/strncpy.c
@@ -50,11 +50,11 @@ char *
strncpy(dst, src, n)
char *dst;
const char *src;
- register size_t n;
+ size_t n;
{
if (n != 0) {
- register char *d = dst;
- register const char *s = src;
+ char *d = dst;
+ const char *s = src;
do {
if ((*d++ = *s++) == 0) {
diff --git a/lib/libc/string/strpbrk.c b/lib/libc/string/strpbrk.c
index e9196da..42e8c62 100644
--- a/lib/libc/string/strpbrk.c
+++ b/lib/libc/string/strpbrk.c
@@ -44,10 +44,10 @@ __FBSDID("$FreeBSD$");
*/
char *
strpbrk(s1, s2)
- register const char *s1, *s2;
+ const char *s1, *s2;
{
- register const char *scanp;
- register int c, sc;
+ const char *scanp;
+ int c, sc;
while ((c = *s1++) != 0) {
for (scanp = s2; (sc = *scanp++) != 0;)
diff --git a/lib/libc/string/strsep.c b/lib/libc/string/strsep.c
index 5e9fa9f..dd5ec0b 100644
--- a/lib/libc/string/strsep.c
+++ b/lib/libc/string/strsep.c
@@ -53,12 +53,12 @@ __FBSDID("$FreeBSD$");
*/
char *
strsep(stringp, delim)
- register char **stringp;
- register const char *delim;
+ char **stringp;
+ const char *delim;
{
- register char *s;
- register const char *spanp;
- register int c, sc;
+ char *s;
+ const char *spanp;
+ int c, sc;
char *tok;
if ((s = *stringp) == NULL)
diff --git a/lib/libc/string/strsignal.c b/lib/libc/string/strsignal.c
index 330efa8..f839e44 100644
--- a/lib/libc/string/strsignal.c
+++ b/lib/libc/string/strsignal.c
@@ -47,8 +47,8 @@ strsignal(num)
{
#define UPREFIX "Unknown signal: "
static char ebuf[40] = UPREFIX; /* 64-bit number + slop */
- register unsigned int signum;
- register char *p, *t;
+ unsigned int signum;
+ char *p, *t;
char tmp[40];
signum = num; /* convert to unsigned */
diff --git a/lib/libc/string/strspn.c b/lib/libc/string/strspn.c
index 6d2510f..5612ba0 100644
--- a/lib/libc/string/strspn.c
+++ b/lib/libc/string/strspn.c
@@ -45,10 +45,10 @@ __FBSDID("$FreeBSD$");
size_t
strspn(s1, s2)
const char *s1;
- register const char *s2;
+ const char *s2;
{
- register const char *p = s1, *spanp;
- register char c, sc;
+ const char *p = s1, *spanp;
+ char c, sc;
/*
* Skip any characters in s2, excluding the terminating \0.
diff --git a/lib/libc/string/strstr.c b/lib/libc/string/strstr.c
index f8535ad1..3f6d81c 100644
--- a/lib/libc/string/strstr.c
+++ b/lib/libc/string/strstr.c
@@ -47,10 +47,10 @@ __FBSDID("$FreeBSD$");
*/
char *
strstr(s, find)
- register const char *s, *find;
+ const char *s, *find;
{
- register char c, sc;
- register size_t len;
+ char c, sc;
+ size_t len;
if ((c = *find++) != 0) {
len = strlen(find);
diff --git a/lib/libc/string/swab.c b/lib/libc/string/swab.c
index 22710df..70da36f 100644
--- a/lib/libc/string/swab.c
+++ b/lib/libc/string/swab.c
@@ -48,9 +48,9 @@ swab(from, to, len)
void *to;
size_t len;
{
- register unsigned long temp;
- register int n;
- register char *fp, *tp;
+ unsigned long temp;
+ int n;
+ char *fp, *tp;
n = (len >> 1) + 1;
fp = (char *)from;
OpenPOWER on IntegriCloud