Changeset 32262 in vbox for trunk/src/VBox

Timestamp:

Sep 6, 2010 11:37:00 PM (14 years ago)

Author:

vboxsync

Message:

Main/linux/vector container: simplification

Location:

trunk/src/VBox/Main

Files:

• include/HostHardwareLinux.h (modified) (1 diff)
• include/vector.h (modified) (4 diffs)
• linux/HostHardwareLinux.cpp (modified) (3 diffs)
• linux/USBProxyServiceLinux.cpp (modified) (1 diff)
• testcase/tstHostHardwareLinux.cpp (modified) (1 diff)

trunk/src/VBox/Main/include/HostHardwareLinux.h

@@ -142 +142 @@
 
 /** Constructor */
-static inline int VBoxMainUSBDevInfoInit(VBoxMainUSBDeviceInfo *pSelf)
-{
-    return VEC_INIT_OBJ(&pSelf->mvecDevInfo, USBDeviceInfo, USBDevInfoCleanup);
+static inline void VBoxMainUSBDevInfoInit(VBoxMainUSBDeviceInfo *pSelf)
+{
+    VEC_INIT_OBJ(&pSelf->mvecDevInfo, USBDeviceInfo, USBDevInfoCleanup);
 }
 

trunk/src/VBox/Main/include/vector.h

@@ -163 +163 @@
     pvec->muTypeHash = uTypeHash; \
     pvec->mpfnCleanup = pfnCleanup ? pfnCleanup : vecNoCleanup; \
-    pvec->mpvaElements = NULL; \
-    return VEC_EXPAND(pvec);
+    pvec->mpvaElements = NULL;
 
 /** Initialise a vector. */
-DECLINLINE(int) vecInitObj(VECTOR_OBJ *pvec, size_t cbElement,
-                             unsigned uTypeHash, void (*pfnCleanup)(void *))
+DECLINLINE(void) vecInitObj(VECTOR_OBJ *pvec, size_t cbElement,
+                            unsigned uTypeHash, void (*pfnCleanup)(void *))
 {
     VEC_INIT(pvec, cbElement, uTypeHash, pfnCleanup)
@@ -174 +173 @@
 
 /** Initialise a pointer vector. */
-DECLINLINE(int) vecInitPtr(VECTOR_PTR *pvec, size_t cbElement,
-                             unsigned uTypeHash, void (*pfnCleanup)(void *))
+DECLINLINE(void) vecInitPtr(VECTOR_PTR *pvec, size_t cbElement,
+                            unsigned uTypeHash, void (*pfnCleanup)(void *))
 {
     VEC_INIT(pvec, cbElement, uTypeHash, pfnCleanup)
@@ -212 +211 @@
 
 /**
- * Initialise a vector structure.
- * @returns iprt status code (VINF_SUCCESS or VERR_NO_MEMORY)
+ * Initialise a vector structure.  Always succeeds.
  * @param   pvec        pointer to an uninitialised vector structure
  * @param   type        the type of the objects in the vector.  As this is
@@ -227 +225 @@
 
 /**
- * Initialise a vector-of-pointers structure.
- * @returns iprt status code (VINF_SUCCESS or VERR_NO_MEMORY)
+ * Initialise a vector-of-pointers structure.  Always succeeds.
  * @param   pvec        pointer to an uninitialised vector structure
  * @param   type        the type of the pointers in the vector, including the

trunk/src/VBox/Main/linux/HostHardwareLinux.cpp

@@ -1323 +1323 @@
 
     AssertRCReturn(mStatus, VERR_WRONG_ORDER);
-    if (RT_FAILURE(rc = VEC_INIT_PTR(&vecpchDevs, char *, RTStrFree)))
-        return rc;
     bool fEntered = ASMAtomicCmpXchgU32(&mfWaiting, 1, 0);
-    if (!fEntered)
-        VEC_CLEANUP_PTR(&vecpchDevs);
     AssertReturn(fEntered, VERR_WRONG_ORDER);
+    VEC_INIT_PTR(&vecpchDevs, char *, RTStrFree);
     do {
         struct pollfd pollFD[MAX_POLLID];
@@ -1418 +1415 @@
     pSelf->mDevice = aDevice ? RTStrDup(aDevice) : NULL;
     pSelf->mSysfsPath = aSystemID ? RTStrDup(aSystemID) : NULL;
-    if (   RT_FAILURE(VEC_INIT_PTR(&pSelf->mvecpszInterfaces, char *, RTStrFree))
-        || (aDevice && !pSelf->mDevice) || (aSystemID && ! pSelf->mSysfsPath))
+    VEC_INIT_PTR(&pSelf->mvecpszInterfaces, char *, RTStrFree);
+    if ((aDevice && !pSelf->mDevice) || (aSystemID && ! pSelf->mSysfsPath))
     {
         USBDevInfoCleanup(pSelf);
@@ -1584 +1581 @@
 int USBDevInfoUpdateDevices (VBoxMainUSBDeviceInfo *pSelf)
 {
+    int rc = VINF_SUCCESS;
+
     LogFlowFunc(("entered\n"));
     VECTOR_PTR(char *) vecpchDevs;
-    int rc = VEC_INIT_PTR(&vecpchDevs, char *, RTStrFree);
-    if (RT_FAILURE(rc))
-        return rc;
+    VEC_INIT_PTR(&vecpchDevs, char *, RTStrFree);
     VEC_CLEAR_OBJ(&pSelf->mvecDevInfo);
 #ifdef VBOX_USB_WITH_SYSFS

trunk/src/VBox/Main/linux/USBProxyServiceLinux.cpp

@@ -263 +263 @@
 
 #ifdef VBOX_USB_WITH_SYSFS
-    int rc2;
-    if (RT_FAILURE((rc2 = VBoxMainUSBDevInfoInit(&mDeviceList))))
-        return rc2;
+    VBoxMainUSBDevInfoInit(&mDeviceList);
     int rc = mWaiter.getStatus();
     if (RT_SUCCESS(rc) || rc == VERR_TIMEOUT || rc == VERR_TRY_AGAIN)

trunk/src/VBox/Main/testcase/tstHostHardwareLinux.cpp

@@ -92 +92 @@
 #ifdef VBOX_USB_WITH_SYSFS
     VBoxMainUSBDeviceInfo deviceInfo;
-    AssertRCReturn(VBoxMainUSBDevInfoInit(&deviceInfo), 1);
+    VBoxMainUSBDevInfoInit(&deviceInfo);
     rc = USBDevInfoUpdateDevices(&deviceInfo);
     if (RT_FAILURE(rc))