Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

re-order things the way they'd like to be ordered

Browse Source
This commit is contained in:
cgd 1995-02-25 17:19:26 +00:00
parent 714c54bd02
commit 516f67f7c9
1 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
lib/libc/gen/err.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: err.c,v 1.11 1995/02/25 13:41:01 cgd Exp $ */
/* $NetBSD: err.c,v 1.12 1995/02/25 17:19:26 cgd Exp $ */
/*-
* Copyright (c) 1993
@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 6/4/93";
#else
static char rcsid[] = "$NetBSD: err.c,v 1.11 1995/02/25 13:41:01 cgd Exp $";
static char rcsid[] = "$NetBSD: err.c,v 1.12 1995/02/25 17:19:26 cgd Exp $";
#endif
#endif /* LIBC_SCCS and not lint */
@ -55,6 +55,24 @@ static char rcsid[] = "$NetBSD: err.c,v 1.11 1995/02/25 13:41:01 cgd Exp $";
extern char *__progname; /* Program name, from crt0. */
__dead void
_verr(eval, fmt, ap)
int eval;
const char *fmt;
va_list ap;
{
int sverrno;
sverrno = errno;
(void)fprintf(stderr, "%s: ", __progname);
if (fmt != NULL) {
(void)vfprintf(stderr, fmt, ap);
(void)fprintf(stderr, ": ");
}
(void)fprintf(stderr, "%s\n", strerror(sverrno));
exit(eval);
}
__dead void
#ifdef __STDC__
_err(int eval, const char *fmt, ...)
@ -79,20 +97,15 @@ _err(va_alist)
}
__dead void
_verr(eval, fmt, ap)
_verrx(eval, fmt, ap)
int eval;
const char *fmt;
va_list ap;
{
int sverrno;
sverrno = errno;
(void)fprintf(stderr, "%s: ", __progname);
if (fmt != NULL) {
if (fmt != NULL)
(void)vfprintf(stderr, fmt, ap);
(void)fprintf(stderr, ": ");
}
(void)fprintf(stderr, "%s\n", strerror(sverrno));
(void)fprintf(stderr, "\n");
exit(eval);
}
@ -119,19 +132,22 @@ _errx(va_alist)
va_end(ap);
}
__dead void
_verrx(eval, fmt, ap)
int eval;
void
_vwarn(fmt, ap)
const char *fmt;
va_list ap;
{
(void)fprintf(stderr, "%s: ", __progname);
if (fmt != NULL)
(void)vfprintf(stderr, fmt, ap);
(void)fprintf(stderr, "\n");
exit(eval);
}
int sverrno;
sverrno = errno;
(void)fprintf(stderr, "%s: ", __progname);
if (fmt != NULL) {
(void)vfprintf(stderr, fmt, ap);
(void)fprintf(stderr, ": ");
}
(void)fprintf(stderr, "%s\n", strerror(sverrno));
}
void
#if __STDC__
@ -155,19 +171,14 @@ _warn(va_alist)
}
void
_vwarn(fmt, ap)
_vwarnx(fmt, ap)
const char *fmt;
va_list ap;
{
int sverrno;
sverrno = errno;
(void)fprintf(stderr, "%s: ", __progname);
if (fmt != NULL) {
if (fmt != NULL)
(void)vfprintf(stderr, fmt, ap);
(void)fprintf(stderr, ": ");
}
(void)fprintf(stderr, "%s\n", strerror(sverrno));
(void)fprintf(stderr, "\n");
}
void
@ -190,14 +201,3 @@ _warnx(va_alist)
_vwarnx(fmt, ap);
va_end(ap);
}
void
_vwarnx(fmt, ap)
const char *fmt;
va_list ap;
{
(void)fprintf(stderr, "%s: ", __progname);
if (fmt != NULL)
(void)vfprintf(stderr, fmt, ap);
(void)fprintf(stderr, "\n");
}