index f5e652cc76d7587fd7b682eb865d3436c99b16fb..24f5fc00c2501c1a1cc317f0b74b458ea50c8b0e 100644 (file)
--- a/usage.c
+++ b/usage.c
static void report(const char *prefix, const char *err, va_list params)
{
- fputs(prefix, stderr);
- vfprintf(stderr, err, params);
- fputs("\n", stderr);
+ char msg[256];
+ vsnprintf(msg, sizeof(msg), err, params);
+ fprintf(stderr, "%s%s\n", prefix, msg);
}
static NORETURN void usage_builtin(const char *err)
@@ -41,27 +41,11 @@ static void (*die_routine)(const char *err, va_list params) NORETURN = die_built
static void (*error_routine)(const char *err, va_list params) = error_builtin;
static void (*warn_routine)(const char *err, va_list params) = warn_builtin;
-void set_usage_routine(void (*routine)(const char *err) NORETURN)
-{
- usage_routine = routine;
-}
-
void set_die_routine(void (*routine)(const char *err, va_list params) NORETURN)
{
die_routine = routine;
}
-void set_error_routine(void (*routine)(const char *err, va_list params))
-{
- error_routine = routine;
-}
-
-void set_warn_routine(void (*routine)(const char *warn, va_list params))
-{
- warn_routine = routine;
-}
-
-
void usage(const char *err)
{
usage_routine(err);