Use strerror(3) instead of sys_errlist and sys_nerr.
This commit is contained in:
parent
6fa43ba824
commit
37bede84a4
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: mapper.c,v 1.3 1995/12/10 11:12:04 mycroft Exp $ */
|
||||
/* $NetBSD: mapper.c,v 1.4 1998/05/09 17:22:07 kleink Exp $ */
|
||||
|
||||
/* Mapper for connections between MRouteD multicast routers.
|
||||
* Written by Pavel Curtis <Pavel@PARC.Xerox.Com>
|
||||
|
@ -192,10 +192,8 @@ log(severity, syserr, format, va_alist)
|
|||
vfprintf(stderr, fmt, ap);
|
||||
if (syserr == 0)
|
||||
fprintf(stderr, "\n");
|
||||
else if (syserr < sys_nerr)
|
||||
fprintf(stderr, ": %s\n", sys_errlist[syserr]);
|
||||
else
|
||||
fprintf(stderr, ": errno %d\n", syserr);
|
||||
fprintf(stderr, ": %s\n", strerror(syserr));
|
||||
}
|
||||
|
||||
if (severity <= LOG_ERR)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: mrinfo.c,v 1.5 1997/10/17 11:18:10 lukem Exp $ */
|
||||
/* $NetBSD: mrinfo.c,v 1.6 1998/05/09 17:22:08 kleink Exp $ */
|
||||
|
||||
/*
|
||||
* This tool requests configuration info from a multicast router
|
||||
|
@ -67,7 +67,7 @@
|
|||
static char rcsid[] =
|
||||
"@(#) Header: mrinfo.c,v 1.6 93/04/08 15:14:16 van Exp (LBL)";
|
||||
#else
|
||||
__RCSID("$NetBSD: mrinfo.c,v 1.5 1997/10/17 11:18:10 lukem Exp $");
|
||||
__RCSID("$NetBSD: mrinfo.c,v 1.6 1998/05/09 17:22:08 kleink Exp $");
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
@ -167,10 +167,8 @@ log(severity, syserr, format, va_alist)
|
|||
vfprintf(stderr, fmt, ap);
|
||||
if (syserr == 0)
|
||||
fprintf(stderr, "\n");
|
||||
else if (syserr < sys_nerr)
|
||||
fprintf(stderr, ": %s\n", sys_errlist[syserr]);
|
||||
else
|
||||
fprintf(stderr, ": errno %d\n", syserr);
|
||||
fprintf(stderr, ": %s\n", strerror(syserr));
|
||||
}
|
||||
|
||||
if (severity <= LOG_ERR)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: main.c,v 1.10 1998/03/30 02:33:23 mrg Exp $ */
|
||||
/* $NetBSD: main.c,v 1.11 1998/05/09 17:22:08 kleink Exp $ */
|
||||
|
||||
/*
|
||||
* The mrouted program is covered by the license in the accompanying file
|
||||
|
@ -33,7 +33,7 @@
|
|||
|
||||
#include <sys/cdefs.h>
|
||||
#ifndef lint
|
||||
__RCSID("@(#) $NetBSD: main.c,v 1.10 1998/03/30 02:33:23 mrg Exp $");
|
||||
__RCSID("@(#) $NetBSD: main.c,v 1.11 1998/05/09 17:22:08 kleink Exp $");
|
||||
#endif
|
||||
|
||||
extern char *configfilename;
|
||||
|
@ -713,10 +713,8 @@ log(severity, syserr, format, va_alist)
|
|||
fprintf(stderr, "%s", msg);
|
||||
if (syserr == 0)
|
||||
fprintf(stderr, "\n");
|
||||
else if (syserr < sys_nerr)
|
||||
fprintf(stderr, ": %s\n", sys_errlist[syserr]);
|
||||
else
|
||||
fprintf(stderr, ": errno %d\n", syserr);
|
||||
fprintf(stderr, ": %s\n", strerror(syserr));
|
||||
}
|
||||
|
||||
if (severity <= LOG_NOTICE) {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: mtrace.c,v 1.8 1997/10/17 11:25:37 lukem Exp $ */
|
||||
/* $NetBSD: mtrace.c,v 1.9 1998/05/09 17:22:09 kleink Exp $ */
|
||||
|
||||
/*
|
||||
* mtrace.c
|
||||
|
@ -52,7 +52,7 @@
|
|||
|
||||
#include <sys/cdefs.h>
|
||||
#ifndef lint
|
||||
__RCSID("$NetBSD: mtrace.c,v 1.8 1997/10/17 11:25:37 lukem Exp $");
|
||||
__RCSID("$NetBSD: mtrace.c,v 1.9 1998/05/09 17:22:09 kleink Exp $");
|
||||
#endif
|
||||
|
||||
#include <sys/types.h>
|
||||
|
@ -1720,10 +1720,8 @@ log(severity, syserr, format, va_alist)
|
|||
vfprintf(stderr, fmt, ap);
|
||||
if (syserr == 0)
|
||||
fprintf(stderr, "\n");
|
||||
else if(syserr < sys_nerr)
|
||||
fprintf(stderr, ": %s\n", sys_errlist[syserr]);
|
||||
else
|
||||
fprintf(stderr, ": errno %d\n", syserr);
|
||||
fprintf(stderr, ": %s\n", strerror(syserr));
|
||||
}
|
||||
if (severity <= LOG_ERR) exit(-1);
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: percent_m.c,v 1.2 1997/10/11 21:41:40 christos Exp $ */
|
||||
/* $NetBSD: percent_m.c,v 1.3 1998/05/09 17:22:09 kleink Exp $ */
|
||||
|
||||
/*
|
||||
* Replace %m by system error message.
|
||||
|
@ -11,7 +11,7 @@
|
|||
#if 0
|
||||
static char sccsid[] = "@(#) percent_m.c 1.1 94/12/28 17:42:37";
|
||||
#else
|
||||
__RCSID("$NetBSD: percent_m.c,v 1.2 1997/10/11 21:41:40 christos Exp $");
|
||||
__RCSID("$NetBSD: percent_m.c,v 1.3 1998/05/09 17:22:09 kleink Exp $");
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
@ -37,11 +37,7 @@ const char *ibuf;
|
|||
|
||||
while ((*bp = *cp) != '\0')
|
||||
if (*cp == '%' && cp[1] == 'm') {
|
||||
if (errno < sys_nerr && errno > 0) {
|
||||
strcpy(bp, sys_errlist[errno]);
|
||||
} else {
|
||||
sprintf(bp, "Unknown error %d", errno);
|
||||
}
|
||||
strcpy(bp, strerror(errno));
|
||||
bp += strlen(bp);
|
||||
cp += 2;
|
||||
} else {
|
||||
|
|
Loading…
Reference in New Issue