Reserver the name 'err' for other purposes

fs/mmap/fs_munmap.c

@@ -115,7 +115,7 @@ int munmap(FAR void *start, size_t length)
   FAR void *newaddr;
   unsigned int offset;
   int ret;
-  int err;
+  int errcode;
 
   /* Find a region containing this start and length in the list of regions */
 
@@ -144,7 +144,7 @@ int munmap(FAR void *start, size_t length)
   if (!curr)
     {
       fdbg("Region not found\n");
-      err = EINVAL;
+      errcode = EINVAL;
       goto errout_with_semaphore;
     }
 
@@ -159,7 +159,7 @@ int munmap(FAR void *start, size_t length)
   if (offset + length < curr->length)
     {
       fdbg("Cannot umap without unmapping to the end\n");
-      err = ENOSYS;
+      errcode = ENOSYS;
       goto errout_with_semaphore;
     }
 
@@ -205,7 +205,7 @@ int munmap(FAR void *start, size_t length)
 
 errout_with_semaphore:
   sem_post(&g_rammaps.exclsem);
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 }
 

fs/mmap/fs_rammap.c

@@ -121,7 +121,7 @@ FAR void *rammap(int fd, size_t length, off_t offset)
   FAR uint8_t *rdbuffer;
   ssize_t nread;
   off_t fpos;
-  int err;
+  int errcode;
   int ret;
 
   /* There is a major design flaw that I have not yet thought of fix for:
@@ -143,7 +143,7 @@ FAR void *rammap(int fd, size_t length, off_t offset)
   if (!alloc)
     {
       fdbg("Region allocation failed, length: %d\n", (int)length);
-      err = ENOMEM;
+      errcode = ENOMEM;
       goto errout;
     }
 
@@ -165,7 +165,7 @@ FAR void *rammap(int fd, size_t length, off_t offset)
        */
 
       fdbg("Seek to position %d failed\n", (int)offset);
-      err = EINVAL;
+      errcode = EINVAL;
       goto errout_with_region;
     }
 
@@ -181,8 +181,8 @@ FAR void *rammap(int fd, size_t length, off_t offset)
            * signal.
            */
 
-          err = get_errno();
-          if (err != EINTR)
+          errcode = get_errno();
+          if (errcode != EINTR)
             {
               /* All other read errors are bad.  errno is already set.
                * (but maybe should be forced to EINVAL?).  NOTE that if
@@ -190,7 +190,7 @@ FAR void *rammap(int fd, size_t length, off_t offset)
                * destroy the errno value.
                */
 
-              fdbg("Read failed: offset=%d errno=%d\n", (int)offset, err);
+              fdbg("Read failed: offset=%d errno=%d\n", (int)offset, errcode);
 #ifdef CONFIG_DEBUG_FS
               goto errout_with_region;
 #else
@@ -234,7 +234,7 @@ FAR void *rammap(int fd, size_t length, off_t offset)
 errout_with_region:
   kumm_free(alloc);
 errout:
-  set_errno(err);
+  set_errno(errcode);
   return MAP_FAILED;
 
 errout_with_errno: