Changeset 106503 in vbox

Timestamp:

Oct 19, 2024 3:20:22 AM (4 months ago)

Author:

vboxsync

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

165335

Message:

GuestHost/Install/VBoxWinDrvInst.cpp: Unused variable warnings. jiraref:VBP-1171

File:

• trunk/src/VBox/GuestHost/installation/VBoxWinDrvInst.cpp (modified) (3 diffs)

trunk/src/VBox/GuestHost/installation/VBoxWinDrvInst.cpp

@@ -1428 +1428 @@
 static int vboxWinDrvUninstallPerform(PVBOXWINDRVINSTINTERNAL pCtx, PVBOXWINDRVINSTPARMS pParms)
 {
-    int rc = VINF_SUCCESS;
-
-    uint64_t const uNtVer = RTSystemGetNtVersion();
-
+    int rc;
     switch (pParms->enmMode)
     {
@@ -1459 +1456 @@
 
         default:
+            rc = VINF_SUCCESS;
             break;
     }
@@ -1477 +1475 @@
     AssertReturn(!(pParms->fFlags & ~VBOX_WIN_DRIVERINSTALL_F_VALID_MASK), VERR_INVALID_PARAMETER);
 
-    bool const fInstall =    pParms->enmMode == (VBOXWINDRVINSTMODE_INSTALL)
-                          || pParms->enmMode == (VBOXWINDRVINSTMODE_INSTALL_INFSECTION);
-
-    uint64_t const uNtVer   = RTSystemGetNtVersion();
-
+    bool const fInstall = pParms->enmMode == VBOXWINDRVINSTMODE_INSTALL
+                       || pParms->enmMode == VBOXWINDRVINSTMODE_INSTALL_INFSECTION;
+
+    const char * const pszLogAction = fInstall ? "Installing" : "Uninstalling";
     if (pParms->pwszInfFile)
-        vboxWinDrvInstLogInfo(pCtx, "%s driver \"%ls\" ... ", fInstall ? "Installing" : "Uninstalling", pParms->pwszInfFile);
+        vboxWinDrvInstLogInfo(pCtx, "%s driver \"%ls\" ... ", pszLogAction, pParms->pwszInfFile);
     else if (pParms->u.UnInstall.pwszModel)
-        vboxWinDrvInstLogInfo(pCtx, "%s driver model \"%ls\" ... ", fInstall ? "Installing" : "Uninstalling",
-                              pParms->u.UnInstall.pwszModel);
+        vboxWinDrvInstLogInfo(pCtx, "%s driver model \"%ls\" ... ", pszLogAction, pParms->u.UnInstall.pwszModel);
     else if (pParms->u.UnInstall.pwszPnpId)
-        vboxWinDrvInstLogInfo(pCtx, "%s PnP ID \"%ls\" ... ", fInstall ? "Installing" : "Uninstalling",
-                              pParms->u.UnInstall.pwszPnpId);
+        vboxWinDrvInstLogInfo(pCtx, "%s PnP ID \"%ls\" ... ", pszLogAction, pParms->u.UnInstall.pwszPnpId);
 
     if (   pParms->fFlags & VBOX_WIN_DRIVERINSTALL_F_SILENT