mirror of
https://github.com/sheumann/hush.git
synced 2024-08-20 04:28:57 +00:00
v[hp]error_msg have 2-3 callsites only -> incorporate there.
This commit is contained in:
parent
bb23c06919
commit
ab9c44b1a4
@ -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 */
|
||||
|
@ -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
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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();
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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();
|
||||
}
|
||||
|
@ -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));
|
||||
}
|
@ -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));
|
||||
}
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user