Changeset 101962 in vbox for trunk/src/libs/xpcom18a4/ipc/ipcd

Timestamp:

Nov 8, 2023 12:01:00 PM (15 months ago)

Author:

vboxsync

Message:

libs/xpcom: Convert PR_GetEnv/PR_SetEnv to IPRT RTEnv* API, bugref:10545

Location:

trunk/src/libs/xpcom18a4/ipc/ipcd/shared/src

Files:

• ipcConfig.cpp (modified) (3 diffs)
• ipcLog.cpp (modified) (4 diffs)

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

@@ -47 +47 @@
 #include "ipcConfig.h"
 #include "ipcLog.h"
-#include "prenv.h"
 #include "plstr.h"
+
+#include <iprt/env.h>
 
 #if defined(XP_OS2) && !defined(XP_OS2_NATIVEIPC)
@@ -75 +76 @@
     bufLen -= (sizeof(kDefaultSocketPrefix) - 1);
 
-    logName = PR_GetEnv("VBOX_IPC_SOCKETID");
+    logName = RTEnvGet("VBOX_IPC_SOCKETID");
 #if defined(VBOX) && defined(XP_UNIX)
     if (!logName || !logName[0]) {
@@ -84 +85 @@
 #endif
     if (!logName || !logName[0]) {
-        logName = PR_GetEnv("LOGNAME");
+        logName = RTEnvGet("LOGNAME");
         if (!logName || !logName[0]) {
-            logName = PR_GetEnv("USER");
+            logName = RTEnvGet("USER");
             if (!logName || !logName[0]) {
                 LOG(("could not determine username from environment\n"));

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

@@ -48 +48 @@
 #include "plstr.h"
 
-#ifdef VBOX
-# if defined(__OS2__) && defined(PAGE_SIZE)
-#  undef PAGE_SIZE
-# endif
-# include <iprt/initterm.h> // for RTR3InitDll
-#else // !VBOX
-PRBool ipcLogEnabled = PR_FALSE;
-#endif // !VBOX
+#include <iprt/initterm.h> // for RTR3InitDll
 
 char ipcLogPrefix[10] = {0};
-
-#ifndef VBOX
-
-//-----------------------------------------------------------------------------
-// UNIX
-//-----------------------------------------------------------------------------
-#if defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
-
-#include <sys/types.h>
-#include <unistd.h>
-
-static inline PRUint32
-WritePrefix(char *buf, PRUint32 bufLen)
-{
-    return PR_snprintf(buf, bufLen, "[%u:%p] %s ",
-                       (unsigned) getpid(),
-                       PR_GetCurrentThread(),
-                       ipcLogPrefix);
-}
-#endif
-
-//-----------------------------------------------------------------------------
-// WIN32
-//-----------------------------------------------------------------------------
-#ifdef XP_WIN
-#include <windows.h>
-
-static inline PRUint32
-WritePrefix(char *buf, PRUint32 bufLen)
-{
-    return PR_snprintf(buf, bufLen, "[%u:%p] %s ",
-                       GetCurrentProcessId(),
-                       PR_GetCurrentThread(),
-                       ipcLogPrefix);
-}
-#endif
-
-#endif // !VBOX
 
 //-----------------------------------------------------------------------------
@@ -104 +59 @@
 IPC_InitLog(const char *prefix)
 {
-#ifdef VBOX
     // initialize VBox Runtime
     RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE);
 
     PL_strncpyz(ipcLogPrefix, prefix, sizeof(ipcLogPrefix));
-#else
-    if (PR_GetEnv("IPC_LOG_ENABLE")) {
-        ipcLogEnabled = PR_TRUE;
-        PL_strncpyz(ipcLogPrefix, prefix, sizeof(ipcLogPrefix));
-    }
-#endif
 }
 
@@ -125 +73 @@
     char buf[512];
 
-#ifdef VBOX
     if (ipcLogPrefix[0]) {
         nb = strlen(ipcLogPrefix);
@@ -133 +80 @@
         buf[nb++] = ' ';
     }
-#else
-    if (ipcLogPrefix[0])
-        nb = WritePrefix(buf, sizeof(buf));
-#endif
 
     PR_vsnprintf(buf + nb, sizeof(buf) - nb, fmt, ap);
     buf[sizeof(buf) - 1] = '\0';
 
-#ifdef VBOX
     LogFlow(("%s", buf));
-#else
-    fwrite(buf, strlen(buf), 1, stdout);
-#endif
-
     va_end(ap);
 }