Module Name: src
Committed By: joerg
Date: Tue Jul 7 10:16:53 UTC 2009
Modified Files:
src/lib/libcurses: curses.h printw.c scanw.c
Log Message:
Add vw_printw and vw_scanw as mandated by SUSv2's xcurses. Follow
ncurses and just make the historic vwprintw and vwscanw functions
aliases, ignoring that they should take a varargs.h va_list argument.
To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/lib/libcurses/curses.h
cvs rdiff -u -r1.20 -r1.21 src/lib/libcurses/printw.c
cvs rdiff -u -r1.19 -r1.20 src/lib/libcurses/scanw.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/curses.h
diff -u src/lib/libcurses/curses.h:1.96 src/lib/libcurses/curses.h:1.97
--- src/lib/libcurses/curses.h:1.96 Tue Jul 7 09:58:08 2009
+++ src/lib/libcurses/curses.h Tue Jul 7 10:16:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: curses.h,v 1.96 2009/07/07 09:58:08 joerg Exp $ */
+/* $NetBSD: curses.h,v 1.97 2009/07/07 10:16:52 joerg Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -732,6 +732,8 @@
int untouchwin(WINDOW *);
int use_default_colors(void);
int vline(chtype, int);
+int vw_printw(WINDOW *, const char *, _BSD_VA_LIST_) __printflike(2, 0);
+int vw_scanw(WINDOW *, const char *, _BSD_VA_LIST_) __scanflike(2, 0);
int vwprintw(WINDOW *, const char *, _BSD_VA_LIST_) __printflike(2, 0);
int vwscanw(WINDOW *, const char *, _BSD_VA_LIST_) __scanflike(2, 0);
int waddch(WINDOW *, chtype);
Index: src/lib/libcurses/printw.c
diff -u src/lib/libcurses/printw.c:1.20 src/lib/libcurses/printw.c:1.21
--- src/lib/libcurses/printw.c:1.20 Sun Jan 21 13:25:36 2007
+++ src/lib/libcurses/printw.c Tue Jul 7 10:16:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: printw.c,v 1.20 2007/01/21 13:25:36 jdc Exp $ */
+/* $NetBSD: printw.c,v 1.21 2009/07/07 10:16:52 joerg Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)printw.c 8.3 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: printw.c,v 1.20 2007/01/21 13:25:36 jdc Exp $");
+__RCSID("$NetBSD: printw.c,v 1.21 2009/07/07 10:16:52 joerg Exp $");
#endif
#endif /* not lint */
@@ -60,7 +60,7 @@
int ret;
va_start(ap, fmt);
- ret = vwprintw(stdscr, fmt, ap);
+ ret = vw_printw(stdscr, fmt, ap);
va_end(ap);
return (ret);
}
@@ -75,7 +75,7 @@
int ret;
va_start(ap, fmt);
- ret = vwprintw(win, fmt, ap);
+ ret = vw_printw(win, fmt, ap);
va_end(ap);
return (ret);
}
@@ -93,7 +93,7 @@
if (move(y, x) != OK)
return (ERR);
va_start(ap, fmt);
- ret = vwprintw(stdscr, fmt, ap);
+ ret = vw_printw(stdscr, fmt, ap);
va_end(ap);
return (ret);
}
@@ -108,7 +108,7 @@
return (ERR);
va_start(ap, fmt);
- ret = vwprintw(win, fmt, ap);
+ ret = vw_printw(win, fmt, ap);
va_end(ap);
return (ret);
}
@@ -135,11 +135,11 @@
return (n);
}
/*
- * vwprintw --
+ * vw_printw --
* This routine actually executes the printf and adds it to the window.
*/
int
-vwprintw(WINDOW *win, const char *fmt, _BSD_VA_LIST_ ap)
+vw_printw(WINDOW *win, const char *fmt, _BSD_VA_LIST_ ap)
{
FILE *f;
@@ -148,3 +148,5 @@
(void) vfprintf(f, fmt, ap);
return (fclose(f) ? ERR : OK);
}
+
+__strong_alias(vwprintw, vw_printw)
Index: src/lib/libcurses/scanw.c
diff -u src/lib/libcurses/scanw.c:1.19 src/lib/libcurses/scanw.c:1.20
--- src/lib/libcurses/scanw.c:1.19 Tue May 29 11:10:56 2007
+++ src/lib/libcurses/scanw.c Tue Jul 7 10:16:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: scanw.c,v 1.19 2007/05/29 11:10:56 blymn Exp $ */
+/* $NetBSD: scanw.c,v 1.20 2009/07/07 10:16:52 joerg Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)scanw.c 8.3 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: scanw.c,v 1.19 2007/05/29 11:10:56 blymn Exp $");
+__RCSID("$NetBSD: scanw.c,v 1.20 2009/07/07 10:16:52 joerg Exp $");
#endif
#endif /* not lint */
@@ -57,7 +57,7 @@
int ret;
va_start(ap, fmt);
- ret = vwscanw(stdscr, fmt, ap);
+ ret = vw_scanw(stdscr, fmt, ap);
va_end(ap);
return (ret);
}
@@ -72,7 +72,7 @@
int ret;
va_start(ap, fmt);
- ret = vwscanw(win, fmt, ap);
+ ret = vw_scanw(win, fmt, ap);
va_end(ap);
return (ret);
}
@@ -90,7 +90,7 @@
if (move(y, x) != OK)
return (ERR);
va_start(ap, fmt);
- ret = vwscanw(stdscr, fmt, ap);
+ ret = vw_scanw(stdscr, fmt, ap);
va_end(ap);
return (ret);
}
@@ -104,7 +104,7 @@
if (move(y, x) != OK)
return (ERR);
va_start(ap, fmt);
- ret = vwscanw(win, fmt, ap);
+ ret = vw_scanw(win, fmt, ap);
va_end(ap);
return (ret);
}
@@ -113,7 +113,7 @@
* This routine actually executes the scanf from the window.
*/
int
-vwscanw(WINDOW *win, const char *fmt, _BSD_VA_LIST_ ap)
+vw_scanw(WINDOW *win, const char *fmt, _BSD_VA_LIST_ ap)
{
char buf[1024];
@@ -121,3 +121,5 @@
return (wgetnstr(win, buf, (int) sizeof(buf)) == OK ?
vsscanf(buf, fmt, ap) : ERR);
}
+
+__strong_alias(vwscanw, vw_scanw)
