X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_printw.c;h=617c5faada24f01a81b83caf71b73b41d0783d4b;hp=530e7134307ed5a1fdb1e273acf3738c8ffe86f0;hb=1b540608eae9a714c0c4195310f25c1a1897ae89;hpb=b0916ab669030bac5c8590c0d66e36e1b9b34e9b diff --git a/ncurses/base/lib_printw.c b/ncurses/base/lib_printw.c index 530e7134..617c5faa 100644 --- a/ncurses/base/lib_printw.c +++ b/ncurses/base/lib_printw.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2009,2012 Free Software Foundation, Inc. * + * Copyright (c) 1998-2012,2016 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 * @@ -27,7 +27,7 @@ ****************************************************************************/ /**************************************************************************** - * Author: Thomas E. Dickey 1997 * + * Author: Thomas E. Dickey 1997-on * ****************************************************************************/ /* @@ -39,7 +39,7 @@ #include -MODULE_ID("$Id: lib_printw.c,v 1.21 2012/02/29 10:11:53 Werner.Fink Exp $") +MODULE_ID("$Id: lib_printw.c,v 1.24 2016/05/28 23:11:26 tom Exp $") NCURSES_EXPORT(int) printw(const char *fmt,...) @@ -49,7 +49,6 @@ printw(const char *fmt,...) #ifdef TRACE va_list argq; - va_copy(argq, argp); va_start(argq, fmt); T((T_CALLED("printw(%s%s)"), _nc_visbuf(fmt), _nc_varargs(fmt, argq))); @@ -71,7 +70,6 @@ wprintw(WINDOW *win, const char *fmt,...) #ifdef TRACE 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, argq))); @@ -88,12 +86,10 @@ wprintw(WINDOW *win, const char *fmt,...) NCURSES_EXPORT(int) mvprintw(int y, int x, const char *fmt,...) { - va_list argp; int code; #ifdef TRACE 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, argq))); @@ -101,6 +97,8 @@ mvprintw(int y, int x, const char *fmt,...) #endif if ((code = move(y, x)) != ERR) { + va_list argp; + va_start(argp, fmt); code = vwprintw(stdscr, fmt, argp); va_end(argp); @@ -111,12 +109,10 @@ mvprintw(int y, int x, const char *fmt,...) NCURSES_EXPORT(int) mvwprintw(WINDOW *win, int y, int x, const char *fmt,...) { - va_list argp; int code; #ifdef TRACE 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, argq))); @@ -124,6 +120,8 @@ mvwprintw(WINDOW *win, int y, int x, const char *fmt,...) #endif if ((code = wmove(win, y, x)) != ERR) { + va_list argp; + va_start(argp, fmt); code = vwprintw(win, fmt, argp); va_end(argp);