summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEitan Adler <eadler@FreeBSD.org>2011-12-20 22:56:13 +0000
committerEitan Adler <eadler@FreeBSD.org>2011-12-20 22:56:13 +0000
commit0d6d372c033b26cfd543895c22b433bb91156f58 (patch)
tree776e3a64d9b347bde5def5ac4f12972e220505b0
parentbca5071ff07ac7a303f3a313a53cf38406881d32 (diff)
downloadsrc-test2-0d6d372c033b26cfd543895c22b433bb91156f58.tar.gz
src-test2-0d6d372c033b26cfd543895c22b433bb91156f58.zip
- Add restrict keyword to glob(3)
PR: kern/161958 Submitted by: Henning Petersen <henning.petersen@t-online.de> Approved by: jilles MFC after: 3 days
Notes
Notes: svn path=/head/; revision=228754
-rw-r--r--include/glob.h3
-rw-r--r--lib/libc/gen/glob.34
-rw-r--r--lib/libc/gen/glob.c3
3 files changed, 6 insertions, 4 deletions
diff --git a/include/glob.h b/include/glob.h
index 351b6c46bbb6..073805bc083b 100644
--- a/include/glob.h
+++ b/include/glob.h
@@ -98,7 +98,8 @@ typedef struct {
#endif /* __BSD_VISIBLE */
__BEGIN_DECLS
-int glob(const char *, int, int (*)(const char *, int), glob_t *);
+int glob(const char * __restrict, int,
+ int (*)(const char *, int), glob_t * __restrict);
void globfree(glob_t *);
__END_DECLS
diff --git a/lib/libc/gen/glob.3 b/lib/libc/gen/glob.3
index 7d6e43bb3718..468a73ba3d68 100644
--- a/lib/libc/gen/glob.3
+++ b/lib/libc/gen/glob.3
@@ -30,7 +30,7 @@
.\" @(#)glob.3 8.3 (Berkeley) 4/16/94
.\" $FreeBSD$
.\"
-.Dd February 15, 2011
+.Dd December 20, 2011
.Dt GLOB 3
.Os
.Sh NAME
@@ -42,7 +42,7 @@
.Sh SYNOPSIS
.In glob.h
.Ft int
-.Fn glob "const char *pattern" "int flags" "int (*errfunc)(const char *, int)" "glob_t *pglob"
+.Fn glob "const char * restrict pattern" "int flags" "int (*errfunc)(const char *, int)" "glob_t * restrict pglob"
.Ft void
.Fn globfree "glob_t *pglob"
.Sh DESCRIPTION
diff --git a/lib/libc/gen/glob.c b/lib/libc/gen/glob.c
index 59663d987540..f3ae50f1653c 100644
--- a/lib/libc/gen/glob.c
+++ b/lib/libc/gen/glob.c
@@ -168,7 +168,8 @@ static void qprintf(const char *, Char *);
#endif
int
-glob(const char *pattern, int flags, int (*errfunc)(const char *, int), glob_t *pglob)
+glob(const char * __restrict pattern, int flags,
+ int (*errfunc)(const char *, int), glob_t * __restrict pglob)
{
const char *patnext;
size_t limit;