Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 8 Jan 2012 21:01:52 +0000 (UTC)
From:      Eitan Adler <eadler@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject:   svn commit: r229825 - in stable/7: include lib/libc/gen
Message-ID:  <201201082101.q08L1qB2007454@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201082101.q08L1qB2007454>