Changeset 23071 in vbox

Timestamp:

Sep 16, 2009 3:31:51 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

52407

Message:

VBoxFUSE.cpp: nitpicking.

File:

• trunk/src/VBox/ImageMounter/VBoxFUSE/VBoxFUSE.cpp (modified) (4 diffs)

trunk/src/VBox/ImageMounter/VBoxFUSE/VBoxFUSE.cpp

@@ -38 +38 @@
 # ifdef EBADMACHO
 #  define EDOOFUS EBADMACHO
+# elif defined(RT_OS_LINUX)
+#  define EDOOFUS   0x0fad8484d
 //# elif defined(EXYZ)
 //#  define EDOOFUS EXYZ
 # else
-#  define EDOOFUS 0xfad8484d
+#  error "Choose an unlikely and (if possible) fun error number for EDOOFUS."
 # endif
 #endif
@@ -1161 +1163 @@
     AssertReturn((unsigned)cbBuf == cbBuf, -EINVAL);
     AssertReturn(offFile >= 0, -EINVAL);
-    AssertReturn(offFile + (ssize_t)cbBuf >= offFile, -EINVAL);
+    AssertReturn((off_t)(offFile + cbBuf) >= offFile, -EINVAL);
 
     PVBOXFUSENODE pNode = (PVBOXFUSENODE)(uintptr_t)pInfo->fh;
@@ -1177 +1179 @@
 
             int rc;
-            if (offFile + (ssize_t)cbBuf < offFile)
+            if ((off_t)(offFile + cbBuf) < offFile)
                 rc = -EINVAL;
             else if (offFile >= pFlatImage->Node.cbPrimary)
@@ -1186 +1188 @@
             {
                 /* Adjust for EOF. */
-                if (offFile + (ssize_t)cbBuf >= pFlatImage->Node.cbPrimary)
+                if ((off_t)(offFile + cbBuf) >= pFlatImage->Node.cbPrimary)
                     cbBuf = pFlatImage->Node.cbPrimary - offFile;