From a3118e8c6826349b3fc54da3850d6dea994a3a35 Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 16 Jan 1997 21:58:40 +0000 Subject: 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 --- usr.sbin/ctm/mkCTM/mkctm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'usr.sbin/ctm') diff --git a/usr.sbin/ctm/mkCTM/mkctm.c b/usr.sbin/ctm/mkCTM/mkctm.c index 24c3aaa..698d114 100644 --- a/usr.sbin/ctm/mkCTM/mkctm.c +++ b/usr.sbin/ctm/mkCTM/mkctm.c @@ -179,11 +179,11 @@ Equ(const char *dir1, const char *dir2, const char *name, struct dirent *de) } #endif p1=mmap(0, s1.st_size, PROT_READ, MAP_PRIVATE, fd1, 0); - if ((int)p1 == -1) { perror(buf1); exit(3); } + if (p1 == (u_char *)MAP_FAILED) { perror(buf1); exit(3); } close(fd1); p2=mmap(0, s2.st_size, PROT_READ, MAP_PRIVATE, fd2, 0); - if ((int)p2 == -1) { perror(buf2); exit(3); } + if (p2 == (u_char *)MAP_FAILED) { perror(buf2); exit(3); } close(fd2); /* If identical, we're done. */ @@ -322,7 +322,7 @@ Add(const char *dir1, const char *dir2, const char *name, struct dirent *de) if (fd1 < 0) {perror(buf2); exit (3); } fstat(fd1, &st); p1=mmap(0, st.st_size, PROT_READ, MAP_PRIVATE, fd1, 0); - if ((int)p1 == -1) { perror(buf2); exit(3); } + if (p1 == (u_char *)MAP_FAILED) { perror(buf2); exit(3); } close(fd1); m2 = MD5Data(p1, st.st_size, md5_2); name_stat("CTMFM", dir2, name, de); -- cgit v1.1