add an explicit format string parameter to error() and errorf()

diff --git a/lib/ast/error.c b/lib/ast/error.c
index 983938255dcdd62c814f1a60ed8646e628823f08..6f3e9df9c8c622eecb19c844ce686112fef7f864 100644 (file)
--- a/lib/ast/error.c
+++ b/lib/ast/error.c
@@ -87,24 +87,20 @@ void errorv(const char *id, int level, const char *s, va_list ap)
        exit(level - ERROR_FATAL + 1);
 }
 
-void error(int level, ...)
+void error(int level, const char *s, ...)
 {
     va_list ap;
-    const char *s;
 
-    va_start(ap, level);
-    s = va_arg(ap, char *);
+    va_start(ap, s);
     errorv(NiL, level, s, ap);
     va_end(ap);
 }
 
-void errorf(void *handle, void *discipline, int level, ...)
+void errorf(void *handle, void *discipline, int level, const char *s, ...)
 {
     va_list ap;
-    const char *s;
 
-    va_start(ap, level);
-    s = va_arg(ap, char *);
+    va_start(ap, s);
     errorv((discipline
            && handle) ? *((char **) handle) : (char *) handle, level, s, ap);
     va_end(ap);

diff --git a/lib/ast/error.h b/lib/ast/error.h
index 47b0a681c92c7d6a8f8d87eef8f2dce6faf368e5..8de5b62cd6bf5b1657bea7aad8d09f607f4a0bbc 100644 (file)
--- a/lib/ast/error.h
+++ b/lib/ast/error.h
@@ -62,8 +62,8 @@ extern "C" {
     extern void setErrorErrors (int);
     extern int  getErrorErrors (void);
 
-    extern void error(int, ...);
-    extern void errorf(void *, void *, int, ...);
+    extern void error(int, const char *, ...);
+    extern void errorf(void *, void *, int, const char *, ...);
     extern void errorv(const char *, int, const char *, va_list);
 
 #endif