Use MAP_FAILED instead of hardwired (void *)-1

diff --git a/lib/fsm.c b/lib/fsm.c
index 2bea993..3bddbc9 100644 (file)
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -878,7 +878,7 @@ static int writeFile(FSM_t fsm, int writeData)
     if (writeData && S_ISREG(st->st_mode)) {
 #ifdef HAVE_MMAP
        char * rdbuf = NULL;
-       void * mapped = (void *)-1;
+       void * mapped = MAP_FAILED;
        size_t nmapped;
        int xx;
 #endif
@@ -890,7 +890,7 @@ static int writeFile(FSM_t fsm, int writeData)
 #ifdef HAVE_MMAP
        nmapped = 0;
        mapped = mmap(NULL, st->st_size, PROT_READ, MAP_SHARED, Fileno(fsm->rfd), 0);
-       if (mapped != (void *)-1) {
+       if (mapped != MAP_FAILED) {
            rdbuf = fsm->rdbuf;
            fsm->rdbuf = (char *) mapped;
            fsm->rdlen = nmapped = st->st_size;
@@ -904,7 +904,7 @@ static int writeFile(FSM_t fsm, int writeData)
 
        while (left) {
 #ifdef HAVE_MMAP
-         if (mapped != (void *)-1) {
+         if (mapped != MAP_FAILED) {
            fsm->rdnb = nmapped;
          } else
 #endif
@@ -922,7 +922,7 @@ static int writeFile(FSM_t fsm, int writeData)
        }
 
 #ifdef HAVE_MMAP
-       if (mapped != (void *)-1) {
+       if (mapped != MAP_FAILED) {
            xx = msync(mapped, nmapped, MS_ASYNC);
 #if defined(MADV_DONTNEED)
            xx = madvise(mapped, nmapped, MADV_DONTNEED);

diff --git a/rpmio/rpmfileutil.c b/rpmio/rpmfileutil.c
index 19dc5eb..454d8e3 100644 (file)
--- a/rpmio/rpmfileutil.c
+++ b/rpmio/rpmfileutil.c
@@ -161,7 +161,7 @@ int rpmDoDigest(pgpHashAlgo algo, const char * fn,int asAscii,
 
        if (fsize) {
            mapped = mmap(NULL, fsize, PROT_READ, MAP_SHARED, fdno, 0);
-           if (mapped == (void *)-1) {
+           if (mapped == MAP_FAILED) {
                xx = close(fdno);
                rc = 1;
                break;