--- a/src/error.cc	Thu Feb 22 07:03:51 2007 +0000
+++ b/src/error.cc	Thu Feb 22 07:07:20 2007 +0000
@@ -286,20 +286,33 @@
 }
 
 void
+vmessage (const char *name, const char *fmt, va_list args)
+{
+  verror (false, std::cerr, name, "", fmt, args);
+}
+
+void
 message (const char *name, const char *fmt, ...)
 {
   va_list args;
   va_start (args, fmt);
-  verror (false, std::cerr, name, "", fmt, args);
+  vmessage (name, fmt, args);
   va_end (args);
 }
 
 void
+vmessage_with_id (const char *name, const char *id, const char *fmt,
+		  va_list args)
+{
+  verror (false, std::cerr, name, id, fmt, args);
+}
+
+void
 message_with_id (const char *name, const char *id, const char *fmt, ...)
 {
   va_list args;
   va_start (args, fmt);
-  verror (false, std::cerr, name, id, fmt, args);
+  vmessage_with_id (name, id, fmt, args);
   va_end (args);
 }
 
@@ -311,20 +324,32 @@
 }
 
 void
+vusage (const char *fmt, va_list args)
+{
+  usage_1 ("", fmt, args);
+}
+
+void
 usage (const char *fmt, ...)
 {
   va_list args;
   va_start (args, fmt);
-  usage_1 ("", fmt, args);
+  vusage (fmt, args);
   va_end (args);
 }
 
 void
+vusage_with_id (const char *id, const char *fmt, va_list args)
+{
+  usage_1 (id, fmt, args);
+}
+
+void
 usage_with_id (const char *id, const char *fmt, ...)
 {
   va_list args;
   va_start (args, fmt);
-  usage_1 (id, fmt, args);
+  vusage_with_id (id, fmt, args);
   va_end (args);
 }
 
@@ -454,20 +479,32 @@
 }
 
 void
+verror (const char *fmt, va_list args)
+{
+  error_2 ("", fmt, args);
+}
+
+void
 error (const char *fmt, ...)
 {
   va_list args;
   va_start (args, fmt);
-  error_2 ("", fmt, args);
+  verror (fmt, args);
   va_end (args);
 }
 
 void
+verror_with_id (const char *id, const char *fmt, va_list args)
+{
+  error_2 (id, fmt, args);
+}
+
+void
 error_with_id (const char *id, const char *fmt, ...)
 {
   va_list args;
   va_start (args, fmt);
-  error_2 (id, fmt, args);
+  verror_with_id (id, fmt, args);
   va_end (args);
 }
 
@@ -595,38 +632,62 @@
 }
 
 void
+vwarning (const char *fmt, va_list args)
+{
+  warning_1 ("", fmt, args);
+}
+
+void
 warning (const char *fmt, ...)
 {
   va_list args;
   va_start (args, fmt);
-  warning_1 ("", fmt, args);
+  vwarning (fmt, args);
   va_end (args);
 }
 
 void
+vwarning_with_id (const char *id, const char *fmt, va_list args)
+{
+  warning_1 (id, fmt, args);
+}
+
+void
 warning_with_id (const char *id, const char *fmt, ...)
 {
   va_list args;
   va_start (args, fmt);
-  warning_1 (id, fmt, args);
+  vwarning_with_id (id, fmt, args);
   va_end (args);
 }
 
 void
+vparse_error (const char *fmt, va_list args)
+{
+  error_1 (std::cerr, 0, "", fmt, args);
+}
+
+void
 parse_error (const char *fmt, ...)
 {
   va_list args;
   va_start (args, fmt);
-  error_1 (std::cerr, 0, "", fmt, args);
+  vparse_error (fmt, args);
   va_end (args);
 }
 
 void
+vparse_error_with_id (const char *id, const char *fmt, va_list args)
+{
+  error_1 (std::cerr, 0, id, fmt, args);
+}
+
+void
 parse_error_with_id (const char *id, const char *fmt, ...)
 {
   va_list args;
   va_start (args, fmt);
-  error_1 (std::cerr, 0, id, fmt, args);
+  vparse_error_with_id (id, fmt, args);
   va_end (args);
 }