* 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
index 29f6fd5eb0419e30830d3bc2eabd075b144096ba..16a2a47e540e5cf18a87c40aef52c7c1f463ef27 100644 (file)
--- 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
index e7eab099add6ad0a0c54d98fe9e6c8133dfd0985..6f6d9c2af9c965271fe4f3a8f30a918a88894384 100644 (file)
--- 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/sysdeps/generic/memmem.c   lib gpl
 #$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
index 1312203e33211be0dc27ff65e12b0768f3332f2c..26ac577142cc4baffb2d8f29f4b98e898480033e 100644 (file)
--- 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
index f2db01b0b3f1cc3be60dce23f525ad45aa55406f..0567902b474f039fd57346122ccb5ff59358f741 100644 (file)
--- 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 @@ int
 #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 @@ glob (const char *pattern, int flags,
            {
              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 @@ libc_hidden_def (glob)
 
 /* 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 @@ prefix_array (const char *dirname, char **array, size_t n)
 /* 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;