Changeset 63495 in vbox for trunk/src/VBox/Storage/VD.cpp

Timestamp:

Aug 15, 2016 5:19:46 PM (8 years ago)

Author:

vboxsync

Message:

warnings (clang)

File:

• trunk/src/VBox/Storage/VD.cpp (modified) (8 diffs)

trunk/src/VBox/Storage/VD.cpp

@@ -659 +659 @@
 /** Array of pointers to the filters backends. */
 static PCVDFILTERBACKEND *g_apFilterBackends = NULL;
+#ifndef VBOX_HDD_NO_DYNAMIC_BACKENDS
 /** Array of handles to the corresponding plugin. */
-static RTLDRMOD *g_ahFilterBackendPlugins = NULL;
+static PRTLDRMOD g_pahFilterBackendPlugins = NULL;
+#endif
 
 /** Forward declaration of the async discard helper. */
@@ -692 +694 @@
 }
 
+#ifndef VBOX_HDD_NO_DYNAMIC_BACKENDS
 /**
  * internal: add single backend.
@@ -699 +702 @@
     return vdAddBackends(hPlugin, &pBackend, 1);
 }
+#endif
 
 /**
@@ -723 +727 @@
 }
 
+#ifndef VBOX_HDD_NO_DYNAMIC_BACKENDS
+
 /**
  * internal: add single cache backend.
@@ -730 +736 @@
     return vdAddCacheBackends(hPlugin, &pBackend, 1);
 }
+
 
 /**
@@ -747 +754 @@
     g_apFilterBackends = pTmp;
 
-    RTLDRMOD *pTmpPlugins = (RTLDRMOD*)RTMemRealloc(g_ahFilterBackendPlugins,
-           (g_cFilterBackends + cBackends) * sizeof(RTLDRMOD));
+    PRTLDRMOD pTmpPlugins = (PRTLDRMOD)RTMemRealloc(g_pahFilterBackendPlugins,
+                                                    (g_cFilterBackends + cBackends) * sizeof(RTLDRMOD));
     if (RT_UNLIKELY(!pTmpPlugins))
         return VERR_NO_MEMORY;
 
-    g_ahFilterBackendPlugins = pTmpPlugins;
+    g_pahFilterBackendPlugins = pTmpPlugins;
     memcpy(&g_apFilterBackends[g_cFilterBackends], ppBackends, cBackends * sizeof(PCVDFILTERBACKEND));
     for (unsigned i = g_cFilterBackends; i < g_cFilterBackends + cBackends; i++)
-        g_ahFilterBackendPlugins[i] = hPlugin;
+        g_pahFilterBackendPlugins[i] = hPlugin;
     g_cFilterBackends += cBackends;
     return VINF_SUCCESS;
 }
+
 
 /**
@@ -771 +779 @@
     return vdAddFilterBackends(hPlugin, &pBackend, 1);
 }
+
+#endif /* VBOX_HDD_NO_DYNAMIC_BACKENDS*/
 
 /**
@@ -3647 +3657 @@
     for (unsigned i = 0; i < g_cFilterBackends; i++)
     {
-        while (i < g_cFilterBackends && g_ahFilterBackendPlugins[i] == pIt->hPlugin)
+        while (i < g_cFilterBackends && g_pahFilterBackendPlugins[i] == pIt->hPlugin)
         {
             memcpy(&g_apFilterBackends[i], &g_apFilterBackends[i + 1], (g_cFilterBackends - i - 1) * sizeof(PCVBOXHDDBACKEND));
-            memcpy(&g_ahFilterBackendPlugins[i], &g_ahFilterBackendPlugins[i + 1], (g_cFilterBackends - i - 1) * sizeof(RTLDRMOD));
+            memcpy(&g_pahFilterBackendPlugins[i], &g_pahFilterBackendPlugins[i + 1], (g_cFilterBackends - i - 1) * sizeof(RTLDRMOD));
             /** @todo for now skip reallocating, doesn't save much */
             g_cFilterBackends--;