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 8ed966b815fd6b9d639d44b13915d4d7ad570fad..e91b6a2fb6a4410c9dd4bb0ac6006aedd5e38078 100644 (file)
--- 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 9063f93ff70a86b69d054c47d3e0d5ed59ecca52..c10b163d3719026a2c3a27212abf0d57b343e7af 100644 (file)
--- 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 5ec74ab3c4ceeda12ab9f99df55826c011302350..81d11c0d1cb61919af0ce97db54fc8621cc98ccc 100644 (file)
--- 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);