CVS commit: src/tests/lib/libcurses/slave

[Brett Lymn]

Module Name:    src
Committed By:   blymn
Date:           Mon Apr 11 09:06:24 UTC 2011

Modified Files:
        src/tests/lib/libcurses/slave: curses_commands.c

Log Message:
Apply patch provided by mrg to fix bad calls to vw_printw and vw_scanw


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libcurses/slave/curses_commands.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/tests/lib/libcurses/slave/curses_commands.c
diff -u src/tests/lib/libcurses/slave/curses_commands.c:1.2 src/tests/lib/libcurses/slave/curses_commands.c:1.3
--- src/tests/lib/libcurses/slave/curses_commands.c:1.2	Sun Apr 10 23:31:30 2011
+++ src/tests/lib/libcurses/slave/curses_commands.c	Mon Apr 11 09:06:24 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: curses_commands.c,v 1.2 2011/04/10 23:31:30 dholland Exp $	*/
+/*	$NetBSD: curses_commands.c,v 1.3 2011/04/11 09:06:24 blymn Exp $	*/
 
 /*-
  * Copyright 2009 Brett Lymn <bl...@netbsd.org>
@@ -34,6 +34,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <termios.h>
+#include <stdarg.h>
+
 #include "slave.h"
 #include "curses_commands.h"
 
@@ -4398,6 +4400,19 @@
 }
 
 
+static int
+internal_vw_printw(WINDOW *win, char *arg1, ...)
+{
+	va_list va;
+	int rv;
+
+	va_start(va, arg1);
+	rv = vw_printw(win, arg1, va);
+	va_end(va);
+
+	return rv;
+}
+
 void
 cmd_vw_printw(int nargs, char **args)
 {
@@ -4413,10 +4428,23 @@
 	}
 
 	report_count(1);
-	report_return(vw_printw(win, args[1], args[2]));
+	report_return(internal_vw_printw(win, args[1], args[2]));
 }
 
 
+static int
+internal_vw_scanw(WINDOW *win, char *arg1, ...)
+{
+	va_list va;
+	int rv;
+
+	va_start(va, arg1);
+	rv = vw_scanw(win, arg1, va);
+	va_end(va);
+
+	return rv;
+}
+
 void
 cmd_vw_scanw(int nargs, char **args)
 {
@@ -4434,7 +4462,7 @@
 
 	/* XXX - call2 */
 	report_count(2);
-	report_int(vw_scanw(win, args[1], string));
+	report_int(internal_vw_scanw(win, args[1], string));
 	report_status(string);
 }