svn commit: r209200 - head/gnu/lib/libdialog/TESTS

[Andrey V. Elsukov]

Author: ae
Date: Tue Jun 15 10:01:49 2010
New Revision: 209200
URL: http://svn.freebsd.org/changeset/base/209200

Log:
  Make all tests in libdialog compilable.
  Fix coredump in menu3.c.
  
  Approved by:	kib (mentor)

Modified:
  head/gnu/lib/libdialog/TESTS/check3.c
  head/gnu/lib/libdialog/TESTS/menu3.c
  head/gnu/lib/libdialog/TESTS/radio1.c
  head/gnu/lib/libdialog/TESTS/radio3.c

Modified: head/gnu/lib/libdialog/TESTS/check3.c
==============================================================================
--- head/gnu/lib/libdialog/TESTS/check3.c	Tue Jun 15 09:30:36 2010	(r209199)
+++ head/gnu/lib/libdialog/TESTS/check3.c	Tue Jun 15 10:01:49 2010	(r209200)
@@ -47,13 +47,13 @@ static int spending;
 static int
 check(dialogMenuItem *self)
 {
-    return ((int)self->data == spending);
+    return ((int)(intptr_t)self->data == spending);
 }
 
 static int
 spend(dialogMenuItem *self)
 {
-    spending = (int)self->data;
+    spending = (int)(intptr_t)self->data;
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
 

Modified: head/gnu/lib/libdialog/TESTS/menu3.c
==============================================================================
--- head/gnu/lib/libdialog/TESTS/menu3.c	Tue Jun 15 09:30:36 2010	(r209199)
+++ head/gnu/lib/libdialog/TESTS/menu3.c	Tue Jun 15 10:01:49 2010	(r209200)
@@ -44,7 +44,7 @@ maybe(dialogMenuItem *self)
 static char *insurance[] = {
     "1,000,000",	"Mondo insurance policy", "Off",
     "5,000,000",	"Mega insurance policy", "Off",
-    "10,000,000",	"Friend!  Most Favored customer!"
+    "10,000,000",	"Friend!  Most Favored customer!", "On"
 };
 
 static void

Modified: head/gnu/lib/libdialog/TESTS/radio1.c
==============================================================================
--- head/gnu/lib/libdialog/TESTS/radio1.c	Tue Jun 15 09:30:36 2010	(r209199)
+++ head/gnu/lib/libdialog/TESTS/radio1.c	Tue Jun 15 10:01:49 2010	(r209200)
@@ -31,13 +31,13 @@ static int spending;
 static int
 check(dialogMenuItem *self)
 {
-    return ((int)self->data == spending);
+    return ((int)(intptr_t)self->data == spending);
 }
 
 static int
 spend(dialogMenuItem *self)
 {
-    spending = (int)self->data;
+    spending = (int)(intptr_t)self->data;
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
 

Modified: head/gnu/lib/libdialog/TESTS/radio3.c
==============================================================================
--- head/gnu/lib/libdialog/TESTS/radio3.c	Tue Jun 15 09:30:36 2010	(r209199)
+++ head/gnu/lib/libdialog/TESTS/radio3.c	Tue Jun 15 10:01:49 2010	(r209200)
@@ -31,13 +31,13 @@ static int spending;
 static int
 check(dialogMenuItem *self)
 {
-    return ((int)self->data == spending);
+    return ((int)(intptr_t)self->data == spending);
 }
 
 static int
 spend(dialogMenuItem *self)
 {
-    spending = (int)self->data;
+    spending = (int)(intptr_t)self->data;
     return DITEM_SUCCESS | DITEM_REDRAW;
 }