changed error() to use varargs/vfprintf()

CVS patchset: 33
CVS date: 1995/12/13 21:40:59

diff --git a/lib/rpmerr.c b/lib/rpmerr.c
index f5c2cf2..17c2222 100644 (file)
--- a/lib/rpmerr.c
+++ b/lib/rpmerr.c
@@ -1,8 +1,14 @@
+#include <stdarg.h>
 #include <stdio.h>
 
 #include "rpmerr.h"
 
-void error(int code, ...)
+void error(int code, char *format, ...)
 {
-    fprintf(stderr, "error, error, error %d\n", code);
+    va_list args;
+
+    va_start(args, format);
+
+    fprintf(stderr, "ERROR(%d): ", code);
+    vfprintf(stdout, format, args);
 }

diff --git a/rpmio/rpmerr.c b/rpmio/rpmerr.c
index f5c2cf2..17c2222 100644 (file)
--- a/rpmio/rpmerr.c
+++ b/rpmio/rpmerr.c
@@ -1,8 +1,14 @@
+#include <stdarg.h>
 #include <stdio.h>
 
 #include "rpmerr.h"
 
-void error(int code, ...)
+void error(int code, char *format, ...)
 {
-    fprintf(stderr, "error, error, error %d\n", code);
+    va_list args;
+
+    va_start(args, format);
+
+    fprintf(stderr, "ERROR(%d): ", code);
+    vfprintf(stdout, format, args);
 }