Updating return/variable types

After running Clang’s analyzer on it there were quite a few places where there were mis-matched store sizes and signs.  I updated them so that the underlying code more closely-matches the OS APIs and the type change happens at the FUSE connection.

In this way, if FUSE ever updates the API to actually match the APIs of modern OSes, it’s a fix in one place.

Also, I updated read/write to return the total read/write value the OS returned rather than blindly return the request count.

Author: ahknight

src/fs.cpp

@@ -151,7 +151,7 @@ namespace fs
       return -1;
 
     dev = st.st_dev;
-    for(int i = 0, ei = srcmounts.size(); i != ei; i++)
+    for(size_t i = 0, ei = srcmounts.size(); i != ei; i++)
       {
         fs::path::make(&srcmounts[i],fusepath,fullpath);
 
@@ -241,7 +241,7 @@ namespace fs
         if(spaceavail <= mfs)
           continue;
 
-        mfs         = spaceavail;
+        mfs         = (fsblkcnt_t)spaceavail;
         mfsbasepath = &basepaths[i];
       }
 

src/fs_acl.cpp

@@ -30,7 +30,7 @@ namespace fs
     bool
     dir_has_defaults(const std::string &fullpath)
     {
-      int rv;
+      ssize_t rv;
       std::string dirpath = fullpath;
 
       fs::path::dirname(dirpath);

src/fs_base_getxattr.hpp

@@ -28,7 +28,7 @@ namespace fs
 {
   static
   inline
-  int
+  ssize_t
   lgetxattr(const std::string &path,
             const char        *attrname,
             void              *value,

src/fs_base_ioctl.hpp

@@ -26,9 +26,9 @@ namespace fs
   static
   inline
   int
-  ioctl(const int  fd,
-        const int  request,
-        void      *data)
+  ioctl(const int            fd,
+        const unsigned long  request,
+        void                *data)
   {
     return ::ioctl(fd,request,data);
   }

src/fs_base_listxattr.hpp

@@ -28,7 +28,7 @@ namespace fs
 {
   static
   inline
-  int
+  ssize_t
   llistxattr(const std::string &path,
              char              *list,
              const size_t       size)

src/fs_base_readlink.hpp

@@ -27,7 +27,7 @@ namespace fs
 {
   static
   inline
-  int
+  ssize_t
   readlink(const std::string &path,
            char              *buf,
            const size_t       bufsiz)

src/fs_clonefile.cpp

@@ -48,13 +48,13 @@
 using std::string;
 using std::vector;
 
-int
+ssize_t
 writen(const int     fd,
        const char   *buf,
        const size_t  count)
 {
   size_t nleft;
-  ssize_t nwritten;
+  ssize_t nwritten = 0;
 
   nleft = count;
   while(nleft > 0)
@@ -67,24 +67,24 @@ writen(const int     fd,
           return -1;
         }
 
-      nleft -= nwritten;
-      buf   += nwritten;
+      nleft -= (size_t)nwritten;
+      buf   += (size_t)nwritten;
     }
 
-  return count;
+  return nwritten;
 }
 
 static
-int
+ssize_t
 copyfile_rw(const int    fdin,
             const int    fdout,
             const size_t count,
             const size_t blocksize)
 {
   ssize_t nr;
   ssize_t nw;
-  ssize_t bufsize;
-  size_t  totalwritten;
+  size_t  bufsize;
+  ssize_t totalwritten;
   vector<char> buf;
 
   bufsize = (blocksize * 16);
@@ -93,7 +93,7 @@ copyfile_rw(const int    fdin,
   fs::lseek(fdin,0,SEEK_SET);
 
   totalwritten = 0;
-  while(totalwritten < count)
+  while(totalwritten < (ssize_t)count)
     {
       nr = fs::read(fdin,&buf[0],bufsize);
       if(nr == -1)
@@ -103,29 +103,30 @@ copyfile_rw(const int    fdin,
           return -1;
         }
 
-      nw = writen(fdout,&buf[0],nr);
+      nw = writen(fdout,&buf[0],(size_t)nr);
       if(nw == -1)
         return -1;
 
       totalwritten += nw;
     }
 
-  return count;
+  return totalwritten;
 }
 
 static
-int
+ssize_t
 copydata(const int    fdin,
          const int    fdout,
          const size_t count,
          const size_t blocksize)
 {
-  int rv;
+  ssize_t rv;
+  off_t scount = (off_t)count;
+	
+  fs::fadvise(fdin,0,scount,POSIX_FADV_WILLNEED);
+  fs::fadvise(fdin,0,scount,POSIX_FADV_SEQUENTIAL);
 
-  fs::fadvise(fdin,0,count,POSIX_FADV_WILLNEED);
-  fs::fadvise(fdin,0,count,POSIX_FADV_SEQUENTIAL);
-
-  fs::fallocate(fdout,0,0,count);
+  fs::fallocate(fdout,0,0,scount);
 
   rv = fs::sendfile(fdin,fdout,count);
   if((rv == -1) && ((errno == EINVAL) || (errno == ENOSYS)))
@@ -153,18 +154,18 @@ ignorable_error(const int err)
 
 namespace fs
 {
-  int
+  ssize_t
   clonefile(const int fdin,
             const int fdout)
   {
-    int rv;
+    ssize_t rv;
     struct stat stin;
 
     rv = fs::fstat(fdin,stin);
     if(rv == -1)
       return -1;
 
-    rv = ::copydata(fdin,fdout,stin.st_size,stin.st_blksize);
+    rv = ::copydata(fdin,fdout,(size_t)stin.st_size,(size_t)stin.st_blksize);
     if(rv == -1)
       return -1;
 
@@ -191,11 +192,11 @@ namespace fs
     return 0;
   }
 
-  int
+  ssize_t
   clonefile(const string &in,
             const string &out)
   {
-    int rv;
+    ssize_t rv;
     int fdin;
     int fdout;
     int error;

src/fs_inode.hpp

@@ -34,7 +34,11 @@ namespace fs
     void
     recompute(struct stat &st)
     {
-      uint64_t st_dev = st.st_dev; /* Mac OS has a 32-bit device ID */
+      /*
+       Some OSes have 32-bit device IDs, so box this up first.
+       This does also presume a 64-bit inode value.
+       */
+      uint64_t st_dev = (uint64_t)st.st_dev;
       st.st_ino |= (st_dev << 32);
     }
   }

src/fs_movefile.cpp

@@ -66,7 +66,7 @@ namespace fs
       return -1;
 
     fdin_st.st_size += additional_size;
-    rv = fs::mfs(basepaths,fdin_st.st_size,fdout_path);
+    rv = fs::mfs(basepaths,(uint64_t)fdin_st.st_size,fdout_path);
     if(rv == -1)
       return -1;