Changeset 63295 in vbox

Timestamp:

Aug 10, 2016 4:04:41 PM (8 years ago)

Author:

vboxsync

Message:

VBoxBugReport: warnings

File:

• trunk/src/VBox/Frontends/VBoxBugReport/VBoxBugReportWin.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VBoxBugReport/VBoxBugReportWin.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBoxBugReportWin - VirtualBox command-line diagnostics tool,
- * Windows-specific part.
+ * VBoxBugReportWin - VirtualBox command-line diagnostics tool, Windows-specific part.
  */
 
@@ -225 +224 @@
 public:
     ErrorHandler(const char *pszFunction, int iLine)
-        : m_function(pszFunction), m_line(iLine) {};
+        : m_function(pszFunction), m_line(iLine)
+    { }
+
     void handleWinError(DWORD uError, const char *pszMsgFmt, ...)
+    {
+        if (uError != ERROR_SUCCESS)
         {
-            if (uError != ERROR_SUCCESS)
-            {
-                va_list va;
-                va_start(va, pszMsgFmt);
-                RTCString msgArgs(pszMsgFmt, va);
-                va_end(va);
-                LPSTR pBuf = NULL;
-                DWORD cb = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-                                          NULL, uError, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&pBuf, 0, NULL);
-                RTCStringFmt msg("%s at %s(%d): err=%u %s", msgArgs.c_str(), m_function, m_line, uError, pBuf);
-                LocalFree(pBuf);
-                throw RTCError(msg.c_str());
-            }
-        };
+            va_list va;
+            va_start(va, pszMsgFmt);
+            RTCString msgArgs(pszMsgFmt, va);
+            va_end(va);
+
+            LPSTR pBuf = NULL;
+            FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+                           NULL, uError, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&pBuf, 0, NULL);
+            RTCStringFmt msg("%s at %s(%d): err=%u %s", msgArgs.c_str(), m_function, m_line, uError, pBuf);
+            LocalFree(pBuf);
+            throw RTCError(msg.c_str());
+        }
+    }
+
 private:
     const char *m_function;
@@ -254 +257 @@
     BugReportUsbTreeWin();
     virtual ~BugReportUsbTreeWin();
-    virtual PRTSTREAM getStream(void) { enumerate(); return BugReportStream::getStream(); };
+    virtual PRTSTREAM getStream(void) { enumerate(); return BugReportStream::getStream(); }
 private:
     class AutoHandle {
     public:
-        AutoHandle(HANDLE h) { m_h = h; };
-        ~AutoHandle() { close(); };
-        bool isValid() { return m_h != INVALID_HANDLE_VALUE; };
-        operator HANDLE() { return m_h; };
-        void close(void) { if (isValid()) { CloseHandle(m_h); m_h = INVALID_HANDLE_VALUE; } };
+        AutoHandle(HANDLE h) { m_h = h; }
+        ~AutoHandle() { close(); }
+        bool isValid() { return m_h != INVALID_HANDLE_VALUE; }
+        operator HANDLE() { return m_h; }
+        void close(void)  {   if (isValid()) { CloseHandle(m_h); m_h = INVALID_HANDLE_VALUE; }    }
     private:
         HANDLE m_h;
@@ -339 +342 @@
 RTCString BugReportUsbTreeWin::getDeviceRegistryPropertyString(HDEVINFO hDev, PSP_DEVINFO_DATA pInfoData, DWORD uProperty)
 {
-    DWORD cbString = 0;
     PWSTR pUnicodeString = (PWSTR)getDeviceRegistryProperty(hDev, pInfoData, uProperty, REG_SZ, NULL);
 
@@ -489 +491 @@
 void BugReportUsbTreeWin::enumerateController(PSP_DEVINFO_DATA pInfoData, PSP_DEVICE_INTERFACE_DATA pInterfaceData)
 {
+    RT_NOREF(pInterfaceData);
     RTCString strCtrlDesc = getDeviceRegistryPropertyString(m_hDevInfo, pInfoData, SPDRP_DEVICEDESC);
     printf("%s\n", strCtrlDesc.c_str());
@@ -561 +564 @@
 void createBugReportOsSpecific(BugReport* report, const char *pszHome)
 {
+    RT_NOREF(pszHome);
     WCHAR szWinDir[MAX_PATH];