CVS update: /ccvs/lib/

User: dprice  
Date: 05/05/18 09:17:18

Modified:
 /ccvs/lib/
  ChangeLog, glob.c, glob_.h

Log:
 More misc cleanup for compatibility with GNULIB & glibc, mostly
 suggested by Paul Eggert <[email protected]>.
 * glob.c: Improve comments.
 (GETPW_R_SIZE_MAX): Add parens to definition.
 (glob): Use GNU coding conventions (formatting change).
 * glob_.h: Include <sys/cdefs.h> when possible.

File Changes:

Directory: /ccvs/lib/
=====================

File [changed]: ChangeLog
Url: https://ccvs.cvshome.org/source/browse/ccvs/lib/ChangeLog?r1=1.427&r2=1.428
Delta lines:  +9 -0
-------------------
--- ChangeLog	17 May 2005 22:12:12 -0000	1.427
+++ ChangeLog	18 May 2005 16:17:15 -0000	1.428
@@ -1,3 +1,12 @@
+2005-05-18  Derek Price  <[email protected]>
+
+	More misc cleanup for compatibility with GNULIB & glibc, mostly
+	suggested by Paul Eggert <[email protected]>.
+	* glob.c: Improve comments.
+	(GETPW_R_SIZE_MAX): Add parens to definition.
+	(glob): Use GNU coding conventions (formatting change).
+	* glob_.h: Include <sys/cdefs.h> when possible.
+
 2005-05-17  Conrad T. Pino  <[email protected]>
 
 	* libcvs.dsp: Add "glob.c", "glob_.h" and "mempcpy.c" to project.

File [changed]: glob.c
Url: https://ccvs.cvshome.org/source/browse/ccvs/lib/glob.c?r1=1.6&r2=1.7
Delta lines:  +5 -5
-------------------
--- glob.c	17 May 2005 19:19:09 -0000	1.6
+++ glob.c	18 May 2005 16:17:15 -0000	1.7
@@ -199,12 +199,12 @@
 #ifdef _SC_GETPW_R_SIZE_MAX
 # define GETPW_R_SIZE_MAX()	sysconf (_SC_GETPW_R_SIZE_MAX)
 #else
-# define GETPW_R_SIZE_MAX()	-1;
+# define GETPW_R_SIZE_MAX()	(-1);
 #endif
 
 static const char *next_brace_sub (const char *begin, int flags) __THROW;
 
-#endif /* !_LIBC || !GLOB_ONLY_P */
+#endif /* !defined _LIBC || !defined GLOB_ONLY_P */
 
 static int glob_in_dir (const char *pattern, const char *directory,
 			int flags, int (*errfunc) (const char *, int),
@@ -239,7 +239,7 @@
   return *cp != '\0' ? cp : NULL;
 }
 
-#endif /* !_LIBC || !GLOB_ONLY_P */
+#endif /* !defined _LIBC || !defined GLOB_ONLY_P */
 
 /* Do glob searching for PATTERN, placing results in PGLOB.
    The bits defined above may be set in FLAGS.
@@ -561,7 +561,7 @@
 		{
 		  struct passwd *p;
 #   if defined HAVE_GETPWNAM_R || defined _LIBC
-		  long int pwbuflen = GETPW_R_SIZE_MAX();
+		  long int pwbuflen = GETPW_R_SIZE_MAX ();
 		  char *pwtmpbuf;
 		  struct passwd pwbuf;
 		  int save = errno;
@@ -642,7 +642,7 @@
 	  {
 	    struct passwd *p;
 #  if defined HAVE_GETPWNAM_R || defined _LIBC
-	    long int buflen = GETPW_R_SIZE_MAX();
+	    long int buflen = GETPW_R_SIZE_MAX ();
 	    char *pwtmpbuf;
 	    struct passwd pwbuf;
 	    int save = errno;

File [changed]: glob_.h
Url: https://ccvs.cvshome.org/source/browse/ccvs/lib/glob_.h?r1=1.6&r2=1.7
Delta lines:  +1 -1
-------------------
--- glob_.h	17 May 2005 19:19:09 -0000	1.6
+++ glob_.h	18 May 2005 16:17:15 -0000	1.7
@@ -19,7 +19,7 @@
 #ifndef	_GLOB_H
 #define	_GLOB_H	1
 
-#if defined _LIBC
+#if defined _LIBC || HAVE_SYS_CDEFS_H
 # include <sys/cdefs.h>
 #endif