Module Name: src
Committed By: christos
Date: Thu Aug 18 02:44:46 UTC 2011
Modified Files:
src/tests/lib/libcurses/director: Makefile testlang_parse.y
Log Message:
Fix enums confusion.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libcurses/director/Makefile
cvs rdiff -u -r1.7 -r1.8 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/Makefile
diff -u src/tests/lib/libcurses/director/Makefile:1.3 src/tests/lib/libcurses/director/Makefile:1.4
--- src/tests/lib/libcurses/director/Makefile:1.3 Tue Jun 28 22:36:26 2011
+++ src/tests/lib/libcurses/director/Makefile Wed Aug 17 22:44:45 2011
@@ -19,8 +19,4 @@
CWARNFLAGS.clang+= -Wno-format -Wno-conversion
-.if ${HAVE_GCC} == 45
-COPTS.testlang_parse.c+= -Wno-enum-compare
-.endif
-
.include <bsd.test.mk>
Index: src/tests/lib/libcurses/director/testlang_parse.y
diff -u src/tests/lib/libcurses/director/testlang_parse.y:1.7 src/tests/lib/libcurses/director/testlang_parse.y:1.8
--- src/tests/lib/libcurses/director/testlang_parse.y:1.7 Sat Jun 18 16:05:56 2011
+++ src/tests/lib/libcurses/director/testlang_parse.y Wed Aug 17 22:44:45 2011
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: testlang_parse.y,v 1.7 2011/06/18 20:05:56 joerg Exp $ */
+/* $NetBSD: testlang_parse.y,v 1.8 2011/08/18 02:44:45 christos Exp $ */
/*-
* Copyright 2009 Brett Lymn <[email protected]>
@@ -231,10 +231,9 @@
vars[command.returns[0].return_index].name,
returns_enum_names[command.returns[1].return_type]);
- if (((command.returns[1].return_type == arg_byte) &&
+ if (((command.returns[1].return_type == ret_byte) &&
(vars[command.returns[0].return_index].type != ret_byte)) ||
- ((command.returns[1].return_type == arg_static) &&
- (vars[command.returns[0].return_index].type != ret_string)))
+ vars[command.returns[0].return_index].type != ret_string)
err(1, "Var type %s (%d) does not match return type %s (%d)",
returns_enum_names[vars[command.returns[0].return_index].type],
vars[command.returns[0].return_index].type,
@@ -1329,7 +1328,7 @@
var_data = data;
len = var_data->len;
cmd = var_data->value;
- if (var_data->type == arg_byte)
+ if (type == arg_byte)
send_type = ret_byte;
else
send_type = ret_string;
