Changeset 58195 in vbox for trunk/src/VBox/Additions/darwin/vboxfs

Timestamp:

Oct 12, 2015 3:13:47 PM (9 years ago)

Author:

vboxsync

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

103309

Message:

VBoxGuestR0LibSharedFolders: Prefixed functions ('vbox' wasn't a very good one). Hope I found all places these functions are called...

Location:

trunk/src/VBox/Additions/darwin/vboxfs

Files:

• VBoxVFS-VFSOps.cpp (modified) (5 diffs)
• VBoxVFS-VNODEOps.cpp (modified) (4 diffs)
• VBoxVFS-utils.cpp (modified) (3 diffs)
• VBoxVFS.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/darwin/vboxfs/VBoxVFS-VFSOps.cpp

@@ -286 +286 @@
     if (pMount)
     {
-        rc = vboxCallMapFolder(&g_vboxSFClient, pMount->pShareName, &pMount->pMap);
+        rc = VbglR0SfMapFolder(&g_vboxSFClient, pMount->pShareName, &pMount->pMap);
         if (RT_SUCCESS(rc))
         {
@@ -302 +302 @@
             return 0;
         }
-        else
-            PDEBUG("Unable to map shared folder");
-
+
+        PDEBUG("Unable to map shared folder");
         vboxvfs_destroy_internal_data(&pMount);
     }
@@ -354 +353 @@
                 vfs_setfsprivate(mp, NULL);
 
-                rc = vboxCallUnmapFolder(&g_vboxSFClient, &pMount->pMap);
+                rc = VbglR0SfUnmapFolder(&g_vboxSFClient, &pMount->pMap);
                 if (RT_SUCCESS(rc))
                 {
@@ -361 +360 @@
                     return 0;
                 }
-                else
-                {
-                     PDEBUG("Unable to unmount shared folder");
-                     rc = EPROTO;
-                }
+
+                PDEBUG("Unable to unmount shared folder");
+                rc = EPROTO;
             }
             else
@@ -518 +515 @@
     AssertReturn(pMount->pShareName, EINVAL);
 
-    rc = vboxCallFSInfo(&g_vboxSFClient, &pMount->pMap, 0, SHFL_INFO_GET | SHFL_INFO_VOLUME,
-                            &cbBuffer, (PSHFLDIRINFO)&SHFLVolumeInfo);
+    rc = VbglR0SfFsInfo(&g_vboxSFClient, &pMount->pMap, 0, SHFL_INFO_GET | SHFL_INFO_VOLUME,
+                        &cbBuffer, (PSHFLDIRINFO)&SHFLVolumeInfo);
     AssertReturn(rc == 0, EPROTO);
 

trunk/src/VBox/Additions/darwin/vboxfs/VBoxVFS-VNODEOps.cpp

@@ -556 +556 @@
     PDEBUG("Exploring VBoxVFS directory (%s), handle (0x%.8X), offset (0x%X), count (%d)", (char *)pVnodeData->pPath->String.utf8, (int)pVnodeData->pHandle, index, uio_iovcnt(uio));
 
-    /* Currently, there is a problem when vboxCallDirInfo() is not able to
+    /* Currently, there is a problem when VbglR0SfDirInfo() is not able to
      * continue retrieve directory content if the same VBoxVFS handle is used.
      * This macro forces to use a new handle in readdir() callback. If enabled,
@@ -575 +575 @@
 
 #if 0
-    rc = vboxCallDirInfo(&g_vboxSFClient, &pMount->pMap, Handle, 0, 0, index, &cbInfo, (PSHFLDIRINFO)Info, &cFiles);
+    rc = VbglR0SfDirInfo(&g_vboxSFClient, &pMount->pMap, Handle, 0, 0, index, &cbInfo, (PSHFLDIRINFO)Info, &cFiles);
 #else
     SHFLSTRING *pMask = vboxvfs_construct_shflstring("*", strlen("*"));
@@ -582 +582 @@
         for (uint32_t cSkip = 0; (cSkip < index + 1) && (rc == VINF_SUCCESS); cSkip++)
         {
-            //rc = vboxCallDirInfo(&g_vboxSFClient, &pMount->pMap, Handle, 0 /* pMask */, 0 /* SHFL_LIST_RETURN_ONE */, 0, &cbInfo, (PSHFLDIRINFO)Info, &cFiles);
+            //rc = VbglR0SfDirInfo(&g_vboxSFClient, &pMount->pMap, Handle, 0 /* pMask */, 0 /* SHFL_LIST_RETURN_ONE */, 0, &cbInfo, (PSHFLDIRINFO)Info, &cFiles);
 
             uint32_t cbReturned = cbInfo;
-            //rc = vboxCallDirInfo(&g_vboxSFClient, &pMount->pMap, Handle, pMask, SHFL_LIST_RETURN_ONE, 0, &cbReturned, (PSHFLDIRINFO)Info, &cFiles);
-            rc = vboxCallDirInfo(&g_vboxSFClient, &pMount->pMap, Handle, 0, SHFL_LIST_RETURN_ONE, 0, &cbReturned, (PSHFLDIRINFO)Info, &cFiles);
+            //rc = VbglR0SfDirInfo(&g_vboxSFClient, &pMount->pMap, Handle, pMask, SHFL_LIST_RETURN_ONE, 0, &cbReturned, (PSHFLDIRINFO)Info, &cFiles);
+            rc = VbglR0SfDirInfo(&g_vboxSFClient, &pMount->pMap, Handle, 0, SHFL_LIST_RETURN_ONE, 0,
+                                 &cbReturned, (PSHFLDIRINFO)Info, &cFiles);
 
         }
@@ -624 +625 @@
         default:
         {
-            PDEBUG("vboxCallDirInfo() for item #%d has failed: %d", (int)index, (int)rc);
+            PDEBUG("VbglR0SfDirInfo() for item #%d has failed: %d", (int)index, (int)rc);
             rc = EINVAL;
             break;

trunk/src/VBox/Additions/darwin/vboxfs/VBoxVFS-utils.cpp

@@ -400 +400 @@
     parms.CreateFlags   = fFlags;
 
-    rc = vboxCallCreate(&g_vboxSFClient, &pMount->pMap, pPath, &parms);
+    rc = VbglR0SfCreate(&g_vboxSFClient, &pMount->pMap, pPath, &parms);
     if (RT_SUCCESS(rc))
     {
@@ -425 +425 @@
 {
     AssertReturn(pMount, EINVAL);
-    return vboxCallClose(&g_vboxSFClient, &pMount->pMap, pHandle);
+    return VbglR0SfClose(&g_vboxSFClient, &pMount->pMap, pHandle);
 }
 
@@ -455 +455 @@
     parms.CreateFlags = SHFL_CF_LOOKUP | SHFL_CF_ACT_FAIL_IF_NEW;
 
-    rc = vboxCallCreate(&g_vboxSFClient, &pMount->pMap, pSHFLDPath, &parms);
+    rc = VbglR0SfCreate(&g_vboxSFClient, &pMount->pMap, pSHFLDPath, &parms);
     if (rc == 0)
-    {
         *Info = parms.Info;
-    }
 
     return rc;

trunk/src/VBox/Additions/darwin/vboxfs/VBoxVFS.cpp

@@ -105 +105 @@
     /* Initialize the R0 guest library. */
 #if 0
-    rc = vboxInit();
+    rc = VbglR0SfInit();
     if (RT_FAILURE(rc))
         return KERN_FAILURE;
@@ -125 +125 @@
 
 #if 0
-    vboxUninit();
+   VbglR0SfTerminate();
 #endif
 
-    PINFO("VirtualBox " VBOX_VERSION_STRING " shared folders "
-          "driver is unloaded");
+    PINFO("VirtualBox " VBOX_VERSION_STRING " shared folders driver is unloaded");
 
     return KERN_SUCCESS;
@@ -220 +219 @@
     if (coreService)
     {
-        rc = vboxInit();
+        rc = VbglR0SfInit();
         if (RT_SUCCESS(rc))
         {
             /* Connect to the host service. */
-            rc = vboxConnect(&g_vboxSFClient);
+            rc = VbglR0SfConnect(&g_vboxSFClient);
             if (RT_SUCCESS(rc))
             {
                 PINFO("VBox client connected");
-                rc = vboxCallSetUtf8(&g_vboxSFClient);
+                rc = VbglR0SfSetUtf8(&g_vboxSFClient);
                 if (RT_SUCCESS(rc))
                 {
@@ -242 +241 @@
                 else
                 {
-                    PERROR("vboxCallSetUtf8 failed: rc=%d", rc);
+                    PERROR("VbglR0SfSetUtf8 failed: rc=%d", rc);
                 }
-                vboxDisconnect(&g_vboxSFClient);
+                VbglR0SfDisconnect(&g_vboxSFClient);
             }
             else
@@ -250 +249 @@
                 PERROR("Failed to get connection to host: rc=%d", rc);
             }
-            vboxUninit();
+            VbglR0SfUninit();
         }
         else
@@ -286 +285 @@
     }
 
-    vboxDisconnect(&g_vboxSFClient);
+    VbglR0SfDisconnect(&g_vboxSFClient);
     PINFO("VBox client disconnected");
 
-    vboxUninit();
+    VbglR0SfTerminate();
     PINFO("Low level uninit done");