From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 18 Apr 2001 02:17:08 +0000 (-0000)
Subject: ChangeLog, page.c, msyslog.c:
X-Git-Tag: NTP_4_0_99_M~70
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a90a62f6cb85d70ff624fd9d4f5c5df5fb28993;p=thirdparty%2Fntp.git

ChangeLog, page.c, msyslog.c:
  * libntp/msyslog.c:
  * ElectricFence/page.c (stringErrorReport): Follow Rainer's lead
  and use strerror().

bk: 3adcf924K3cJANj8zW3mfohTNOit5A
---

diff --git a/ChangeLog b/ChangeLog
index 8ed966b815..e91b6a2fb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2001-04-17  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+	* libntp/msyslog.c:
 	* ElectricFence/page.c (stringErrorReport): Follow Rainer's lead
 	and use strerror().
 
diff --git a/ElectricFence/page.c b/ElectricFence/page.c
index 9063f93ff7..c10b163d37 100644
--- a/ElectricFence/page.c
+++ b/ElectricFence/page.c
@@ -32,13 +32,6 @@
 
 static caddr_t	startAddr = (caddr_t) 0;
 
-#if ( !defined(sgi) && !defined(_AIX) )
-extern int	sys_nerr;
-#endif
-#ifdef CHAR_SYS_ERRLIST
-extern char *	sys_errlist[];
-#endif
-
 static const char *
 stringErrorReport(void)
 {
diff --git a/libntp/msyslog.c b/libntp/msyslog.c
index 5ec74ab3c4..81d11c0d1c 100644
--- a/libntp/msyslog.c
+++ b/libntp/msyslog.c
@@ -96,12 +96,7 @@ void msyslog(int level, const char *fmt, ...)
 			continue;
 		}
 		err = 0;
-#if !defined(VMS) && !defined(SYS_WINNT) && !defined (SYS_VXWORKS) && !defined (HAVE_STRERROR)
-		if ((unsigned)olderrno > sys_nerr)
-		    sprintf((char *)(err = xerr), "error %d", olderrno);
-		else
-		    err = (char*)sys_errlist[olderrno];
-#elif defined(VMS) || defined (SYS_VXWORKS) || defined(HAVE_STRERROR)
+#if !defined(SYS_WINNT)
 		err = strerror(olderrno);
 #else  /* SYS_WINNT */
 		err = xerr;
@@ -114,7 +109,7 @@ void msyslog(int level, const char *fmt, ...)
 			sizeof(xerr),
 			NULL);
 
-#endif /* VMS && SYS_WINNT */
+#endif /* SYS_WINNT */
 		if ((n + strlen(err)) < &nfmt[254]) {
 			strcpy(n, err);
 			n += strlen(err);