From owner-svn-src-all@FreeBSD.ORG  Tue Jun 15 10:01:50 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 098811065676;
	Tue, 15 Jun 2010 10:01:50 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D3EF78FC27;
	Tue, 15 Jun 2010 10:01:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5FA1nYm043140;
	Tue, 15 Jun 2010 10:01:49 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5FA1ng7043135;
	Tue, 15 Jun 2010 10:01:49 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201006151001.o5FA1ng7043135@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Tue, 15 Jun 2010 10:01:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209200 - head/gnu/lib/libdialog/TESTS
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Jun 2010 10:01:50 -0000

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;
 }