diff options
Diffstat (limited to 'clients/xzwrite/util.c')
| -rw-r--r-- | clients/xzwrite/util.c | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/clients/xzwrite/util.c b/clients/xzwrite/util.c index 38c7f13..f52ee7e 100644 --- a/clients/xzwrite/util.c +++ b/clients/xzwrite/util.c @@ -1,37 +1,44 @@ #include <stdio.h> -#include <varargs.h> #include <pwd.h> #include "xzwrite.h" +#ifdef __STDC__ +void Warning(const char *first, ...) +#else /*VARARGS*/ void Warning(first, va_alist) - char *first; + const char *first; va_dcl +#endif { va_list vp; char *s; fputs(first, stderr); - va_start(vp); + VA_START(vp, first); while ((s = va_arg(vp, char *)) != NULL) fputs(s, stderr); va_end(vp); putc('\n', stderr); } +#ifdef __STDC__ +void Error(const char *first, ...) +#else /*VARARGS*/ void Error(first, va_alist) - char *first; + const char *first; va_dcl +#endif { va_list vp; char *s; fputs(first, stderr); - va_start(vp); + VA_START(vp, first); while ((s = va_arg(vp, char *)) != NULL) fputs(s, stderr); va_end(vp); @@ -40,10 +47,14 @@ void Error(first, va_alist) exit(1); } +#ifdef __STDC__ +char *Malloc(int n, ...) +#else /*VARARGS*/ char *Malloc(n, va_alist) int n; va_dcl +#endif { va_list vp; char *ptr, *s; @@ -54,7 +65,7 @@ char *Malloc(n, va_alist) fputs("Out of memory: ", stderr); - va_start(vp); + VA_START(vp, n); while ((s = va_arg(vp, char *)) != NULL) fputs(s, stderr); va_end(vp); @@ -70,7 +81,7 @@ char *get_username() if (u) return u; - if (u = (char *) getenv("USER")) return u; + if ((u = getenv("USER")) != NULL) return u; pwuid = getpwuid(getuid()); if (pwuid) |