ncurses 5.9 - patch 20140308

[ncurses.git] / ncurses / base / lib_printw.c

diff --git a/ncurses/base/lib_printw.c b/ncurses/base/lib_printw.c
index 8d28f288d3c16681c7516c5ab0f81c28dbd1a3d0..56528f6bc7a7c050153701ed0d906e26e0890f38 100644 (file)
--- a/ncurses/base/lib_printw.c
+++ b/ncurses/base/lib_printw.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 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            *
@@ -27,7 +27,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey <dickey@clark.net> 1997                        *
+ *  Author: Thomas E. Dickey            1997-on                             *
  ****************************************************************************/
 
 /*
@@ -39,72 +39,108 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_printw.c,v 1.7 1998/04/11 22:53:44 tom Exp $")
+MODULE_ID("$Id: lib_printw.c,v 1.23 2012/09/03 17:55:28 tom Exp $")
 
-int printw(NCURSES_CONST char *fmt, ...)
+NCURSES_EXPORT(int)
+printw(const char *fmt,...)
 {
-       va_list argp;
-       int code;
-
-       T(("printw(%s,...) called", _nc_visbuf(fmt)));
+    va_list argp;
+    int code;
+
+#ifdef TRACE
+    va_list argq;
+    va_start(argq, fmt);
+    T((T_CALLED("printw(%s%s)"),
+       _nc_visbuf(fmt), _nc_varargs(fmt, argq)));
+    va_end(argq);
+#endif
 
-       va_start(argp, fmt);
-       code = vwprintw(stdscr, fmt, argp);
-       va_end(argp);
+    va_start(argp, fmt);
+    code = vwprintw(stdscr, fmt, argp);
+    va_end(argp);
 
-       return code;
+    returnCode(code);
 }
 
-int wprintw(WINDOW *win, NCURSES_CONST char *fmt, ...)
+NCURSES_EXPORT(int)
+wprintw(WINDOW *win, const char *fmt,...)
 {
-       va_list argp;
-       int code;
-
-       T(("wprintw(%p,%s,...) called", win, _nc_visbuf(fmt)));
+    va_list argp;
+    int code;
+
+#ifdef TRACE
+    va_list argq;
+    va_start(argq, fmt);
+    T((T_CALLED("wprintw(%p,%s%s)"),
+       (void *) win, _nc_visbuf(fmt), _nc_varargs(fmt, argq)));
+    va_end(argq);
+#endif
 
-       va_start(argp, fmt);
-       code = vwprintw(win, fmt, argp);
-       va_end(argp);
+    va_start(argp, fmt);
+    code = vwprintw(win, fmt, argp);
+    va_end(argp);
 
-       return code;
+    returnCode(code);
 }
 
-int mvprintw(int y, int x, NCURSES_CONST char *fmt, ...)
+NCURSES_EXPORT(int)
+mvprintw(int y, int x, const char *fmt,...)
 {
-       va_list argp;
-       int code = move(y, x);
-
-       if (code != ERR) {
-               va_start(argp, fmt);
-               code = vwprintw(stdscr, fmt, argp);
-               va_end(argp);
-       }
-       return code;
+    va_list argp;
+    int code;
+
+#ifdef TRACE
+    va_list argq;
+    va_start(argq, fmt);
+    T((T_CALLED("mvprintw(%d,%d,%s%s)"),
+       y, x, _nc_visbuf(fmt), _nc_varargs(fmt, argq)));
+    va_end(argq);
+#endif
+
+    if ((code = move(y, x)) != ERR) {
+       va_start(argp, fmt);
+       code = vwprintw(stdscr, fmt, argp);
+       va_end(argp);
+    }
+    returnCode(code);
 }
 
-int mvwprintw(WINDOW *win, int y, int x, NCURSES_CONST char *fmt, ...)
+NCURSES_EXPORT(int)
+mvwprintw(WINDOW *win, int y, int x, const char *fmt,...)
 {
-       va_list argp;
-       int code = wmove(win, y, x);
-
-       if (code != ERR) {
-               va_start(argp, fmt);
-               code = vwprintw(win, fmt, argp);
-               va_end(argp);
-       }
-       return code;
+    va_list argp;
+    int code;
+
+#ifdef TRACE
+    va_list argq;
+    va_start(argq, fmt);
+    T((T_CALLED("mvwprintw(%d,%d,%p,%s%s)"),
+       y, x, (void *) win, _nc_visbuf(fmt), _nc_varargs(fmt, argq)));
+    va_end(argq);
+#endif
+
+    if ((code = wmove(win, y, x)) != ERR) {
+       va_start(argp, fmt);
+       code = vwprintw(win, fmt, argp);
+       va_end(argp);
+    }
+    returnCode(code);
 }
 
-int vwprintw(WINDOW *win, NCURSES_CONST char *fmt, va_list argp)
+NCURSES_EXPORT(int)
+vwprintw(WINDOW *win, const char *fmt, va_list argp)
 {
-       char *buf = _nc_printf_string(fmt, argp);
-       int code = ERR;
-
-       if (buf != 0) {
-               code = waddstr(win, buf);
-#if USE_SAFE_SPRINTF
-               free(buf);
+    char *buf;
+    int code = ERR;
+#if NCURSES_SP_FUNCS
+    SCREEN *sp = _nc_screen_of(win);
 #endif
-       }
-       return code;
+
+    T((T_CALLED("vwprintw(%p,%s,va_list)"), (void *) win, _nc_visbuf(fmt)));
+
+    buf = NCURSES_SP_NAME(_nc_printf_string) (NCURSES_SP_ARGx fmt, argp);
+    if (buf != 0) {
+       code = waddstr(win, buf);
+    }
+    returnCode(code);
 }