Index: branches/JrCs/i386/libsaio/console.c
===================================================================
--- branches/JrCs/i386/libsaio/console.c	(revision 92)
+++ branches/JrCs/i386/libsaio/console.c	(revision 93)
@@ -107,46 +107,31 @@
     return 0;
 }
 
-int verbose(const char * fmt, ...)
-{
-    va_list ap;
-    
-    if (gVerboseMode)
-    {
-		va_start(ap, fmt);
-		if (bootArgs->Video.v_display == VGA_TEXT_MODE)
-			prf(fmt, ap, putchar, 0);
-		else
-			vprf(fmt, ap);
-        va_end(ap);
-    }
-    return(0);
-}
-
 int error(const char * fmt, ...)
 {
     va_list ap;
-    gErrors = YES;
+
     va_start(ap, fmt);
-	if (bootArgs->Video.v_display == VGA_TEXT_MODE)
-		prf(fmt, ap, putchar, 0);
-    else
-		vprf(fmt, ap);
-	va_end(ap);
+
+    gErrors = YES;
+    printf(fmt,ap);
+
+    va_end(ap);
+
     return(0);
 }
 
 void stop(const char * fmt, ...)
 {
     va_list ap;
-	
-    printf("\n");
+
     va_start(ap, fmt);
-	if (bootArgs->Video.v_display == VGA_TEXT_MODE)
-		prf(fmt, ap, putchar, 0);
-    else
-		vprf(fmt, ap);
-	va_end(ap);
+
     printf("\n");
+    printf(fmt,ap);
+    printf("\n");
+
+    va_end(ap);
+
     halt();
 }
Index: branches/JrCs/i386/libsaio/saio_internal.h
===================================================================
--- branches/JrCs/i386/libsaio/saio_internal.h	(revision 92)
+++ branches/JrCs/i386/libsaio/saio_internal.h	(revision 93)
@@ -91,8 +91,8 @@
 extern void   putchar(int ch);
 extern int    getchar(void);
 extern int    printf(const char *format, ...);
+#define verbose(...) if (gVerboseMode) printf(__VA_ARGS__)
 extern int    error(const char *format, ...);
-extern int    verbose(const char *format, ...);
 extern void   stop(const char *format, ...);
 
 /* disk.c */