Changeset 101962 in vbox for trunk/src/libs/xpcom18a4/xpcom/io

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

160059

Message:

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

Location:

trunk/src/libs/xpcom18a4/xpcom/io

Files:

• SpecialSystemDirectory.cpp (modified) (4 diffs)
• nsAppFileLocationProvider.cpp (modified) (5 diffs)
• nsDirectoryService.cpp (modified) (3 diffs)

trunk/src/libs/xpcom18a4/xpcom/io/SpecialSystemDirectory.cpp

@@ -49 +49 @@
 #include <stdlib.h>
 #include <sys/param.h>
-#include "prenv.h"
 # if defined(XP_MACOSX) && defined(VBOX_WITH_NEWER_OSX_SDK)
 # include <Folders.h>
@@ -55 +54 @@
 
 #endif
+
+#include <iprt/env.h>
 
 NS_COM void StartupSpecialSystemDirectory()
@@ -85 +86 @@
             static const char *tPath = nsnull;
             if (!tPath) {
-                tPath = PR_GetEnv("TMPDIR");
+                tPath = RTEnvGet("TMPDIR");
                 if (!tPath || !*tPath) {
-                    tPath = PR_GetEnv("TMP");
+                    tPath = RTEnvGet("TMP");
                     if (!tPath || !*tPath) {
-                        tPath = PR_GetEnv("TEMP");
+                        tPath = RTEnvGet("TEMP");
                         if (!tPath || !*tPath) {
                             tPath = "/tmp/";
@@ -115 +116 @@
 
         case Unix_HomeDirectory:
-            return NS_NewNativeLocalFile(nsDependentCString(PR_GetEnv("HOME")), 
+            return NS_NewNativeLocalFile(nsDependentCString(RTEnvGet("HOME")), 
                                              PR_TRUE, 
                                              aFile);

trunk/src/libs/xpcom18a4/xpcom/io/nsAppFileLocationProvider.cpp

@@ -46 +46 @@
 #include "nsXPIDLString.h"
 #include "nsISimpleEnumerator.h"
-#include "prenv.h"
 #include "nsCRT.h"
 
@@ -72 +71 @@
 #endif
 
+#include <iprt/env.h>
 
 // WARNING: These hard coded names need to go away. They need to
@@ -251 +251 @@
         NS_ERROR("Don't use nsAppFileLocationProvider::GetFile(NS_ENV_PLUGINS_DIR, ...). "
                  "Use nsAppFileLocationProvider::GetFiles(...).");
-        const char *pathVar = PR_GetEnv("VBOX_XPCOM_PLUGIN_PATH");
+        const char *pathVar = RTEnvGet("VBOX_XPCOM_PLUGIN_PATH");
         if (pathVar)
             rv = NS_NewNativeLocalFile(nsDependentCString(pathVar), PR_TRUE, getter_AddRefs(localFile));
@@ -380 +380 @@
     if (NS_FAILED(rv)) return rv;
 #elif defined(XP_UNIX)
-    rv = NS_NewNativeLocalFile(nsDependentCString(PR_GetEnv("HOME")), PR_TRUE, getter_AddRefs(localDir));
+    rv = NS_NewNativeLocalFile(nsDependentCString(RTEnvGet("HOME")), PR_TRUE, getter_AddRefs(localDir));
     if (NS_FAILED(rv)) return rv;
 #elif defined(XP_BEOS)
@@ -596 +596 @@
 #else
         static const char* keys[] = { nsnull, NS_APP_PLUGINS_DIR, nsnull };
-        if (!keys[0] && !(keys[0] = PR_GetEnv("VBOX_XPCOM_PLUGIN_PATH"))) {
+        if (!keys[0] && !(keys[0] = RTEnvGet("VBOX_XPCOM_PLUGIN_PATH"))) {
             static const char nullstr = 0;
             keys[0] = &nullstr;

trunk/src/libs/xpcom18a4/xpcom/io/nsDirectoryService.cpp

@@ -49 +49 @@
 #include <sys/param.h>
 #include <dlfcn.h>
-#include "prenv.h"
 #ifdef XP_MACOSX
 #include <CoreServices/CoreServices.h>
@@ -63 +62 @@
 #endif
 #endif
+
+#include <iprt/env.h>
 
 #include "SpecialSystemDirectory.h"
@@ -173 +174 @@
     // we only do this if it is not already set.
 #ifdef MOZ_DEFAULT_VBOX_XPCOM_HOME
-    if (PR_GetEnv("VBOX_XPCOM_HOME") == nsnull)
-        PR_SetEnv("VBOX_XPCOM_HOME=" MOZ_DEFAULT_VBOX_XPCOM_HOME);
+    if (RTEnvGet("VBOX_XPCOM_HOME") == nsnull)
+        RTEnvPut("VBOX_XPCOM_HOME=" MOZ_DEFAULT_VBOX_XPCOM_HOME);
 #endif
 
-    char *moz5 = PR_GetEnv("VBOX_XPCOM_HOME");
+    const char *moz5 = RTEnvGet("VBOX_XPCOM_HOME");
 
     if (moz5)