mergetool: Add prompt to continue after failing to merge a file

diff --git a/usage.c b/usage.c
index 4dc5c77633747e0c2b3a4d04fddbd043f8f49e1e..24f5fc00c2501c1a1cc317f0b74b458ea50c8b0e 100644 (file)
--- a/usage.c
+++ b/usage.c
@@ -7,9 +7,9 @@
 
 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);
@@ -86,7 +70,7 @@ int error(const char *err, ...)
        return -1;
 }
 
-void warn(const char *warn, ...)
+void warning(const char *warn, ...)
 {
        va_list params;