Rearranged whitespace (and comments) in all the code!

[mmh] / sbr / error.c

diff --git a/sbr/error.c b/sbr/error.c
index 6dc6995..1c15006 100644 (file)
--- a/sbr/error.c
+++ b/sbr/error.c
@@ -1,4 +1,3 @@
-

 /*
  * error.c -- main error handling routines
  *
 /*
  * error.c -- main error handling routines
  *

@@ -23,11 +22,11 @@
 void
 advise (char *what, char *fmt, ...)
 {
 void
 advise (char *what, char *fmt, ...)
 {

-    va_list ap;
+       va_list ap;

 
 

-    va_start(ap, fmt);
-    advertise (what, NULL, fmt, ap);
-    va_end(ap);
+       va_start(ap, fmt);
+       advertise (what, NULL, fmt, ap);
+       va_end(ap);

 }
 
 
 }
 
 

@@ -37,12 +36,12 @@ advise (char *what, char *fmt, ...)
 void
 adios (char *what, char *fmt, ...)
 {
 void
 adios (char *what, char *fmt, ...)
 {

-    va_list ap;
+       va_list ap;

 
 

-    va_start(ap, fmt);
-    advertise (what, NULL, fmt, ap);
-    va_end(ap);
-    done (1);
+       va_start(ap, fmt);
+       advertise (what, NULL, fmt, ap);
+       va_end(ap);
+       done (1);

 }
 
 
 }
 
 

@@ -52,11 +51,11 @@ adios (char *what, char *fmt, ...)
 void
 admonish (char *what, char *fmt, ...)
 {
 void
 admonish (char *what, char *fmt, ...)
 {

-    va_list ap;
+       va_list ap;

 
 

-    va_start(ap, fmt);
-    advertise (what, "continuing...", fmt, ap);
-    va_end(ap);
+       va_start(ap, fmt);
+       advertise (what, "continuing...", fmt, ap);
+       va_end(ap);

 }
 
 
 }
 
 

@@ -71,72 +70,72 @@ admonish (char *what, char *fmt, ...)
 void
 advertise (char *what, char *tail, char *fmt, va_list ap)
 {
 void
 advertise (char *what, char *tail, char *fmt, va_list ap)
 {

-    int        eindex = errno;
+       int  eindex = errno;

 
 #ifdef HAVE_WRITEV
 
 #ifdef HAVE_WRITEV

-    char buffer[BUFSIZ], err[BUFSIZ];
-    struct iovec iob[20], *iov;
+       char buffer[BUFSIZ], err[BUFSIZ];
+       struct iovec iob[20], *iov;

 #endif
 
 #endif
 

-    fflush (stdout);
+       fflush (stdout);

 
 #ifdef HAVE_WRITEV
 
 #ifdef HAVE_WRITEV

-    fflush (stderr);
-    iov = iob;
+       fflush (stderr);
+       iov = iob;
+
+       if (invo_name && *invo_name) {
+               iov->iov_len = strlen (iov->iov_base = invo_name);
+               iov++;
+               iov->iov_len = strlen (iov->iov_base = ": ");
+               iov++;
+       }

 
 

-    if (invo_name && *invo_name) {
-       iov->iov_len = strlen (iov->iov_base = invo_name);
-       iov++;
-       iov->iov_len = strlen (iov->iov_base = ": ");
+       vsnprintf (buffer, sizeof(buffer), fmt, ap);
+       iov->iov_len = strlen (iov->iov_base = buffer);

        iov++;
        iov++;

-    }
-    
-    vsnprintf (buffer, sizeof(buffer), fmt, ap);
-    iov->iov_len = strlen (iov->iov_base = buffer);
-    iov++;
-    if (what) {
-       if (*what) {
-           iov->iov_len = strlen (iov->iov_base = " ");
-           iov++;
-           iov->iov_len = strlen (iov->iov_base = what);
-           iov++;
-           iov->iov_len = strlen (iov->iov_base = ": ");
-           iov++;
+       if (what) {
+               if (*what) {
+                       iov->iov_len = strlen (iov->iov_base = " ");
+                       iov++;
+                       iov->iov_len = strlen (iov->iov_base = what);
+                       iov++;
+                       iov->iov_len = strlen (iov->iov_base = ": ");
+                       iov++;
+               }
+               if (!(iov->iov_base = strerror (eindex))) {
+                       /* this shouldn't happen, but we'll test for it just in case */
+                       snprintf (err, sizeof(err), "Error %d", eindex);
+                       iov->iov_base = err;
+               }
+               iov->iov_len = strlen (iov->iov_base);
+               iov++;

        }
        }

-        if (!(iov->iov_base = strerror (eindex))) {
-           /* this shouldn't happen, but we'll test for it just in case */
-           snprintf (err, sizeof(err), "Error %d", eindex);
-           iov->iov_base = err;
+       if (tail && *tail) {
+               iov->iov_len = strlen (iov->iov_base = ", ");
+               iov++;
+               iov->iov_len = strlen (iov->iov_base = tail);
+               iov++;

        }
        }

-       iov->iov_len = strlen (iov->iov_base);
+       iov->iov_len = strlen (iov->iov_base = "\n");

        iov++;
        iov++;

-    }
-    if (tail && *tail) {
-       iov->iov_len = strlen (iov->iov_base = ", ");
-       iov++;
-       iov->iov_len = strlen (iov->iov_base = tail);
-       iov++;
-    }
-    iov->iov_len = strlen (iov->iov_base = "\n");
-    iov++;
-    writev (fileno (stderr), iob, iov - iob);
+       writev (fileno (stderr), iob, iov - iob);

 #else
 #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);
+       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
 }
 #endif
 }