儲存庫 vbox 的更動 67018

時間撮記:

2017-5-22 下午02:55:44 (8 年 以前)

作者:

vboxsync

訊息:

HostServices/SharedFolders: coding style (use 'g' as prefix for global variables)

檔案:

• trunk/src/VBox/HostServices/SharedFolders/shflhandle.cpp (修改) (7 筆差異)

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

@@ -35 +35 @@
 } SHFLINTHANDLE, *PSHFLINTHANDLE;
 
-static SHFLINTHANDLE *pHandles = NULL;
-static int32_t        lastHandleIndex = 0;
-static RTCRITSECT     lock;
+static SHFLINTHANDLE *g_pHandles = NULL;
+static int32_t        gLastHandleIndex = 0;
+static RTCRITSECT     gLock;
 
 int vbsfInitHandleTable()
 {
-    pHandles = (SHFLINTHANDLE *)RTMemAllocZ (sizeof (SHFLINTHANDLE) * SHFLHANDLE_MAX);
-    if (pHandles == NULL)
+    g_pHandles = (SHFLINTHANDLE *)RTMemAllocZ (sizeof (SHFLINTHANDLE) * SHFLHANDLE_MAX);
+    if (!g_pHandles)
     {
         AssertFailed();
@@ -49 +49 @@
 
     /* Never return handle 0 */
-    pHandles[0].uFlags = SHFL_HF_TYPE_DONTUSE;
-    lastHandleIndex    = 1;
-
-    return RTCritSectInit(&lock);
+    g_pHandles[0].uFlags = SHFL_HF_TYPE_DONTUSE;
+    gLastHandleIndex     = 1;
+
+    return RTCritSectInit(&gLock);
 }
 
 int vbsfFreeHandleTable()
 {
-    if (pHandles)
-        RTMemFree(pHandles);
-
-    pHandles = NULL;
-
-    if (RTCritSectIsInitialized(&lock))
-        RTCritSectDelete(&lock);
+    if (g_pHandles)
+        RTMemFree(g_pHandles);
+
+    g_pHandles = NULL;
+
+    if (RTCritSectIsInitialized(&gLock))
+        RTCritSectDelete(&gLock);
 
     return VINF_SUCCESS;
@@ -75 +75 @@
     Assert((uType & SHFL_HF_TYPE_MASK) != 0 && pvUserData);
 
-    RTCritSectEnter(&lock);
+    RTCritSectEnter(&gLock);
 
     /* Find next free handle */
-    if(lastHandleIndex >= SHFLHANDLE_MAX-1)
-    {
-        lastHandleIndex = 1;
-    }
+    if (gLastHandleIndex >= SHFLHANDLE_MAX-1)
+        gLastHandleIndex = 1;
 
     /* Nice linear search */
-    for(handle=lastHandleIndex;handle<SHFLHANDLE_MAX;handle++)
-    {
-        if(pHandles[handle].pvUserData == 0)
+    for(handle=gLastHandleIndex;handle<SHFLHANDLE_MAX;handle++)
+    {
+        if (g_pHandles[handle].pvUserData == 0)
         {
-            lastHandleIndex = handle;
+            gLastHandleIndex = handle;
             break;
         }
     }
 
-    if(handle == SHFLHANDLE_MAX)
+    if (handle == SHFLHANDLE_MAX)
     {
         /* Try once more from the start */
         for(handle=1;handle<SHFLHANDLE_MAX;handle++)
         {
-            if(pHandles[handle].pvUserData == 0)
+            if (g_pHandles[handle].pvUserData == 0)
             {
-                lastHandleIndex = handle;
+                gLastHandleIndex = handle;
                 break;
             }
         }
-        if(handle == SHFLHANDLE_MAX)
-        { /* Out of handles */
-            RTCritSectLeave(&lock);
+        if (handle == SHFLHANDLE_MAX)
+        {
+            /* Out of handles */
+            RTCritSectLeave(&gLock);
             AssertFailed();
             return SHFL_HANDLE_NIL;
         }
     }
-    pHandles[handle].uFlags     = (uType & SHFL_HF_TYPE_MASK) | SHFL_HF_VALID;
-    pHandles[handle].pvUserData = pvUserData;
-    pHandles[handle].pClient    = pClient;
-
-    lastHandleIndex++;
-
-    RTCritSectLeave(&lock);
+    g_pHandles[handle].uFlags     = (uType & SHFL_HF_TYPE_MASK) | SHFL_HF_VALID;
+    g_pHandles[handle].pvUserData = pvUserData;
+    g_pHandles[handle].pClient    = pClient;
+
+    gLastHandleIndex++;
+
+    RTCritSectLeave(&gLock);
 
     return handle;
@@ -125 +124 @@
 {
     if (   handle < SHFLHANDLE_MAX
-        && (pHandles[handle].uFlags & SHFL_HF_VALID)
-        && pHandles[handle].pClient == pClient)
-    {
-        pHandles[handle].uFlags     = 0;
-        pHandles[handle].pvUserData = 0;
-        pHandles[handle].pClient    = 0;
+        && (g_pHandles[handle].uFlags & SHFL_HF_VALID)
+        && g_pHandles[handle].pClient == pClient)
+    {
+        g_pHandles[handle].uFlags     = 0;
+        g_pHandles[handle].pvUserData = 0;
+        g_pHandles[handle].pClient    = 0;
         return VINF_SUCCESS;
     }
@@ -140 +139 @@
 {
     if (   handle < SHFLHANDLE_MAX
-        && (pHandles[handle].uFlags & SHFL_HF_VALID)
-        && pHandles[handle].pClient == pClient)
+        && (g_pHandles[handle].uFlags & SHFL_HF_VALID)
+        && g_pHandles[handle].pClient == pClient)
     {
         Assert((uType & SHFL_HF_TYPE_MASK) != 0);
 
-        if (pHandles[handle].uFlags & uType)
-            return pHandles[handle].pvUserData;
+        if (g_pHandles[handle].uFlags & uType)
+            return g_pHandles[handle].pvUserData;
     }
     return 0;
@@ -166 +165 @@
 {
     if (   handle < SHFLHANDLE_MAX
-        && (pHandles[handle].uFlags & SHFL_HF_VALID)
-        && pHandles[handle].pClient == pClient)
-        return pHandles[handle].uFlags & SHFL_HF_TYPE_MASK;
-    else
-        return 0;
+        && (g_pHandles[handle].uFlags & SHFL_HF_VALID)
+        && g_pHandles[handle].pClient == pClient)
+        return g_pHandles[handle].uFlags & SHFL_HF_TYPE_MASK;
+
+    return 0;
 }
 
@@ -213 +212 @@
     else
         AssertFailed();
-
-    return;
-}
+}