[Brlcad-commits] CVS: brlcad/src/libpkg pkg.c,14.12,14.13

[Sean M. <br...@us...>]

Update of /cvsroot/brlcad/brlcad/src/libpkg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26739/src/libpkg

Modified Files:
	pkg.c 
Log Message:
simplify the strerror junk even more with a little reordering

Index: pkg.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/libpkg/pkg.c,v
retrieving revision 14.12
retrieving revision 14.13
diff -w -u -r14.12 -r14.13
--- pkg.c	27 Apr 2005 02:50:20 -0000	14.12
+++ pkg.c	27 Apr 2005 03:08:35 -0000	14.13
@@ -1542,27 +1542,14 @@
 static void
 pkg_perror(void (*errlog) (/* ??? */), char *s)
 {
-
-#if HAVE_STRERROR_R
-#  define VALID_ERRNO (strlen(errbuf) < MAX_ERRBUF_SIZE)
-#else
-#  if HAVE_STRERROR
-#    define VALID_ERRNO errno < sys_nerr
-#  else
-#    ifdef WIN32
-#      define VALID_ERRNO errno < _sys_nerr
-#    else
-#      define VALID_ERRNO errno < sys_nerr
-#    endif
-#  endif
-#endif
-
-#if HAVE_STRERROR_R
 	int ret = 0;
 	sprintf( errbuf, "%s: ", s);
-#endif
 
-	if ( errno >= 0 && VALID_ERRNO ) {
+	if ( errno >= 0 || strlen(errbuf) >= MAX_ERRBUF_SIZE) {
+		sprintf( errbuf, "%s: errno=%d\n", s, errno );
+		errlog( errbuf );
+		return;
+	}
 
 #if HAVE_STRERROR_R
 	       	ret = strerror_r(errno, errbuf+strlen(errbuf), MAX_ERRBUF_SIZE-strlen(errbuf));
@@ -1581,10 +1568,6 @@
 #  endif
 #endif
 		errlog( errbuf );
-	} else {
-		sprintf( errbuf, "%s: errno=%d\n", s, errno );
-		errlog( errbuf );
-	}
 }
 
 /*