d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add restrict qualifiers to the parameters to strlcpy() and strlcat().

Browse Source 
The annotation mainly just serves as a hint that they're not intended
for use with overlapping strings.
This commit is contained in:
David Schultz 2009-02-28 05:15:02 +00:00
parent dce7ffd6df
commit e00a6d21eb
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/string.h
View File

@ -85,8 +85,8 @@ char *strerror(int);
int strerror_r(int, char *, size_t); int strerror_r(int, char *, size_t);
#endif #endif
#if __BSD_VISIBLE #if __BSD_VISIBLE
size_t strlcat(char *, const char *, size_t); size_t strlcat(char * __restrict, const char * __restrict, size_t);
size_t strlcpy(char *, const char *, size_t); size_t strlcpy(char * __restrict, const char * __restrict, size_t);
#endif #endif
size_t strlen(const char *) __pure; size_t strlen(const char *) __pure;
#if __BSD_VISIBLE #if __BSD_VISIBLE

2
lib/libc/string/strlcat.c
View File

@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$");
* If retval >= siz, truncation occurred. * If retval >= siz, truncation occurred.
*/ */
size_t size_t
strlcat(char *dst, const char *src, size_t siz) strlcat(char * __restrict dst, const char * __restrict src, size_t siz)
{ {
char *d = dst; char *d = dst;
const char *s = src; const char *s = src;

4
lib/libc/string/strlcpy.3
View File

@ -39,9 +39,9 @@
.Sh SYNOPSIS .Sh SYNOPSIS
.In string.h .In string.h
.Ft size_t .Ft size_t
.Fn strlcpy "char *dst" "const char *src" "size_t size" .Fn strlcpy "char * restrict dst" "const char * restrict src" "size_t size"
.Ft size_t .Ft size_t
.Fn strlcat "char *dst" "const char *src" "size_t size" .Fn strlcat "char * restrict dst" "const char * restrict src" "size_t size"
.Sh DESCRIPTION .Sh DESCRIPTION
The The
.Fn strlcpy .Fn strlcpy

2
lib/libc/string/strlcpy.c
View File

@ -28,7 +28,7 @@ __FBSDID("$FreeBSD$");
* Returns strlen(src); if retval >= siz, truncation occurred. * Returns strlen(src); if retval >= siz, truncation occurred.
*/ */
size_t size_t
strlcpy(char *dst, const char *src, size_t siz) strlcpy(char * __restrict dst, const char * __restrict src, size_t siz)
{ {
char *d = dst; char *d = dst;
const char *s = src; const char *s = src;