From owner-svn-src-head@FreeBSD.ORG  Tue Dec 20 22:56:13 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CCC93106564A;
	Tue, 20 Dec 2011 22:56:13 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9DF5D8FC22;
	Tue, 20 Dec 2011 22:56:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBKMuDuP039008;
	Tue, 20 Dec 2011 22:56:13 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBKMuDbD039004;
	Tue, 20 Dec 2011 22:56:13 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201112202256.pBKMuDbD039004@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Tue, 20 Dec 2011 22:56:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228754 - in head: include lib/libc/gen
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Dec 2011 22:56:13 -0000

Author: eadler (ports committer)
Date: Tue Dec 20 22:56:13 2011
New Revision: 228754
URL: http://svn.freebsd.org/changeset/base/228754

Log:
  - 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

Modified:
  head/include/glob.h
  head/lib/libc/gen/glob.3
  head/lib/libc/gen/glob.c

Modified: head/include/glob.h
==============================================================================
--- head/include/glob.h	Tue Dec 20 22:47:56 2011	(r228753)
+++ head/include/glob.h	Tue Dec 20 22:56:13 2011	(r228754)
@@ -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
 

Modified: head/lib/libc/gen/glob.3
==============================================================================
--- head/lib/libc/gen/glob.3	Tue Dec 20 22:47:56 2011	(r228753)
+++ head/lib/libc/gen/glob.3	Tue Dec 20 22:56:13 2011	(r228754)
@@ -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

Modified: head/lib/libc/gen/glob.c
==============================================================================
--- head/lib/libc/gen/glob.c	Tue Dec 20 22:47:56 2011	(r228753)
+++ head/lib/libc/gen/glob.c	Tue Dec 20 22:56:13 2011	(r228754)
@@ -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;