Changeset 14215 in vbox for trunk

Timestamp:

Nov 14, 2008 2:48:49 PM (16 years ago)

Author:

vboxsync

Message:

Fixed some warnings

Location:

trunk/src/VBox

Files:

• HostServices/SharedFolders/mappings.cpp (modified) (2 diffs)
• HostServices/SharedFolders/vbsf.cpp (modified) (7 diffs)
• Main/KeyboardImpl.cpp (modified) (1 diff)
• Main/hgcm/HGCM.cpp (modified) (1 diff)

trunk/src/VBox/HostServices/SharedFolders/mappings.cpp

@@ -77 +77 @@
             FolderMapping[i].fValid    = true;
             FolderMapping[i].cMappings = 0;
-            FolderMapping[i].fWritable = fWritable;
+            FolderMapping[i].fWritable = !!fWritable;
 
             /* Check if the host file system is case sensitive */
@@ -329 +329 @@
     Assert(FolderMapping[index].cMappings == 1 || FolderMapping[index].fGuestCaseSensitive == fCaseSensitive);
     FolderMapping[index].fGuestCaseSensitive = fCaseSensitive;
-    *pRoot = index;
+    *pRoot = (SHFLROOT)index;
     return VINF_SUCCESS;
 }

trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp

@@ -108 +108 @@
     Log2(("vbsfCorrectCasing: %s %s\n", pszFullPath, pszStartComponent));
 
-    cbComponent = strlen(pszStartComponent);
+    cbComponent = (uint32_t) strlen(pszStartComponent);
 
     cbDirEntry = 4096;
@@ -223 +223 @@
 
                 if (pcbFullPathRoot)
-                    *pcbFullPathRoot = cbUtf8Root; /* Must index the path delimiter.  */
+                    *pcbFullPathRoot = (uint32_t)cbUtf8Root; /* Must index the path delimiter.  */
             }
 
@@ -301 +301 @@
             char *dst = pszFullPath;
 
-            cbRoot = strlen(dst);
+            cbRoot = (uint32_t)strlen(dst);
             if (dst[cbRoot - 1] != RTPATH_DELIMITER)
             {
@@ -346 +346 @@
                 }
 
-                uint32_t l = strlen (dst);
+                uint32_t l = (uint32_t)strlen (dst);
 
                 cb -= l;
@@ -375 +375 @@
             {
                 /* strip off the last path component, that contains the wildcard(s) */
-                uint32_t len = strlen(pszFullPath);
+                uint32_t len = (uint32_t)strlen(pszFullPath);
                 char    *src = pszFullPath + len - 1;
 
@@ -412 +412 @@
             if (rc == VERR_FILE_NOT_FOUND || rc == VERR_PATH_NOT_FOUND)
             {
-                uint32_t len = strlen(pszFullPath);
+                uint32_t len = (uint32_t)strlen(pszFullPath);
                 char    *src = pszFullPath + len - 1;
 
@@ -1414 +1414 @@
                         }
 #endif
-            pSFDEntry->name.u16Length = RTUtf16Len (pSFDEntry->name.String.ucs2) * 2;
+            pSFDEntry->name.u16Length = (uint32_t)RTUtf16Len (pSFDEntry->name.String.ucs2) * 2;
             pSFDEntry->name.u16Size = pSFDEntry->name.u16Length + 2;
 

trunk/src/VBox/Main/KeyboardImpl.cpp

@@ -187 +187 @@
     /// @todo is it actually possible that not all scancodes can be transmitted?
     if (codesStored)
-        *codesStored = keys.size();
+        *codesStored = (uint32_t)keys.size();
 
     return rc;

trunk/src/VBox/Main/hgcm/HGCM.cpp

@@ -1111 +1111 @@
 
         /* Save the length of the service name. */
-        rc = SSMR3PutU32(pSSM, strlen(pSvc->m_pszSvcName) + 1);
+        rc = SSMR3PutU32(pSSM, (uint32_t) strlen(pSvc->m_pszSvcName) + 1);
         AssertRCReturn(rc, rc);