X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_printw.c;h=530e7134307ed5a1fdb1e273acf3738c8ffe86f0;hp=963181d9a49437e45f541baabefc44c7ccc2f593;hb=b0916ab669030bac5c8590c0d66e36e1b9b34e9b;hpb=8c3524de1122ce47b3fc6f89769e489cef5a640d diff --git a/ncurses/base/lib_printw.c b/ncurses/base/lib_printw.c index 963181d9..530e7134 100644 --- a/ncurses/base/lib_printw.c +++ b/ncurses/base/lib_printw.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * + * Copyright (c) 1998-2009,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -39,7 +39,7 @@ #include -MODULE_ID("$Id: lib_printw.c,v 1.20 2009/10/24 22:07:03 tom Exp $") +MODULE_ID("$Id: lib_printw.c,v 1.21 2012/02/29 10:11:53 Werner.Fink Exp $") NCURSES_EXPORT(int) printw(const char *fmt,...) @@ -48,10 +48,12 @@ printw(const char *fmt,...) int code; #ifdef TRACE - va_start(argp, fmt); + va_list argq; + va_copy(argq, argp); + va_start(argq, fmt); T((T_CALLED("printw(%s%s)"), - _nc_visbuf(fmt), _nc_varargs(fmt, argp))); - va_end(argp); + _nc_visbuf(fmt), _nc_varargs(fmt, argq))); + va_end(argq); #endif va_start(argp, fmt); @@ -68,10 +70,12 @@ wprintw(WINDOW *win, const char *fmt,...) int code; #ifdef TRACE - va_start(argp, fmt); + va_list argq; + va_copy(argq, argp); + va_start(argq, fmt); T((T_CALLED("wprintw(%p,%s%s)"), - (void *) win, _nc_visbuf(fmt), _nc_varargs(fmt, argp))); - va_end(argp); + (void *) win, _nc_visbuf(fmt), _nc_varargs(fmt, argq))); + va_end(argq); #endif va_start(argp, fmt); @@ -88,10 +92,12 @@ mvprintw(int y, int x, const char *fmt,...) int code; #ifdef TRACE - va_start(argp, fmt); + va_list argq; + va_copy(argq, argp); + va_start(argq, fmt); T((T_CALLED("mvprintw(%d,%d,%s%s)"), - y, x, _nc_visbuf(fmt), _nc_varargs(fmt, argp))); - va_end(argp); + y, x, _nc_visbuf(fmt), _nc_varargs(fmt, argq))); + va_end(argq); #endif if ((code = move(y, x)) != ERR) { @@ -109,10 +115,12 @@ mvwprintw(WINDOW *win, int y, int x, const char *fmt,...) int code; #ifdef TRACE - va_start(argp, fmt); + va_list argq; + va_copy(argq, argp); + va_start(argq, fmt); T((T_CALLED("mvwprintw(%d,%d,%p,%s%s)"), - y, x, (void *) win, _nc_visbuf(fmt), _nc_varargs(fmt, argp))); - va_end(argp); + y, x, (void *) win, _nc_visbuf(fmt), _nc_varargs(fmt, argq))); + va_end(argq); #endif if ((code = wmove(win, y, x)) != ERR) {