Reflect latest lint commit, which fixes many type conversion false

positives and negatives.

5 files changed, 11 insertions, 7 deletions

diff --git a/regress/usr.bin/xlint/Makefile b/regress/usr.bin/xlint/Makefile
index eb60b80252f..e3a7bc2ef5e 100644
--- a/regress/usr.bin/xlint/Makefile
+++ b/regress/usr.bin/xlint/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.21 2006/04/20 04:03:05 cloder Exp $
+# $OpenBSD: Makefile,v 1.22 2006/04/25 01:31:46 cloder Exp $
 
-TEST_MODULES=	1 2 3 4 5 6 7 8 9 10 12 13 14 15 16 17 18
+TEST_MODULES=	1 2 3 4 5 6 7 8 9 10 12 13 14 15 16 17 18 19
 LINT=		lint
 LINTFLAGS?=	-chapbx
 
diff --git a/regress/usr.bin/xlint/test-17.c b/regress/usr.bin/xlint/test-17.c
index 337c36bbc6b..009e2b20519 100644
--- a/regress/usr.bin/xlint/test-17.c
+++ b/regress/usr.bin/xlint/test-17.c
@@ -1,4 +1,4 @@
- /*	$OpenBSD: test-17.c,v 1.2 2006/04/21 02:37:28 cloder Exp $	*/
+ /*	$OpenBSD: test-17.c,v 1.3 2006/04/25 01:31:46 cloder Exp $	*/
 
 /*
  * Placed in the public domain by Chad Loder <cloder@openbsd.org>.
@@ -45,6 +45,5 @@ main(int argc, char* argv[])
 		break;
 	}
 
-	break;
 	return a;
 }
diff --git a/regress/usr.bin/xlint/test-17.c.exp b/regress/usr.bin/xlint/test-17.c.exp
index a40a0c7140c..69256c1a914 100644
--- a/regress/usr.bin/xlint/test-17.c.exp
+++ b/regress/usr.bin/xlint/test-17.c.exp
@@ -1,6 +1,4 @@
 test-17.c:26: warning: statement not reached
 test-17.c:34: warning: fallthrough on default statement
 test-17.c:41: warning: statement not reached
-test-17.c:48: break outside loop or switch
-test-17.c:49: warning: statement not reached
 Lint pass2:
diff --git a/regress/usr.bin/xlint/test-2.c.exp b/regress/usr.bin/xlint/test-2.c.exp
index 749e785811f..89d28aee290 100644
--- a/regress/usr.bin/xlint/test-2.c.exp
+++ b/regress/usr.bin/xlint/test-2.c.exp
@@ -1,7 +1,15 @@
+test-2.c:16: warning: conversion from 'int' to 'unsigned char' may lose accuracy
+test-2.c:17: warning: conversion from 'int' to 'unsigned char' may lose accuracy
+test-2.c:21: warning: conversion from 'int' to 'unsigned char' may lose accuracy
 test-2.c:22: warning: right shift of 8-bit quantity by 8 bits
+test-2.c:22: warning: conversion from 'int' to 'unsigned char' may lose accuracy
 test-2.c:24: warning: right shift of 8-bit quantity by 8 bits
+test-2.c:26: warning: conversion from 'int' to 'unsigned char' may lose accuracy
 test-2.c:27: warning: right shift of 8-bit quantity by 9 bits
+test-2.c:27: warning: conversion from 'int' to 'unsigned char' may lose accuracy
 test-2.c:29: warning: right shift of 8-bit quantity by 9 bits
+test-2.c:31: warning: conversion from 'int' to 'unsigned char' may lose accuracy
 test-2.c:32: warning: right shift of 8-bit quantity by 10 bits
+test-2.c:32: warning: conversion from 'int' to 'unsigned char' may lose accuracy
 test-2.c:34: warning: right shift of 8-bit quantity by 10 bits
 Lint pass2:
diff --git a/regress/usr.bin/xlint/test-5.c.exp b/regress/usr.bin/xlint/test-5.c.exp
index d944cdc41d0..2a65e2f0624 100644
--- a/regress/usr.bin/xlint/test-5.c.exp
+++ b/regress/usr.bin/xlint/test-5.c.exp
@@ -1,5 +1,4 @@
 test-5.c:34: warning: foo arg #1: converted from 'int' to 'unsigned long long'
 test-5.c:35: warning: foobar arg #1: conversion of 'long long' to 'int' is out of range
-test-5.c:36: warning: bar arg #1: converted from 'int' to 'unsigned int'
 test-5.c:36: warning: bar arg #1: conversion of negative constant to unsigned type
 Lint pass2: