git: 48d6f8f13a30 - stable/13 - Remove incorrect __restricted labels from strcspn

[Warner Losh]

The branch stable/13 has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=48d6f8f13a30c8642377dcad6e61a496b36cc186

commit 48d6f8f13a30c8642377dcad6e61a496b36cc186
Author:     Alfonso Gregory <gfunni234 at gmail.com>
AuthorDate: 2021-07-14 21:48:35 +0000
Commit:     Warner Losh <imp at FreeBSD.org>
CommitDate: 2021-07-21 16:13:10 +0000

    Remove incorrect __restricted labels from strcspn
    
    strcspn should never have had the __restrict keywords. While both of
    these strings are const, it may have unindended side effects. While this
    is the kernel, the POSIX definition also omits restrict.
    
    Reviewed by:    imp@
    Pull Request:   https://github.com/freebsd/freebsd-src/pull/497
    
    (cherry picked from commit 56d33e86b74b197a36f42255824b56715c96a596)
---
 sys/libkern/strcspn.c | 2 +-
 sys/sys/libkern.h     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/libkern/strcspn.c b/sys/libkern/strcspn.c
index fce6d4b8b071..62bfcf78eeb7 100644
--- a/sys/libkern/strcspn.c
+++ b/sys/libkern/strcspn.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 #define	BIT(c)	((u_long)1 << ((u_char)(c) % LONG_BIT))
 
 size_t 
-strcspn(const char * __restrict s, const char * __restrict charset) 
+strcspn(const char *s, const char *charset)
 {
 	/*
 	 * NB: idx and bit are temporaries whose use causes gcc 3.4.2 to
diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h
index 0c3489d4c206..8517c0dab1f6 100644
--- a/sys/sys/libkern.h
+++ b/sys/sys/libkern.h
@@ -174,8 +174,8 @@ char	*strchr(const char *, int);
 char	*strchrnul(const char *, int);
 int	 strcmp(const char *, const char *);
 char	*strcpy(char * __restrict, const char * __restrict);
-size_t	 strcspn(const char * __restrict, const char * __restrict) __pure;
 char	*strdup_flags(const char *__restrict, struct malloc_type *, int);
+size_t	 strcspn(const char *, const char *) __pure;
 char	*strdup(const char *__restrict, struct malloc_type *);
 char	*strncat(char *, const char *, size_t);
 char	*strndup(const char *__restrict, size_t, struct malloc_type *);