[libvirt PATCH 02/14] vbox: remove VBoxCGlueTerm

Ján Tomko jtomko at redhat.com
Wed Sep 23 18:14:51 UTC 2020


cppcheck reports:
  src/vbox/vbox_XPCOMCGlue.c:226:21: style:
  The statement 'if (hVBoxXPCOMC!=NULL) hVBoxXPCOMC=NULL' is
  logically equivalent to 'hVBoxXPCOMC=NULL'.
  [duplicateConditionalAssign]

It does not matter anyway because this function
is never called.

Fixes: e1506cb4eb7eab96e7ded27a23f0d8ac9697ac2a
Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
 src/vbox/vbox_XPCOMCGlue.c | 19 -------------------
 src/vbox/vbox_XPCOMCGlue.h |  1 -
 2 files changed, 20 deletions(-)

diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c
index 3cbb679110..2936ff0edb 100644
--- a/src/vbox/vbox_XPCOMCGlue.c
+++ b/src/vbox/vbox_XPCOMCGlue.c
@@ -217,25 +217,6 @@ VBoxCGlueInit(unsigned int *version)
 }
 
 
-/**
- * Terminate the C glue library.
- */
-void
-VBoxCGlueTerm(void)
-{
-    if (hVBoxXPCOMC != NULL) {
-#if 0 /* VBoxRT.so doesn't like being reloaded. See @bugref{3725}. */
-        dlclose(g_hVBoxXPCOMC);
-#endif
-        hVBoxXPCOMC = NULL;
-    }
-
-    pVBoxFuncs_v2_2 = NULL;
-    g_pfnGetFunctions = NULL;
-}
-
-
-
 /*
  * In XPCOM an array is represented by 1) a pointer to an array of pointers
  * that point to the items and 2) an unsigned int representing the number of
diff --git a/src/vbox/vbox_XPCOMCGlue.h b/src/vbox/vbox_XPCOMCGlue.h
index 517b02393f..d0e579482e 100644
--- a/src/vbox/vbox_XPCOMCGlue.h
+++ b/src/vbox/vbox_XPCOMCGlue.h
@@ -36,7 +36,6 @@
 extern PFNVBOXGETXPCOMCFUNCTIONS g_pfnGetFunctions;
 
 int VBoxCGlueInit(unsigned int *version);
-void VBoxCGlueTerm(void);
 
 typedef struct _vboxArray vboxArray;
 
-- 
2.26.2




More information about the libvir-list mailing list