aboutsummaryrefslogtreecommitdiff
path: root/lib/errors
diff options
context:
space:
mode:
authorThomas Voss <mail@thomasvoss.com> 2024-04-14 23:36:09 +0200
committerThomas Voss <mail@thomasvoss.com> 2024-04-14 23:36:09 +0200
commit16fb7bf070a0a49b81026e2bb4b4d208fcd69c95 (patch)
tree386ecf322a9ece85b242680c2fba7a1665d91a82 /lib/errors
parentfa481efe8e777bae2c2cca3649176d1ac7da6413 (diff)
Vastly simplify the errors.h interface
Diffstat (limited to 'lib/errors')
-rw-r--r--lib/errors/cerrx.c14
-rw-r--r--lib/errors/errx.c14
-rw-r--r--lib/errors/vwarn.c4
-rw-r--r--lib/errors/vwarnx.c12
-rw-r--r--lib/errors/warnx.c12
5 files changed, 3 insertions, 53 deletions
diff --git a/lib/errors/cerrx.c b/lib/errors/cerrx.c
deleted file mode 100644
index b614f47..0000000
--- a/lib/errors/cerrx.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <stdarg.h>
-#include <stdlib.h>
-
-#include "errors.h"
-
-void
-cerrx(int code, const char *fmt, ...)
-{
- va_list ap;
- va_start(ap, fmt);
- vwarnx(fmt, ap);
- va_end(ap);
- exit(code);
-}
diff --git a/lib/errors/errx.c b/lib/errors/errx.c
deleted file mode 100644
index 1fd55af..0000000
--- a/lib/errors/errx.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <stdarg.h>
-#include <stdlib.h>
-
-#include "errors.h"
-
-void
-errx(const char *fmt, ...)
-{
- va_list ap;
- va_start(ap, fmt);
- vwarnx(fmt, ap);
- va_end(ap);
- exit(EXIT_FAILURE);
-}
diff --git a/lib/errors/vwarn.c b/lib/errors/vwarn.c
index 99b2c9b..342c391 100644
--- a/lib/errors/vwarn.c
+++ b/lib/errors/vwarn.c
@@ -11,5 +11,7 @@ vwarn(const char *fmt, va_list ap)
int save = errno;
fprintf(stderr, "%s: ", mlib_progname());
vfprintf(stderr, fmt, ap);
- fprintf(stderr, ": %s\n", strerror(save));
+ if (fmt[strlen(fmt) - 1] == ':')
+ fprintf(stderr, " %s", strerror(save));
+ fputc('\n', stderr);
}
diff --git a/lib/errors/vwarnx.c b/lib/errors/vwarnx.c
deleted file mode 100644
index 58a7bc6..0000000
--- a/lib/errors/vwarnx.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "errors.h"
-
-void
-vwarnx(const char *fmt, va_list ap)
-{
- fprintf(stderr, "%s: ", mlib_progname());
- vfprintf(stderr, fmt, ap);
- fputc('\n', stderr);
-}
diff --git a/lib/errors/warnx.c b/lib/errors/warnx.c
deleted file mode 100644
index ea50299..0000000
--- a/lib/errors/warnx.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-
-#include "errors.h"
-
-void
-warnx(const char *fmt, ...)
-{
- va_list ap;
- va_start(ap, fmt);
- vwarnx(fmt, ap);
- va_end(ap);
-}