From: Karel Zak <kzak@redhat.com>
Date: Mon, 15 Oct 2007 13:08:31 +0000 (+0200)
Subject: build-sys: remove errs.h
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5f671113b0b66bf4dda6a8a3b1231e2b534682f;p=util-linux

build-sys: remove errs.h

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/include/Makefile.am b/include/Makefile.am
index 153c45ee..e45ce398 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,4 +1,4 @@
 include $(top_srcdir)/config/include-Makefile.am
 
-dist_noinst_HEADERS = carefulputc.h env.h errs.h linux_reboot.h md5.h \
+dist_noinst_HEADERS = carefulputc.h env.h linux_reboot.h md5.h \
 	nls.h pathnames.h setproctitle.h widechar.h xstrncpy.h
diff --git a/include/errs.h b/include/errs.h
deleted file mode 100644
index bc0f6944..00000000
--- a/include/errs.h
+++ /dev/null
@@ -1,125 +0,0 @@
-#ifndef _ERR_H_
-#define	_ERR_H_
-
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-
-
-#ifdef HAVE___PROGNAME
-extern char *__progname;		/* Program name, from crt0. */
-#else
-char *__progname = "foo";		/* probably libc4 */
-#endif
-
-/* Some compilers complain "null format string" upon err(1,NULL) */
-/* Make them happy with a separate routine. */
-static inline void err_nomsg(int exitval) {
-	(void)fprintf(stderr, "%s: %s\n", __progname, strerror(errno));
-	exit(exitval);
-}
-
-static inline void verr(int exitval, const char *fmt, va_list ap) {
-	int sverrno;
-
-	sverrno = errno;
-	(void)fprintf(stderr, "%s: ", __progname);
-	if (fmt != NULL && *fmt != 0) {
-		(void)vfprintf(stderr, fmt, ap);
-		(void)fprintf(stderr, ": ");
-	}
-	(void)fprintf(stderr, "%s\n", strerror(sverrno));
-	exit(exitval);
-}
-
-static inline void err(int exitval, const char *fmt, ...) {
-	va_list ap;
-	va_start(ap, fmt);
-	verr(exitval, fmt, ap);
-	va_end(ap);
-}
-
-static inline void verrx(int exitval, const char *fmt, va_list ap) {
-	(void)fprintf(stderr, "%s: ", __progname);
-	if (fmt != NULL)
-		(void)vfprintf(stderr, fmt, ap);
-	(void)fprintf(stderr, "\n");
-	exit(exitval);
-}
-
-static inline void errx(int exitval, const char *fmt, ...) {
-	va_list ap;
-	va_start(ap, fmt);
-	verrx(exitval, fmt, ap);
-	va_end(ap);
-}
-
-static inline void vwarn(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));
-}
-
-static inline void warn(const char *fmt, ...) {
-	va_list ap;
-	va_start(ap, fmt);
-	vwarn(fmt, ap);
-	va_end(ap);
-}
-
-static inline void vwarnx(const char *fmt, va_list ap) {
-	(void)fprintf(stderr, "%s: ", __progname);
-	if (fmt != NULL)
-		(void)vfprintf(stderr, fmt, ap);
-	(void)fprintf(stderr, "\n");
-}
-
-static inline void warnx(const char *fmt, ...) {
-	va_list ap;
-	va_start(ap, fmt);
-	vwarnx(fmt, ap);
-	va_end(ap);
-}
-
-#endif /* !_ERR_H_ */