[master] ef377655f Merge verrno into vas, it's too trivial.

[Poul-Henning Kamp]

commit ef377655f0fa4c476fefcc40e5ec6aec0a104c03
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Oct 7 22:54:15 2020 +0000

    Merge verrno into vas, it's too trivial.

diff --git a/include/Makefile.am b/include/Makefile.am
index 78ff414f2..869ac7684 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -65,7 +65,6 @@ nobase_pkginclude_HEADERS += \
 	vbm.h \
 	vcl.h \
 	vcs.h \
-	verrno.h \
 	vmod_abi.h \
 	vqueue.h \
 	vre.h \
diff --git a/include/vas.h b/include/vas.h
index a73b6d927..90fac3482 100644
--- a/include/vas.h
+++ b/include/vas.h
@@ -40,7 +40,10 @@
 #ifndef VAS_H_INCLUDED
 #define VAS_H_INCLUDED
 
-#include "verrno.h"
+
+#include <errno.h>
+
+const char * vstrerror(int e);
 
 enum vas_e {
 	VAS_WRONG,
diff --git a/include/verrno.h b/include/verrno.h
deleted file mode 100644
index f457aa2c7..000000000
--- a/include/verrno.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*-
- * Written by Nils Goroll based upon a draft by Poul-Henning Kamp
- *
- * This file is in the public domain.
- *
- * trivial strerror() wrapper never returning NULL
- */
-
-#include <errno.h>
-
-const char * vstrerror(int e);
diff --git a/lib/libvarnish/Makefile.am b/lib/libvarnish/Makefile.am
index 6fbdfcba5..9c0b8a643 100644
--- a/lib/libvarnish/Makefile.am
+++ b/lib/libvarnish/Makefile.am
@@ -22,7 +22,6 @@ libvarnish_la_SOURCES = \
 	vcli_serve.c \
 	vct.c \
 	venc.c \
-	verrno.c \
 	version.c \
 	vev.c \
 	vfil.c \
diff --git a/lib/libvarnish/vas.c b/lib/libvarnish/vas.c
index 13161bcea..392303fdd 100644
--- a/lib/libvarnish/vas.c
+++ b/lib/libvarnish/vas.c
@@ -41,6 +41,20 @@
 
 #include "vas.h"
 
+const char *
+vstrerror(int e)
+{
+	const char *p;
+	int oerrno = errno;
+
+	p = strerror(e);
+	if (p != NULL)
+		return (p);
+
+	errno = oerrno;
+	return ("strerror(3) returned NULL");
+}
+
 vas_f *VAS_Fail_Func v_noreturn_;
 
 void v_noreturn_
diff --git a/lib/libvarnish/verrno.c b/lib/libvarnish/verrno.c
deleted file mode 100644
index 924010215..000000000
--- a/lib/libvarnish/verrno.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*-
- * Written by Nils Goroll based upon a draft by Poul-Henning Kamp
- *
- * This file is in the public domain.
- *
- * trivial strerror() wrapper never returning NULL
- */
-
-#include "config.h"
-
-#include <string.h>
-
-#include "verrno.h"
-
-const char *
-vstrerror(int e)
-{
-	const char *p;
-	int oerrno = errno;
-
-	p = strerror(e);
-	if (p != NULL)
-		return (p);
-
-	errno = oerrno;
-	return ("strerror(3) returned NULL");
-}