From owner-svn-src-stable@FreeBSD.ORG  Sun Jan  8 21:01:52 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 519151065670;
	Sun,  8 Jan 2012 21:01:52 +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 3B4BE8FC1C;
	Sun,  8 Jan 2012 21:01:52 +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 q08L1qx4007458;
	Sun, 8 Jan 2012 21:01:52 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q08L1qB2007454;
	Sun, 8 Jan 2012 21:01:52 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201201082101.q08L1qB2007454@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 8 Jan 2012 21:01:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229825 - in stable/7: include lib/libc/gen
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Jan 2012 21:01:52 -0000

Author: eadler (ports committer)
Date: Sun Jan  8 21:01:51 2012
New Revision: 229825
URL: http://svn.freebsd.org/changeset/base/229825

Log:
  MFC r228754:
  	 - Add restrict keyword to glob(3)
  
  PR:		kern/161958
  Approved by:	jilles

Modified:
  stable/7/include/glob.h
  stable/7/lib/libc/gen/glob.c
Directory Properties:
  stable/7/include/   (props changed)
  stable/7/lib/libc/   (props changed)

Modified: stable/7/include/glob.h
==============================================================================
--- stable/7/include/glob.h	Sun Jan  8 21:01:21 2012	(r229824)
+++ stable/7/include/glob.h	Sun Jan  8 21:01:51 2012	(r229825)
@@ -102,7 +102,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: stable/7/lib/libc/gen/glob.c
==============================================================================
--- stable/7/lib/libc/gen/glob.c	Sun Jan  8 21:01:21 2012	(r229824)
+++ stable/7/lib/libc/gen/glob.c	Sun Jan  8 21:01:51 2012	(r229825)
@@ -163,7 +163,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;