Changeset 21176 in vbox for trunk/src/VBox/HostServices

Timestamp:

Jul 2, 2009 4:05:49 PM (16 years ago)

Author:

vboxsync

Message:

Shared folders host service: fixed gcc warnings about signed / unsigned mismatch

File:

• trunk/src/VBox/HostServices/SharedFolders/mappings.cpp (modified) (14 diffs)

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

@@ -33 +33 @@
 void vbsfMappingInit(void)
 {
-    int root;
+    unsigned root;
+
     for (root = 0; root < RT_ELEMENTS(aIndexFromRoot); root++)
     {
-        aIndexFromRoot[root] = ~0;
+        aIndexFromRoot[root] = SHFL_ROOT_NIL;
     }
 }
@@ -54 +55 @@
     }
 
-    int i;
-
+    SHFLROOT i;
     for (i = 0; i < RT_ELEMENTS(FolderMapping); i++)
     {
@@ -82 +82 @@
     if (root < RT_ELEMENTS(aIndexFromRoot))
     {
-        int iMapping = aIndexFromRoot[root];
-
-        if (0 <= iMapping && iMapping < RT_ELEMENTS(FolderMapping))
+        SHFLROOT iMapping = aIndexFromRoot[root];
+
+        if (   iMapping != SHFL_ROOT_NIL
+            && iMapping < RT_ELEMENTS(FolderMapping))
         {
             return &FolderMapping[iMapping];
@@ -93 +94 @@
 }
 
-static SHFLROOT vbsfMappingGetRootFromIndex(int iMapping)
-{
-    int root;
+static SHFLROOT vbsfMappingGetRootFromIndex(SHFLROOT iMapping)
+{
+    unsigned root;
+
     for (root = 0; root < RT_ELEMENTS(aIndexFromRoot); root++)
     {
@@ -104 +106 @@
     }
 
-    return ~0;
+    return SHFL_ROOT_NIL;
 }
 
 static MAPPING *vbsfMappingGetByName (PRTUTF16 utf16Name, SHFLROOT *pRoot)
 {
-    int i;
-
-    for (i=0;i<SHFL_MAX_MAPPINGS;i++)
+    unsigned i;
+
+    for (i=0; i<SHFL_MAX_MAPPINGS; i++)
     {
         if (FolderMapping[i].fValid == true)
@@ -119 +121 @@
                 SHFLROOT root = vbsfMappingGetRootFromIndex(i);
                 
-                if (root != ~0)
+                if (root != SHFL_ROOT_NIL)
                 {
                     if (pRoot)
@@ -138 +140 @@
 }
 
-static void vbsfRootHandleAdd(int iMapping)
-{
-    int root;
+static void vbsfRootHandleAdd(SHFLROOT iMapping)
+{
+    unsigned root;
 
     for (root = 0; root < RT_ELEMENTS(aIndexFromRoot); root++)
     {
-        if (aIndexFromRoot[root] == ~0)
+        if (aIndexFromRoot[root] == SHFL_ROOT_NIL)
         {
             aIndexFromRoot[root] = iMapping;
@@ -152 +154 @@
 
     AssertFailed();
-    return;
-}
-
-static void vbsfRootHandleRemove(int iMapping)
-{
-    int root;
+}
+
+static void vbsfRootHandleRemove(SHFLROOT iMapping)
+{
+    unsigned root;
 
     for (root = 0; root < RT_ELEMENTS(aIndexFromRoot); root++)
@@ -163 +164 @@
         if (aIndexFromRoot[root] == iMapping)
         {
-            aIndexFromRoot[root] = ~0;
+            aIndexFromRoot[root] = SHFL_ROOT_NIL;
             return;
         }
@@ -169 +170 @@
 
     AssertFailed();
-    return;
 }
 
@@ -181 +181 @@
 int vbsfMappingsAdd (PSHFLSTRING pFolderName, PSHFLSTRING pMapName, uint32_t fWritable)
 {
-    int i;
+    unsigned i;
 
     Assert(pFolderName && pMapName);
@@ -188 +188 @@
 
     /* check for duplicates */
-    for (i=0;i<SHFL_MAX_MAPPINGS;i++)
+    for (i=0; i<SHFL_MAX_MAPPINGS; i++)
     {
         if (FolderMapping[i].fValid == true)
@@ -200 +200 @@
     }
 
-    for (i=0;i<SHFL_MAX_MAPPINGS;i++)
+    for (i=0; i<SHFL_MAX_MAPPINGS; i++)
     {
         if (FolderMapping[i].fValid == false)
@@ -261 +261 @@
 int vbsfMappingsRemove (PSHFLSTRING pMapName)
 {
-    int i;
+    unsigned i;
 
     Assert(pMapName);
 
     Log(("vbsfMappingsRemove %ls\n", pMapName->String.ucs2));
-    for (i=0;i<SHFL_MAX_MAPPINGS;i++)
+    for (i=0; i<SHFL_MAX_MAPPINGS; i++)
     {
         if (FolderMapping[i].fValid == true)