Changeset 102334 in vbox for trunk/src/libs/xpcom18a4/ipc

Timestamp:

Nov 27, 2023 4:08:53 PM (14 months ago)

Author:

vboxsync

Message:

libs/xpcom: Drop VBOX_USE_IPRT_IN_XPCOM andmake the code the default as running without IPRT is impossible anyways, bugref:10545

Location:

trunk/src/libs/xpcom18a4/ipc/ipcd

Files:

• extensions/transmngr/common/tmTransaction.cpp (modified) (4 diffs)
• shared/src/ipcMessage.cpp (modified) (3 diffs)
• util/src/ipcMessageWriter.cpp (modified) (3 diffs)

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

@@ -38 +38 @@
 #include <stdlib.h>
 #include "tmTransaction.h"
-#ifdef VBOX_USE_IPRT_IN_XPCOM
-# include <iprt/mem.h>
-#endif
+
+#include <iprt/mem.h>
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -47 +46 @@
 tmTransaction::~tmTransaction() {
   if (mHeader)
-#ifdef VBOX_USE_IPRT_IN_XPCOM
     RTMemFree(mHeader);
-#else
-    free(mHeader);
-#endif
 }
 
@@ -68 +63 @@
   // indicates the message is the entire raw message
   if (aQueueID == TM_INVALID_ID) {
-#ifdef VBOX_USE_IPRT_IN_XPCOM
     header = (tmHeader*) RTMemAlloc(aLength);
-#else
-    header = (tmHeader*) malloc(aLength);
-#endif
     if (header) {
       mRawMessageLength = aLength;
@@ -81 +72 @@
   }
   else {   // need to create the tmHeader and concat the message
-#ifdef VBOX_USE_IPRT_IN_XPCOM
     header = (tmHeader*) RTMemAlloc (sizeof(tmHeader) + aLength);
-#else
-    header = (tmHeader*) malloc (sizeof(tmHeader) + aLength);
-#endif
     if (header) {
       mRawMessageLength = sizeof(tmHeader) + aLength;

trunk/src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcMessage.cpp

@@ -205 +205 @@
                 if (MsgLen() > IPC_MSG_GUESSED_SIZE) {
                     // realloc message buffer to the correct size
-#ifdef VBOX_USE_IPRT_IN_XPCOM
                     mMsgHdr = (ipcMessageHeader *) RTMemRealloc(mMsgHdr, MsgLen());
-#else
-                    mMsgHdr = (ipcMessageHeader *) realloc(mMsgHdr, MsgLen());
-#endif
                 }
             }
@@ -219 +215 @@
             // allocate a partial buffer
             PRUint32 msgLen = IPC_MSG_GUESSED_SIZE;
-#ifdef VBOX_USE_IPRT_IN_XPCOM
             mMsgHdr = (ipcMessageHeader *) RTMemAlloc(msgLen);
-#else
-            mMsgHdr = (ipcMessageHeader *) malloc(msgLen);
-#endif
             if (!mMsgHdr)
                 return PR_FAILURE;
@@ -234 +226 @@
         else {
             PRUint32 msgLen = *(PRUint32 *) buf;
-#ifdef VBOX_USE_IPRT_IN_XPCOM
             mMsgHdr = (ipcMessageHeader *) RTMemAlloc(msgLen);
-#else
-            mMsgHdr = (ipcMessageHeader *) malloc(msgLen);
-#endif
             if (!mMsgHdr)
                 return PR_FAILURE;

trunk/src/libs/xpcom18a4/ipc/ipcd/util/src/ipcMessageWriter.cpp

@@ -40 +40 @@
 #include "prmem.h"
 #include <string.h>
-#ifdef VBOX_USE_IPRT_IN_XPCOM
-# include <iprt/mem.h>
-#endif
+
+#include <iprt/mem.h>
 
 //*****************************************************************************
@@ -51 +50 @@
 {
   if (mBuf)
-#ifdef VBOX_USE_IPRT_IN_XPCOM
     RTMemFree(mBuf);
-#else
-    free(mBuf);
-#endif
 }
 
@@ -116 +111 @@
 
   PRInt32 curPos = mBufPtr - mBuf;
-#ifdef VBOX_USE_IPRT_IN_XPCOM
   mBuf = (PRUint8*)RTMemRealloc(mBuf, mCapacity);
-#else
-  mBuf = (PRUint8*)realloc(mBuf, mCapacity);
-#endif
   if (!mBuf) {
     mError = PR_TRUE;