v[hp]error_msg have 2-3 callsites only -> incorporate there.

diff --git a/include/libbb.h b/include/libbb.h
index d60b410ae055e0181c8c7bb93b0854d8eee811b4..6c6bec71ebd7b7660c74a3602a0a47720db78eef 100644 (file)
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -649,15 +649,12 @@ extern void bb_error_msg(const char *s, ...) __attribute__ ((format (printf, 1,
 extern void bb_error_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2)));
 extern void bb_perror_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
 extern void bb_perror_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2)));
-extern void bb_vherror_msg(const char *s, va_list p);
 extern void bb_herror_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
 extern void bb_herror_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2)));
 extern void bb_perror_nomsg_and_die(void) ATTRIBUTE_NORETURN;
 extern void bb_perror_nomsg(void);
 extern void bb_info_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
-/* These are used internally -- you shouldn't need to use them */
 extern void bb_verror_msg(const char *s, va_list p, const char *strerr);
-extern void bb_vperror_msg(const char *s, va_list p);
 
 
 /* applets which are useful from another applets */

diff --git a/libbb/Kbuild b/libbb/Kbuild
index 3ffda1240683b89f96559d9edacd042f123b2f11..1800bde8ff99e790eef50ee54005435d6fd36f91 100644 (file)
--- a/libbb/Kbuild
+++ b/libbb/Kbuild
@@ -87,8 +87,6 @@ lib-y += uuencode.o
 lib-y += vdprintf.o
 lib-y += verror_msg.o
 lib-y += vfork_daemon_rexec.o
-lib-y += vherror_msg.o
-lib-y += vperror_msg.o
 lib-y += warn_ignoring_args.o
 lib-y += wfopen.o
 lib-y += wfopen_input.o

diff --git a/libbb/herror_msg.c b/libbb/herror_msg.c
index 943702c68d4dd2b527f86d16186e85704edfb879..264690ba0a9a8bcaf12ef5b1e52b270bc27ac875 100644 (file)
--- a/libbb/herror_msg.c
+++ b/libbb/herror_msg.c
@@ -14,6 +14,6 @@ void bb_herror_msg(const char *s, ...)
        va_list p;
 
        va_start(p, s);
-       bb_vherror_msg(s, p);
+       bb_verror_msg(s, p, hstrerror(h_errno));
        va_end(p);
 }

diff --git a/libbb/herror_msg_and_die.c b/libbb/herror_msg_and_die.c
index 8c77378d718b02804fd8b751da4e37c3e104d25a..894c80f389ffb6ff710c4a12053c429544b80231 100644 (file)
--- a/libbb/herror_msg_and_die.c
+++ b/libbb/herror_msg_and_die.c
@@ -14,7 +14,7 @@ void bb_herror_msg_and_die(const char *s, ...)
        va_list p;
 
        va_start(p, s);
-       bb_vherror_msg(s, p);
+       bb_verror_msg(s, p, hstrerror(h_errno));
        va_end(p);
        xfunc_die();
 }

diff --git a/libbb/perror_msg.c b/libbb/perror_msg.c
index 2ec1a9b2acd3efeb05661897c0b51fbea67fe9ef..a958cff006587b28419c73667e91f6e62a59f819 100644 (file)
--- a/libbb/perror_msg.c
+++ b/libbb/perror_msg.c
@@ -15,9 +15,6 @@ void bb_perror_msg(const char *s, ...)
 
        va_start(p, s);
        /* Guard against "<error message>: Success" */
-       if (!errno)
-               bb_verror_msg(s, p, NULL);
-       else
-               bb_vperror_msg(s, p);
+       bb_verror_msg(s, p, errno ? strerror(errno) : NULL);
        va_end(p);
 }

diff --git a/libbb/perror_msg_and_die.c b/libbb/perror_msg_and_die.c
index 90f56e04cdf96151615e79e4a18001bb5b3681df..15f46fc05121bcc54f3f1f493adf19f1ebafed25 100644 (file)
--- a/libbb/perror_msg_and_die.c
+++ b/libbb/perror_msg_and_die.c
@@ -15,10 +15,7 @@ void bb_perror_msg_and_die(const char *s, ...)
 
        va_start(p, s);
        /* Guard against "<error message>: Success" */
-       if (!errno)
-               bb_verror_msg(s, p, NULL);
-       else
-               bb_vperror_msg(s, p);
+       bb_verror_msg(s, p, errno ? strerror(errno) : NULL);
        va_end(p);
        xfunc_die();
 }

diff --git a/libbb/vherror_msg.c b/libbb/vherror_msg.c
deleted file mode 100644 (file)
index 04446a0..0000000
--- a/libbb/vherror_msg.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Utility routines.
- *
- * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
- *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- */
-
-#include "libbb.h"
-
-void bb_vherror_msg(const char *s, va_list p)
-{
-       bb_verror_msg(s, p, hstrerror(h_errno));
-}

diff --git a/libbb/vperror_msg.c b/libbb/vperror_msg.c
deleted file mode 100644 (file)
index c3f79c2..0000000
--- a/libbb/vperror_msg.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Utility routines.
- *
- * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
- *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- */
-
-#include "libbb.h"
-
-void bb_vperror_msg(const char *s, va_list p)
-{
-       bb_verror_msg(s, p, strerror(errno));
-}

diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 4e17c28bd8bfdc02f7b566eb4c191834d62ab194..64061e4f0c666dbe8ad25a907a7a2d0dd19539af 100644 (file)
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -648,7 +648,7 @@ void ioctl_or_perror_and_die(int fd, int request, void *argp, const char *fmt,..
 
        if (ioctl(fd, request, argp) < 0) {
                va_start(p, fmt);
-               bb_vperror_msg(fmt, p);
+               bb_verror_msg(fmt, p, strerror(errno));
                /* xfunc_die can actually longjmp, so be nice */
                va_end(p);
                xfunc_die();
@@ -662,7 +662,7 @@ int ioctl_or_perror(int fd, int request, void *argp, const char *fmt,...)
 
        if (ret < 0) {
                va_start(p, fmt);
-               bb_vperror_msg(fmt, p);
+               bb_verror_msg(fmt, p, strerror(errno));
                va_end(p);
        }
        return ret;