diff options
| author | Amadeusz Sławiński <amade@asmblr.net> | 2012-01-05 02:46:34 +0100 |
|---|---|---|
| committer | Amadeusz Sławiński <amade@asmblr.net> | 2014-07-24 11:50:47 +0200 |
| commit | dba8409a17ef2d6e2bd9da429488c791f7801786 (patch) | |
| tree | b14e71d1f9d4049aa24350740bec11b69f988fd6 | |
| parent | 3ec21d49bb3249bed3607307ecd2815620cb23f7 (diff) | |
| download | screen-dba8409a17ef2d6e2bd9da429488c791f7801786.tar.gz | |
use stdarg.h version of variable argument lists
Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
| -rw-r--r-- | src/layer.c | 10 | ||||
| -rw-r--r-- | src/os.h | 18 | ||||
| -rw-r--r-- | src/screen.c | 17 |
3 files changed, 14 insertions, 31 deletions
diff --git a/src/layer.c b/src/layer.c index 7221680..72e93f5 100644 --- a/src/layer.c +++ b/src/layer.c @@ -784,17 +784,17 @@ LRefreshAll(struct layer *l, int isblank) } void -LMsg(int err, const char *fmt, VA_DOTS) +LMsg(int err, const char *fmt, ...) { - VA_LIST(ap) + va_list ap; char buf[MAXPATHLEN*2]; char *p = buf; struct canvas *cv; - VA_START(ap, fmt); + va_start(ap, fmt); fmt = DoNLS(fmt); - (void)vsnprintf(p, sizeof(buf) - 100, fmt, VA_ARGS(ap)); - VA_END(ap); + (void)vsnprintf(p, sizeof(buf) - 100, fmt, ap); + va_end(ap); if (err) { p += strlen(p); @@ -86,23 +86,7 @@ extern int errno; # include <string.h> #endif -#if defined(__STDC__) -# include <stdarg.h> -# define VA_LIST(var) va_list var; -# define VA_DOTS ... -# define VA_DECL -# define VA_START(ap, fmt) va_start(ap, fmt) -# define VA_ARGS(ap) ap -# define VA_END(ap) va_end(ap) -#else -# include <varargs.h> -# define VA_LIST(var) va_list var; -# define VA_DOTS va_alist -# define VA_DECL va_dcl -# define VA_START(ap, fmt) va_start(ap) -# define VA_ARGS(ap) ap -# define VA_END(ap) va_end(ap) -#endif +#include <stdarg.h> #if !defined(sun) && !defined(B43) && !defined(ISC) && !defined(pyr) && !defined(_CX_UX) # include <time.h> diff --git a/src/screen.c b/src/screen.c index 00434c7..f2d7a18 100644 --- a/src/screen.c +++ b/src/screen.c @@ -1935,11 +1935,11 @@ MakeNewEnv() #define PROCESS_MESSAGE(B) do { \ char *p = B; \ - VA_LIST(ap) \ - VA_START(ap, fmt); \ + va_list ap; \ + va_start(ap, fmt); \ fmt = DoNLS(fmt); \ - (void)vsnprintf(p, sizeof(B) - 100, fmt, VA_ARGS(ap)); \ - VA_END(ap); \ + (void)vsnprintf(p, sizeof(B) - 100, fmt, ap); \ + va_end(ap); \ if (err) \ { \ p += strlen(p); \ @@ -1950,8 +1950,7 @@ MakeNewEnv() } \ } while (0) -void Msg(int err, const char *fmt, VA_DOTS) - +void Msg(int err, const char *fmt, ...) { char buf[MAXPATHLEN*2]; PROCESS_MESSAGE(buf); @@ -1986,7 +1985,7 @@ void Msg(int err, const char *fmt, VA_DOTS) /* * Call FinitTerm for all displays, write a message to each and call eexit(); */ -void Panic(int err, const char *fmt, VA_DOTS) +void Panic(int err, const char *fmt, ...) { char buf[MAXPATHLEN*2]; @@ -2042,7 +2041,7 @@ void Panic(int err, const char *fmt, VA_DOTS) eexit(1); } -void QueryMsg(int err, const char *fmt, VA_DOTS) +void QueryMsg(int err, const char *fmt, ...) { char buf[MAXPATHLEN*2]; @@ -2053,7 +2052,7 @@ void QueryMsg(int err, const char *fmt, VA_DOTS) write(queryflag, buf, strlen(buf)); } -void Dummy (int err, const char *fmt, VA_DOTS) +void Dummy (int err, const char *fmt, ...) {} #undef PROCESS_MESSAGE |