Changeset 60606 in vbox for trunk/src/VBox/Main/src-server/freebsd/USBProxyBackendFreeBSD.cpp

Timestamp:

Apr 20, 2016 4:09:24 PM (9 years ago)

Author:

vboxsync

Message:

Main/USBProxyBackend-freebsd.cpp: Fixes

File:

• trunk/src/VBox/Main/src-server/freebsd/USBProxyBackendFreeBSD.cpp (modified) (8 diffs)

trunk/src/VBox/Main/src-server/freebsd/USBProxyBackendFreeBSD.cpp

@@ -60 +60 @@
  * Initialize data members.
  */
-USBProxyBackendFreeBSD::USBProxyBackendFreeBSD(USBProxyService *aUsbProxyService, const com::Utf8Str &strId)
-    : USBProxyBackend(aUsbProxyService, strId)
-{
-    LogFlowThisFunc(("aUsbProxyService=%p\n", aUsbProxyService));
-}
-
+USBProxyBackendFreeBSD::USBProxyBackendFreeBSD()
+    : USBProxyBackend(), mNotifyEventSem(NIL_RTSEMEVENT)
+{
+    LogFlowThisFunc(("\n"));
+}
+
+USBProxyBackendFreeBSD::~USBProxyBackendFreeBSD()
+{
+    LogFlowThisFunc(("\n"));
+}
 
 /**
@@ -72 +76 @@
  * @returns S_OK on success and non-fatal failures, some COM error otherwise.
  */
-int USBProxyBackendFreeBSD::init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddresss)
+int USBProxyBackendFreeBSD::init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress)
 {
     USBProxyBackend::init(pUsbProxyService, strId, strAddress);
@@ -96 +100 @@
  * Stop all service threads and free the device chain.
  */
-USBProxyBackendFreeBSD::~USBProxyBackendFreeBSD()
+void USBProxyBackendFreeBSD::uninit()
 {
     LogFlowThisFunc(("\n"));
@@ -108 +112 @@
     RTSemEventDestroy(mNotifyEventSem);
     mNotifyEventSem = NULL;
+    USBProxyBackend::uninit();
 }
 
@@ -236 +241 @@
         rc = RTStrAPrintf(&pszDevicePath, "/dev/%s%d.%d", USB_GENERIC_NAME, iBus, iAddr);
         if (RT_FAILURE(rc))
-        {
-            mLastError = rc;
             break;
-        }
 
         LogFlowFunc((": Opening %s\n", pszDevicePath));
@@ -246 +248 @@
         if (FileUsb < 0)
         {
-            if (   (errno != ENOENT)
-                && (errno != EACCES))
-                mLastError = RTErrConvertFromErrno(errno);
-
             RTStrFree(pszDevicePath);
 
@@ -277 +275 @@
         {
             LogFlowFunc((": Error querying device info rc=%Rrc\n", RTErrConvertFromErrno(errno)));
-            mLastError = RTErrConvertFromErrno(errno);
             close(FileUsb);
             RTStrFree(pszDevicePath);
@@ -289 +286 @@
             if (!pDevice)
             {
-                mLastError = VERR_NO_MEMORY;
                 close(FileUsb);
                 RTStrFree(pszDevicePath);