Merge branch 'lt/core-optim'

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