diff options
Diffstat (limited to 'src/print.c')
| -rw-r--r-- | src/print.c | 51 |
1 files changed, 7 insertions, 44 deletions
diff --git a/src/print.c b/src/print.c index 6f5659df..57c154e7 100644 --- a/src/print.c +++ b/src/print.c @@ -39,14 +39,13 @@ #include <time.h> #ifndef lint -FILE_RCSID("@(#)$Id: print.c,v 1.36 2002/06/11 17:31:46 christos Exp $") +FILE_RCSID("@(#)$Id: print.c,v 1.37 2002/07/03 18:26:38 christos Exp $") #endif /* lint */ #define SZOF(a) (sizeof(a) / sizeof(a[0])) void -mdump(m) - struct magic *m; +mdump(struct magic *m) { static const char *typ[] = { "invalid", "byte", "short", "invalid", "long", "string", "date", "beshort", @@ -134,9 +133,7 @@ mdump(m) * ckfprintf - fprintf, but with error checking */ void -ckfputs(str, fil) - const char *str; - FILE *fil; +ckfputs(const char *str, FILE *fil) { if (fputs(str,fil) == EOF) error("write failed.\n"); @@ -144,23 +141,11 @@ ckfputs(str, fil) /*VARARGS*/ void -#ifdef __STDC__ ckfprintf(FILE *f, const char *fmt, ...) -#else -ckfprintf(va_alist) - va_dcl -#endif { va_list va; -#ifdef __STDC__ + va_start(va, fmt); -#else - FILE *f; - const char *fmt; - va_start(va); - f = va_arg(va, FILE *); - fmt = va_arg(va, const char *); -#endif (void) vfprintf(f, fmt, va); if (ferror(f)) error("write failed.\n"); @@ -172,21 +157,11 @@ ckfprintf(va_alist) */ /*VARARGS*/ void -#ifdef __STDC__ error(const char *f, ...) -#else -error(va_alist) - va_dcl -#endif { va_list va; -#ifdef __STDC__ + va_start(va, f); -#else - const char *f; - va_start(va); - f = va_arg(va, const char *); -#endif /* cuz we use stdout for most, stderr here */ (void) fflush(stdout); @@ -199,21 +174,11 @@ error(va_alist) /*VARARGS*/ void -#ifdef __STDC__ magwarn(const char *f, ...) -#else -magwarn(va_alist) - va_dcl -#endif { va_list va; -#ifdef __STDC__ + va_start(va, f); -#else - const char *f; - va_start(va); - f = va_arg(va, const char *); -#endif /* cuz we use stdout for most, stderr here */ (void) fflush(stdout); @@ -227,9 +192,7 @@ magwarn(va_alist) char * -fmttime(v, local) - long v; - int local; +fmttime(long v, int local) { char *pp, *rt; time_t t = (time_t)v; |