X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Ferror.c;h=7db8d18c790a89bdbed7d9406ba30a8607ee2da3;hp=42511c92438537fad53e0633b66da7ce8642e9f0;hb=714b5c530ece27ea2835a313013f5b770163403c;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4 diff --git a/sbr/error.c b/sbr/error.c index 42511c9..7db8d18 100644 --- a/sbr/error.c +++ b/sbr/error.c @@ -20,12 +20,12 @@ ** print out error message */ void -advise (char *what, char *fmt, ...) +advise(char *what, char *fmt, ...) { va_list ap; va_start(ap, fmt); - advertise (what, NULL, fmt, ap); + advertise(what, NULL, fmt, ap); va_end(ap); } @@ -34,14 +34,14 @@ advise (char *what, char *fmt, ...) ** print out error message and exit */ void -adios (char *what, char *fmt, ...) +adios(char *what, char *fmt, ...) { va_list ap; va_start(ap, fmt); - advertise (what, NULL, fmt, ap); + advertise(what, NULL, fmt, ap); va_end(ap); - done (1); + done(1); } @@ -49,12 +49,12 @@ adios (char *what, char *fmt, ...) ** admonish the user */ void -admonish (char *what, char *fmt, ...) +admonish(char *what, char *fmt, ...) { va_list ap; va_start(ap, fmt); - advertise (what, "continuing...", fmt, ap); + advertise(what, "continuing...", fmt, ap); va_end(ap); } @@ -68,7 +68,7 @@ admonish (char *what, char *fmt, ...) ** sexy syscall()... */ void -advertise (char *what, char *tail, char *fmt, va_list ap) +advertise(char *what, char *tail, char *fmt, va_list ap) { int eindex = errno; @@ -77,65 +77,65 @@ advertise (char *what, char *tail, char *fmt, va_list ap) struct iovec iob[20], *iov; #endif - fflush (stdout); + fflush(stdout); #ifdef HAVE_WRITEV - fflush (stderr); + fflush(stderr); iov = iob; if (invo_name && *invo_name) { - iov->iov_len = strlen (iov->iov_base = invo_name); + iov->iov_len = strlen(iov->iov_base = invo_name); iov++; - iov->iov_len = strlen (iov->iov_base = ": "); + iov->iov_len = strlen(iov->iov_base = ": "); iov++; } - vsnprintf (buffer, sizeof(buffer), fmt, ap); - iov->iov_len = strlen (iov->iov_base = buffer); + 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_len = strlen(iov->iov_base = " "); iov++; - iov->iov_len = strlen (iov->iov_base = what); + iov->iov_len = strlen(iov->iov_base = what); iov++; - iov->iov_len = strlen (iov->iov_base = ": "); + iov->iov_len = strlen(iov->iov_base = ": "); iov++; } - if (!(iov->iov_base = strerror (eindex))) { + 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); + snprintf(err, sizeof(err), "Error %d", eindex); iov->iov_base = err; } - iov->iov_len = strlen (iov->iov_base); + iov->iov_len = strlen(iov->iov_base); iov++; } if (tail && *tail) { - iov->iov_len = strlen (iov->iov_base = ", "); + iov->iov_len = strlen(iov->iov_base = ", "); iov++; - iov->iov_len = strlen (iov->iov_base = tail); + iov->iov_len = strlen(iov->iov_base = tail); iov++; } - iov->iov_len = strlen (iov->iov_base = "\n"); + iov->iov_len = strlen(iov->iov_base = "\n"); iov++; - writev (fileno (stderr), iob, iov - iob); + writev(fileno(stderr), iob, iov - iob); #else if (invo_name && *invo_name) - fprintf (stderr, "%s: ", invo_name); - vfprintf (stderr, fmt, ap); + fprintf(stderr, "%s: ", invo_name); + vfprintf(stderr, fmt, ap); if (what) { char *s; if (*what) - fprintf (stderr, " %s: ", what); + fprintf(stderr, " %s: ", what); if ((s = strerror(eindex))) - fprintf (stderr, "%s", s); + fprintf(stderr, "%s", s); else - fprintf (stderr, "Error %d", eindex); + fprintf(stderr, "Error %d", eindex); } if (tail) - fprintf (stderr, ", %s", tail); - fputc ('\n', stderr); + fprintf(stderr, ", %s", tail); + fputc('\n', stderr); #endif }