Module Name: src
Committed By: christos
Date: Sun May 15 23:56:28 UTC 2011
Modified Files:
src/tests/lib/libcurses/director: director.c testlang_conf.l
testlang_parse.y
Log Message:
if you don't include the proper include files, you are going to end up
calling functions incorrectly.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libcurses/director/director.c
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libcurses/director/testlang_conf.l \
src/tests/lib/libcurses/director/testlang_parse.y
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/director/director.c
diff -u src/tests/lib/libcurses/director/director.c:1.3 src/tests/lib/libcurses/director/director.c:1.4
--- src/tests/lib/libcurses/director/director.c:1.3 Tue Apr 19 16:13:55 2011
+++ src/tests/lib/libcurses/director/director.c Sun May 15 19:56:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: director.c,v 1.3 2011/04/19 20:13:55 martin Exp $ */
+/* $NetBSD: director.c,v 1.4 2011/05/15 23:56:28 christos Exp $ */
/*-
* Copyright 2009 Brett Lymn <bl...@netbsd.org>
@@ -31,13 +31,17 @@
#include <fcntl.h>
#include <unistd.h>
+#include <ctype.h>
#include <termios.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <util.h>
+#include <err.h>
#include "returns.h"
+void yyparse(void);
#define DEF_TERMPATH "."
#define DEF_TERM "atf"
#define DEF_SLAVE "./slave"
Index: src/tests/lib/libcurses/director/testlang_conf.l
diff -u src/tests/lib/libcurses/director/testlang_conf.l:1.2 src/tests/lib/libcurses/director/testlang_conf.l:1.3
--- src/tests/lib/libcurses/director/testlang_conf.l:1.2 Mon Apr 11 05:03:24 2011
+++ src/tests/lib/libcurses/director/testlang_conf.l Sun May 15 19:56:28 2011
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: testlang_conf.l,v 1.2 2011/04/11 09:03:24 blymn Exp $ */
+/* $NetBSD: testlang_conf.l,v 1.3 2011/05/15 23:56:28 christos Exp $ */
/*-
* Copyright 2009 Brett Lymn <bl...@netbsd.org>
@@ -31,6 +31,7 @@
*/
#include <curses.h>
+#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Index: src/tests/lib/libcurses/director/testlang_parse.y
diff -u src/tests/lib/libcurses/director/testlang_parse.y:1.2 src/tests/lib/libcurses/director/testlang_parse.y:1.3
--- src/tests/lib/libcurses/director/testlang_parse.y:1.2 Thu Apr 21 06:23:50 2011
+++ src/tests/lib/libcurses/director/testlang_parse.y Sun May 15 19:56:28 2011
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: testlang_parse.y,v 1.2 2011/04/21 10:23:50 blymn Exp $ */
+/* $NetBSD: testlang_parse.y,v 1.3 2011/05/15 23:56:28 christos Exp $ */
/*-
* Copyright 2009 Brett Lymn <bl...@netbsd.org>
@@ -32,6 +32,8 @@
#include <assert.h>
#include <errno.h>
#include <fcntl.h>
+#include <err.h>
+#include <unistd.h>
#include <poll.h>
#include <stdbool.h>
#include <stdio.h>
@@ -50,6 +52,8 @@
extern char *check_path;
extern char *cur_file; /* from director.c */
+int yylex(void);
+
size_t line;
static int input_delay;
@@ -777,7 +781,7 @@
*/
result = read(check_fd, &drain, 1);
if (result == -1)
- err("read of data file failed");
+ err(1, "read of data file failed");
if (result > 0) {
fprintf(stderr, "Error: excess data "
