summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2023-01-13 16:30:43 +0000
committerLaurent Bercot <ska@appnovation.com>2023-01-13 16:30:43 +0000
commit3e1bbd5d33826c5d7807a051ee22db3452ee4b21 (patch)
tree88203cada2c4baf77cb500b1625d37b12f4ba68f /src
parentee2aeefa170b9806e719723f94ba933c90a9ae8b (diff)
downloadskalibs-3e1bbd5d33826c5d7807a051ee22db3452ee4b21.tar.xz
Remove stdarg functions from strerr, everything is __VA_ARGS__ now
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'src')
-rw-r--r--src/include/skalibs/strerr.h5
-rw-r--r--src/libstddjb/strerr_diel.c24
-rw-r--r--src/libstddjb/strerr_dielsys.c23
-rw-r--r--src/libstddjb/strerr_warnl.c22
-rw-r--r--src/libstddjb/strerr_warnlsys.c22
5 files changed, 0 insertions, 96 deletions
diff --git a/src/include/skalibs/strerr.h b/src/include/skalibs/strerr.h
index 8cff167..d2b7492 100644
--- a/src/include/skalibs/strerr.h
+++ b/src/include/skalibs/strerr.h
@@ -10,11 +10,6 @@ extern void strerr_warnvsys (char const *const *, unsigned int) ;
extern void strerr_diev (int, char const *const *, unsigned int) gccattr_noreturn ;
extern void strerr_dievsys(int, char const *const *, unsigned int) gccattr_noreturn ;
-extern void strerr_warnl (unsigned int, ...) ;
-extern void strerr_warnlsys (unsigned int, ...) ;
-extern void strerr_diel (int, unsigned int, ...) gccattr_noreturn ;
-extern void strerr_dielsys (int, unsigned int, ...) gccattr_noreturn ;
-
#define strerr_array(...) ((char const *const[]){__VA_ARGS__})
#define strerr_warnn(n, ...) strerr_warnv(strerr_array(__VA_ARGS__), (n))
#define strerr_warnnsys(n, ...) strerr_warnvsys(strerr_array(__VA_ARGS__), (n))
diff --git a/src/libstddjb/strerr_diel.c b/src/libstddjb/strerr_diel.c
deleted file mode 100644
index d142402..0000000
--- a/src/libstddjb/strerr_diel.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* ISC license. */
-
-/* MT-unsafe */
-
-#include <stdarg.h>
-#include <unistd.h>
-
-#include <skalibs/strerr.h>
-
-void strerr_diel (int e, unsigned int n, ...)
-{
- if (n)
- {
- va_list ap ;
- char const *v[n] ;
- va_start(ap, n) ;
- va_arg(ap, unsigned int) ;
- for (unsigned int i = 0 ; i < n ; i++)
- v[i++] = va_arg(ap, char const *) ;
- va_end(ap) ;
- strerr_warnv(v, n) ;
- }
- _exit(e) ;
-}
diff --git a/src/libstddjb/strerr_dielsys.c b/src/libstddjb/strerr_dielsys.c
deleted file mode 100644
index 5c0e334..0000000
--- a/src/libstddjb/strerr_dielsys.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* ISC license. */
-
-/* MT-unsafe */
-
-#include <stdarg.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include <skalibs/strerr.h>
-
-void strerr_dielsys (int e, unsigned int n, ...)
-{
- va_list ap ;
- char const *v[n+1] ;
- va_start(ap, n) ;
- va_arg(ap, unsigned int) ;
- for (unsigned int i = 0 ; i < n ; i++)
- v[i++] = va_arg(ap, char const *) ;
- va_end(ap) ;
- v[n] = strerror(errno) ;
- strerr_diev(e, v, n+1) ;
-}
diff --git a/src/libstddjb/strerr_warnl.c b/src/libstddjb/strerr_warnl.c
deleted file mode 100644
index 17c370d..0000000
--- a/src/libstddjb/strerr_warnl.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* ISC license. */
-
-/* MT-unsafe */
-
-#include <stdarg.h>
-
-#include <skalibs/strerr.h>
-
-void strerr_warnl (unsigned int n, ...)
-{
- if (n)
- {
- va_list ap ;
- char const *v[n] ;
- va_start(ap, n) ;
- va_arg(ap, unsigned int) ;
- for (unsigned int i = 0 ; i < n ; i++)
- v[i++] = va_arg(ap, char const *) ;
- va_end(ap) ;
- strerr_warnv(v, n) ;
- }
-}
diff --git a/src/libstddjb/strerr_warnlsys.c b/src/libstddjb/strerr_warnlsys.c
deleted file mode 100644
index fbd7a6b..0000000
--- a/src/libstddjb/strerr_warnlsys.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* ISC license. */
-
-/* MT-unsafe */
-
-#include <stdarg.h>
-#include <string.h>
-#include <errno.h>
-
-#include <skalibs/strerr.h>
-
-void strerr_warnlsys (unsigned int n, ...)
-{
- va_list ap ;
- char const *v[n+1] ;
- va_start(ap, n) ;
- va_arg(ap, unsigned int) ;
- for (unsigned int i = 0 ; i < n ; i++)
- v[i++] = va_arg(ap, char const *) ;
- va_end(ap) ;
- v[n] = strerror(errno) ;
- strerr_warnv(v, n+1) ;
-}