Changeset 101996 in vbox for trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/transmngr/common/tmVector.cpp

Timestamp:

Nov 8, 2023 5:57:26 PM (13 months ago)

Author:

vboxsync

Message:

libs/xpcom/ipc: More conversion to IPRT infrastructure, bugref:10545

File:

• trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/transmngr/common/tmVector.cpp (modified) (8 diffs)

trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/transmngr/common/tmVector.cpp

@@ -38 +38 @@
 #include <stdlib.h>
 #include "tmVector.h"
-#ifdef VBOX_USE_IPRT_IN_XPCOM
-# include <iprt/mem.h>
-#endif
+
+#include <iprt/mem.h>
 
 ////////////////////////////////////////////////////////////////////////////
@@ -49 +48 @@
 tmVector::~tmVector() {
   if (mElements)
-#ifdef VBOX_USE_IPRT_IN_XPCOM
     RTMemFree((void*)mElements);
-#else
-    free((void*)mElements);
-#endif
 }
 
@@ -62 +57 @@
 tmVector::Init() {
 
-#ifdef VBOX_USE_IPRT_IN_XPCOM
   mElements = (void**) RTMemAllocZ (mCapacity * sizeof(void*));
-#else
-  mElements = (void**) calloc (mCapacity, sizeof(void*));
-#endif
   if (!mElements)
     return NS_ERROR_OUT_OF_MEMORY;
@@ -77 +68 @@
 PRInt32
 tmVector::Append(void *aElement){
-  PR_ASSERT(aElement);
+  Assert(aElement);
 
   // make sure there is room
@@ -94 +85 @@
 void
 tmVector::Remove(void *aElement) {
-  PR_ASSERT(aElement);
+  Assert(aElement);
 
   for (PRUint32 index = 0; index < mNext; index++) {
@@ -111 +102 @@
 void
 tmVector::RemoveAt(PRUint32 aIndex) {
-  PR_ASSERT(aIndex < mNext);
+  Assert(aIndex < mNext);
 
   // remove the element if it isn't already nsnull
@@ -148 +139 @@
 
   PRUint32 newcap = mCapacity + GROWTH_INC;
-#ifdef VBOX_USE_IPRT_IN_XPCOM
   mElements = (void**) RTMemRealloc(mElements, (newcap * sizeof(void*)));
-#else
-  mElements = (void**) realloc(mElements, (newcap * sizeof(void*)));
-#endif
   if (mElements) {
     mCapacity = newcap;
@@ -167 +154 @@
   PRUint32 newcap = mCapacity - GROWTH_INC;
   if (mNext < newcap) {
-#ifdef VBOX_USE_IPRT_IN_XPCOM
     mElements = (void**) RTMemRealloc(mElements, newcap * sizeof(void*));
-#else
-    mElements = (void**) realloc(mElements, newcap * sizeof(void*));
-#endif
     if (!mElements)
       return NS_ERROR_OUT_OF_MEMORY;