Fix mmap() calls that check for a result other than MAP_FAILED.

ok tedu@

6 files changed, 14 insertions, 14 deletions

diff --git a/regress/lib/libc/mkstemp/mkstemp_test.c b/regress/lib/libc/mkstemp/mkstemp_test.c
index ef973b061b6..c1c05eae39d 100644
--- a/regress/lib/libc/mkstemp/mkstemp_test.c
+++ b/regress/lib/libc/mkstemp/mkstemp_test.c
@@ -122,7 +122,7 @@ main(void)
 	cwd[clen++] = '/';
 	cwd[clen] = '\0';
 	p = mmap(NULL, pg * 3, PROT_READ | PROT_WRITE, MAP_ANON, -1, 0);
-	if (p == NULL)
+	if (p == MAP_FAILED)
 		err(1, "mmap");
 	if (mprotect(p, pg, PROT_NONE) || mprotect(p + pg * 2, pg, PROT_NONE))
 		err(1, "mprotect");
diff --git a/regress/misc/X11/blt/blt.c b/regress/misc/X11/blt/blt.c
index 7d8df9edd25..18e6a360c5d 100644
--- a/regress/misc/X11/blt/blt.c
+++ b/regress/misc/X11/blt/blt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: blt.c,v 1.2 2013/10/28 08:47:43 jsg Exp $	*/
+/*	$OpenBSD: blt.c,v 1.3 2014/09/27 06:28:45 doug Exp $	*/
 /*
  *	Written by Mark Kettenis <kettenis@openbsd.org> 2004 Public Domain
  */
@@ -34,10 +34,10 @@ main (void)
 	pagesize = getpagesize();
 
 	src = mmap(NULL, 2 * pagesize, PROT_READ|PROT_WRITE, MAP_ANON, -1, 0);
-	assert(src);
+	assert(src != MAP_FAILED);
 
 	dst = mmap(NULL, 2 * pagesize, PROT_READ|PROT_WRITE, MAP_ANON, -1, 0);
-	assert(dst);
+	assert(dst != MAP_FAILED);
 
 	mprotect((char *)src + pagesize, pagesize, PROT_NONE);
 	src = (FbBits *)((char *)src + (pagesize - sizeof map));
diff --git a/regress/misc/X11/bltone/bltone.c b/regress/misc/X11/bltone/bltone.c
index 36f67e6ba65..575e554f038 100644
--- a/regress/misc/X11/bltone/bltone.c
+++ b/regress/misc/X11/bltone/bltone.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bltone.c,v 1.5 2013/10/28 08:47:43 jsg Exp $	*/
+/*	$OpenBSD: bltone.c,v 1.6 2014/09/27 06:28:45 doug Exp $	*/
 /*
  *	Written by Mark Kettenis <kettenis@openbsd.org> 2004 Public Domain
  */
@@ -31,10 +31,10 @@ main (void)
 	pagesize = getpagesize();
 
 	src = mmap(NULL, 2 * pagesize, PROT_READ|PROT_WRITE, MAP_ANON, -1, 0);
-	assert(src);
+	assert(src != MAP_FAILED);
 
 	dst = mmap(NULL, 2 * pagesize, PROT_READ|PROT_WRITE, MAP_ANON, -1, 0);
-	assert(dst);
+	assert(dst != MAP_FAILED);
 
 	mprotect((char *)src + pagesize, pagesize, PROT_NONE);
 	src = (FbStip *)((char *)src + (pagesize - sizeof mask));
diff --git a/regress/sys/kern/mmap3/mmaptest.c b/regress/sys/kern/mmap3/mmaptest.c
index 1318d46c41f..1e8ee706910 100644
--- a/regress/sys/kern/mmap3/mmaptest.c
+++ b/regress/sys/kern/mmap3/mmaptest.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mmaptest.c,v 1.6 2006/02/20 17:03:27 mickey Exp $ */
+/* $OpenBSD: mmaptest.c,v 1.7 2014/09/27 06:28:45 doug Exp $ */
 /*
  * Copyright (c) 2002 Marc Espie.
  *
@@ -58,7 +58,7 @@ main(int argc, char *argv[])
 	if (fd == -1)
 		err(1, "open(test.out) 2");
 	a2 = mmap(NULL, AREA, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
-	if (!a2)
+	if (a2 == MAP_FAILED)
 		err(1, "mmap");
 	a2[10] = 3;
 	msync(a2, AREA, MS_SYNC|MS_INVALIDATE);
diff --git a/sbin/newfs_ext2fs/mke2fs.c b/sbin/newfs_ext2fs/mke2fs.c
index 0be794dd26d..e47ffe42adb 100644
--- a/sbin/newfs_ext2fs/mke2fs.c
+++ b/sbin/newfs_ext2fs/mke2fs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mke2fs.c,v 1.11 2014/07/31 19:49:25 pelikan Exp $ */
+/* $OpenBSD: mke2fs.c,v 1.12 2014/09/27 06:28:45 doug Exp $ */
 /*	$NetBSD: mke2fs.c,v 1.13 2009/10/19 18:41:08 bouyer Exp $	*/
 
 /*-
@@ -532,7 +532,7 @@ mke2fs(const char *fsys, int fi, int fo)
 	iobufsize = (NBLOCK_SUPERBLOCK + sblock.e2fs_ngdb) * sblock.e2fs_bsize;
 	iobuf = mmap(0, iobufsize, PROT_READ|PROT_WRITE,
 	    MAP_ANON|MAP_PRIVATE, -1, 0);
-	if (iobuf == NULL)
+	if (iobuf == MAP_FAILED)
 		errx(EXIT_FAILURE, "Cannot allocate I/O buffer\n");
 	memset(iobuf, 0, iobufsize);
 
diff --git a/usr.sbin/ztsscale/ztsscale.c b/usr.sbin/ztsscale/ztsscale.c
index 2b8319264be..8b6a2e094f9 100644
--- a/usr.sbin/ztsscale/ztsscale.c
+++ b/usr.sbin/ztsscale/ztsscale.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ztsscale.c,v 1.16 2013/12/31 07:16:50 matthieu Exp $	*/
+/*	$OpenBSD: ztsscale.c,v 1.17 2014/09/27 06:28:45 doug Exp $	*/
 
 /*
  * Copyright (c) 2005 Matthieu Herrb
@@ -131,9 +131,9 @@ save_screen(void)
 
 	if (ioctl(fd, WSDISPLAYIO_SMODE, &mode) == -1)
 		warn("ioctl SMODE");
-	mapaddr = (void *)mmap(0, WIDTH*HEIGHT*sizeof(short),
+	mapaddr = mmap(0, WIDTH*HEIGHT*sizeof(short),
 	    PROT_READ|PROT_WRITE, MAP_SHARED, fd, (off_t)0);
-	if (mapaddr == (void *)-1)
+	if (mapaddr == MAP_FAILED)
 		err(2, "mmap");
 	save = (u_short *)malloc(WIDTH*HEIGHT*sizeof(u_short));
 	if (save == NULL)