# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1126210728 0
# Node ID 71a1ca6e85c061f762300afee27a371e37cff173
# Parent  f73f33cda5906940c75da238ce12144b7261baac
* lib/glob.c (glob, globfree, __glob_pattern_p): Use old-style function
definitions, since that's the preferred style in glibc.
Fix a minor spacing issue, and update copyright notice to match glibc's.
* config/srclist.txt: Remove glibc bug 1061; it's been fixed.

diff --git a/config/ChangeLog b/config/ChangeLog
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* srclist.txt: Remove glibc bug 1061; it's been fixed.
+
 2005-09-06  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* srclist.txt: Add glibc bug 1302.
diff --git a/config/srclist.txt b/config/srclist.txt
--- a/config/srclist.txt
+++ b/config/srclist.txt
@@ -1,4 +1,4 @@
-# $Id: srclist.txt,v 1.103 2005-09-06 07:36:48 eggert Exp $
+# $Id: srclist.txt,v 1.104 2005-09-08 20:18:48 eggert Exp $
 # Files for which we are not the source.  See ./srclistvars.sh for the
 # variable definitions.
 
@@ -212,7 +212,6 @@
 #$LIBCSRC/string/strverscmp.c		lib gpl
 #
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1060
-# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1061
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1062
 #$LIBCSRC/sysdeps/generic/glob.c	lib gpl
 #
diff --git a/lib/ChangeLog b/lib/ChangeLog
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* glob.c (glob, globfree, __glob_pattern_p): Use old-style function
+	definitions, since that's the preferred style in glibc.
+	Fix a minor spacing issue, and update copyright notice to match glibc's.
+
 2005-09-06  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* regex_internal.h (bitset_not): Add parens to avoid gcc -Wall warning.
diff --git a/lib/glob.c b/lib/glob.c
--- a/lib/glob.c
+++ b/lib/glob.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2002,2003,2004,2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -240,9 +240,11 @@
 #ifdef GLOB_ATTRIBUTE
 GLOB_ATTRIBUTE
 #endif
-glob (const char *pattern, int flags,
-      int (*errfunc) (const char *, int),
-      glob_t *pglob)
+glob (pattern, flags, errfunc, pglob)
+     const char *pattern;
+     int flags;
+     int (*errfunc) (const char *, int);
+     glob_t *pglob;
 {
   const char *filename;
   const char *dirname;
@@ -531,7 +533,7 @@
 	    {
 	      int success;
 	      char *name;
-	      size_t buflen = GET_LOGIN_NAME_MAX() + 1;
+	      size_t buflen = GET_LOGIN_NAME_MAX () + 1;
 
 	      if (buflen == 0)
 		/* `sysconf' does not support _SC_LOGIN_NAME_MAX.  Try
@@ -888,7 +890,8 @@
 
 /* Free storage allocated in PGLOB by a previous `glob' call.  */
 void
-globfree (register glob_t *pglob)
+globfree (pglob)
+     register glob_t *pglob;
 {
   if (pglob->gl_pathv != NULL)
     {
@@ -986,7 +989,9 @@
 /* Return nonzero if PATTERN contains any metacharacters.
    Metacharacters can be quoted with backslashes if QUOTE is nonzero.  */
 int
-__glob_pattern_p (const char *pattern, int quote)
+__glob_pattern_p (pattern, quote)
+     const char *pattern;
+     int quote;
 {
   register const char *p;
   int open = 0;