Sweep through the tree fixing mmap() usage:

  - Use MAP_FAILED instead of the constant -1 to indicate
    failure (required by POSIX).
  - Removed flag arguments of '0' (required by POSIX).
  - Fixed code which expected an error return of 0.
  - Fixed code which thought any address with the high bit set
    was an error.
  - Check for failure where no checks were present.

Discussed with:	bde

4 files changed, 8 insertions, 8 deletions

diff --git a/share/examples/meteor/rgb16.c b/share/examples/meteor/rgb16.c
index 17b1592..4c7ee07 100644
--- a/share/examples/meteor/rgb16.c
+++ b/share/examples/meteor/rgb16.c
@@ -77,9 +77,9 @@ main()
 		exit(1);
 	}
 
-        rgb16 = (short *)mmap((caddr_t)0,SIZE,PROT_READ,0, i, (off_t)0);
+        rgb16 = (short *)mmap((caddr_t)0,SIZE,PROT_READ,MAP_SHARED, i, (off_t)0);
 
-	if (rgb16 == (short *) -1) return (0);
+	if (rgb16 == (short *) MAP_FAILED) return (0);
 
 	c = METEOR_CAP_SINGLE ;
         ioctl(i, METEORCAPTUR, &c);
diff --git a/share/examples/meteor/test-n.c b/share/examples/meteor/test-n.c
index f899033..4651654 100644
--- a/share/examples/meteor/test-n.c
+++ b/share/examples/meteor/test-n.c
@@ -127,9 +127,9 @@ main()
 
 	printf("mmap %d %d\n", errno, i);
 	size = ((width*height*depth*frames+4095)/4096)*4096;
-        y=(uint8 *) mmap((caddr_t)0, size + 4096, PROT_READ |PROT_WRITE,0, i, (off_t)0);
+        y=(uint8 *) mmap((caddr_t)0, size + 4096, PROT_READ |PROT_WRITE,MAP_SHARED, i, (off_t)0);
 
-	if (y == (uint8 *) -1) return (0);
+	if (y == (uint8 *) MAP_FAILED) return (0);
 
 	common_mem = (struct meteor_mem *) (y + size);
 
diff --git a/share/examples/meteor/yuvpk.c b/share/examples/meteor/yuvpk.c
index b2941e0..6ebd2e4 100644
--- a/share/examples/meteor/yuvpk.c
+++ b/share/examples/meteor/yuvpk.c
@@ -81,9 +81,9 @@ main()
 		exit(1);
 	}
 
-        yuv_data = (uint8 *)mmap((caddr_t)0,SIZE,PROT_READ,0, i, (off_t)0);
+        yuv_data = (uint8 *)mmap((caddr_t)0,SIZE,PROT_READ,MAP_SHARED, i, (off_t)0);
 
-	if (yuv_data == (int8 *) -1) return (0);
+	if (yuv_data == (int8 *) MAP_FAILED) return (0);
 
 	c = METEOR_CAP_SINGLE ;
         ioctl(i, METEORCAPTUR, &c);
diff --git a/share/examples/meteor/yuvpl.c b/share/examples/meteor/yuvpl.c
index 243644d..704dfce 100644
--- a/share/examples/meteor/yuvpl.c
+++ b/share/examples/meteor/yuvpl.c
@@ -84,9 +84,9 @@ main()
 		exit(1);
 	}
 
-        yuv_data = (uint8 *)mmap((caddr_t)0,SIZE,PROT_READ,0, i, (off_t)0);
+        yuv_data = (uint8 *)mmap((caddr_t)0,SIZE,PROT_READ,MAP_SHARED, i, (off_t)0);
 
-	if (yuv_data == (uint8 *) -1) return (0);
+	if (yuv_data == (uint8 *) MAP_FAILED) return (0);
 
 	temp = ROWS * COLS;
 	ue = yuv_data + temp;