X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/910f3846bb30636fe25bdc6e06e72d50c6779bd9..0815d3444144959a66b8fd8e97258158cabd07b5:/sbr/error.c?ds=inline

diff --git a/sbr/error.c b/sbr/error.c
index 41f031a5..fd74d270 100644
--- a/sbr/error.c
+++ b/sbr/error.c
@@ -2,17 +2,15 @@
 /*
  * error.c -- main error handling routines
  *
- * $Id$
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 #include <h/mh.h>
 
-#ifdef HAVE_WRITEV
-# include <sys/types.h>
-# include <sys/uio.h>
-#endif
-
-#include <errno.h>
+#include <sys/types.h>
+#include <sys/uio.h>
 
 
 /*
@@ -60,25 +58,16 @@ admonish (char *what, char *fmt, ...)
 
 /*
  * main routine for printing error messages.
- *
- * Use writev() if available, for slightly better performance.
- * Why?  Well, there are a couple of reasons.  Primarily, it
- * gives a smoother output...  More importantly though, it's a
- * sexy syscall()...
  */
 void
 advertise (char *what, char *tail, char *fmt, va_list ap)
 {
     int	eindex = errno;
-
-#ifdef HAVE_WRITEV
     char buffer[BUFSIZ], err[BUFSIZ];
     struct iovec iob[20], *iov;
-#endif
 
     fflush (stdout);
 
-#ifdef HAVE_WRITEV
     fflush (stderr);
     iov = iob;
 
@@ -118,23 +107,4 @@ advertise (char *what, char *tail, char *fmt, va_list ap)
     iov->iov_len = strlen (iov->iov_base = "\n");
     iov++;
     writev (fileno (stderr), iob, iov - iob);
-#else
-    if (invo_name && *invo_name)
-	fprintf (stderr, "%s: ", invo_name);
-    vfprintf (stderr, fmt, ap);
-
-    if (what) {
-	char *s;
-
-	if (*what)
-	    fprintf (stderr, " %s: ", what);
-	if ((s = strerror(eindex)))
-	    fprintf (stderr, "%s", s);
-	else
-	    fprintf (stderr, "Error %d", eindex);
-    }
-    if (tail)
-	fprintf (stderr, ", %s", tail);
-    fputc ('\n', stderr);
-#endif
 }