diff options
-rw-r--r-- | sys/libkern/strcat.c | 4 | ||||
-rw-r--r-- | sys/libkern/strcpy.c | 4 | ||||
-rw-r--r-- | sys/libkern/strncpy.c | 5 | ||||
-rw-r--r-- | sys/sys/libkern.h | 6 |
4 files changed, 6 insertions, 13 deletions
diff --git a/sys/libkern/strcat.c b/sys/libkern/strcat.c index e517c08..2117be1 100644 --- a/sys/libkern/strcat.c +++ b/sys/libkern/strcat.c @@ -36,9 +36,7 @@ #include <sys/libkern.h> char * -strcat(s, append) - register char *s; - register const char *append; +strcat(char * __restrict s, const char * __restrict append) { char *save = s; diff --git a/sys/libkern/strcpy.c b/sys/libkern/strcpy.c index 3aed2d0..dd25c60 100644 --- a/sys/libkern/strcpy.c +++ b/sys/libkern/strcpy.c @@ -36,9 +36,7 @@ #include <sys/libkern.h> char * -strcpy(to, from) - register char *to; - register const char *from; +strcpy(char * __restrict to, const char * __restrict from) { char *save = to; diff --git a/sys/libkern/strncpy.c b/sys/libkern/strncpy.c index a8b51a7..07039c3 100644 --- a/sys/libkern/strncpy.c +++ b/sys/libkern/strncpy.c @@ -43,10 +43,7 @@ * Return dst. */ char * -strncpy(dst, src, n) - char *dst; - const char *src; - register size_t n; +strncpy(char * __restrict dst, const char * __restrict src, size_t n) { if (n != 0) { register char *d = dst; diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h index bb0c0a7..947de94 100644 --- a/sys/sys/libkern.h +++ b/sys/sys/libkern.h @@ -89,14 +89,14 @@ char *rindex(const char *, int); int scanc(u_int, const u_char *, const u_char *, int); int skpc(int, int, char *); void srandom(u_long); -char *strcat(char *, const char *); +char *strcat(char * __restrict, const char * __restrict); int strcmp(const char *, const char *); -char *strcpy(char *, const char *); +char *strcpy(char * __restrict, const char * __restrict); size_t strlcat(char *, const char *, size_t); size_t strlcpy(char *, const char *, size_t); size_t strlen(const char *); int strncmp(const char *, const char *, size_t); -char *strncpy(char *, const char *, size_t); +char *strncpy(char * __restrict, const char * __restrict, size_t); char *strsep(char **, const char *delim); int strvalid(const char *, size_t); |