Changeset 5107 in vbox

Timestamp:

Sep 28, 2007 7:02:15 PM (17 years ago)

Author:

vboxsync

Message:

getenv => RTEnvGet

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManage.cpp (modified) (2 diffs)
• Frontends/VBoxSDL/Framebuffer.cpp (modified) (4 diffs)
• Frontends/VBoxSDL/VBoxSDLTest.cpp (modified) (3 diffs)
• Frontends/VirtualBox/src/VBoxGlobal.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/VBoxSelectorWnd.cpp (modified) (2 diffs)
• Main/HostImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -50 +50 @@
 #include <iprt/dir.h>
 #include <iprt/file.h>
+#include <iprt/env.h>
 #include <VBox/err.h>
 #include <VBox/version.h>
@@ -5041 +5042 @@
         /* make sure the VM process will start on the same display as VBoxManage */
         {
-            const char *display = getenv ("DISPLAY");
+            const char *display = RTEnvGet ("DISPLAY");
             if (display)
                 env = Utf8StrFmt ("DISPLAY=%s", display);

trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp

@@ -25 +25 @@
 
 #include <iprt/stream.h>
+#include <iprt/env.h>
 
 #ifdef RT_OS_OS2
@@ -37 +38 @@
 #include <VBox/err.h>
 #include <VBox/log.h>
-#include <stdlib.h>
 #include <signal.h>
 
@@ -122 +122 @@
 #ifdef RT_OS_WINDOWS
     /* default to DirectX if nothing else set */
-    if (!getenv("SDL_VIDEODRIVER"))
+    if (!RTEnvGet("SDL_VIDEODRIVER"))
     {
         _putenv("SDL_VIDEODRIVER=directx");
@@ -184 +184 @@
                          videoInfo->video_mem,
                          videoInfo->vfmt->BitsPerPixel,
-                         getenv("SDL_VIDEODRIVER"));
+                         RTEnvGet("SDL_VIDEODRIVER"));
     }
 

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDLTest.cpp

@@ -23 +23 @@
 
 #include <iprt/assert.h>
+#include <iprt/env.h>
 #include <iprt/stream.h>
 #include <iprt/string.h>
 #include <iprt/time.h>
 
-#include <stdlib.h>
 #include <signal.h>
 
@@ -90 +90 @@
 #ifdef RT_OS_WINDOWS
     /* Default to DirectX if nothing else set. "windib" would be possible.  */
-    if (!getenv("SDL_VIDEODRIVER"))
+    if (!RTEnvGet("SDL_VIDEODRIVER"))
     {
         _putenv("SDL_VIDEODRIVER=directx");
@@ -131 +131 @@
     RTPrintf("  Optimal bpp mode:                            %d\n", videoInfo->vfmt->BitsPerPixel);
     char buf[256];
-    RTPrintf("Video driver SDL_VIDEODRIVER / active:         %s/%s\n", getenv("SDL_VIDEODRIVER"),
+    RTPrintf("Video driver SDL_VIDEODRIVER / active:         %s/%s\n", RTEnvGet("SDL_VIDEODRIVER"),
                                                                        SDL_VideoDriverName(buf, sizeof(buf)));
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -74 +74 @@
 #include <iprt/param.h>
 #include <iprt/path.h>
+#include <iprt/env.h>
 
 #if defined (VBOX_GUI_DEBUG)
@@ -2805 +2806 @@
 {
 #ifdef Q_OS_UNIX
-    const char *s = getenv ("LC_ALL");
+    const char *s = RTEnvGet ("LC_ALL");
     if (s == 0)
-        s = getenv ("LC_MESSAGES");
+        s = RTEnvGet ("LC_MESSAGES");
     if (s == 0)
-        s = getenv ("LANG");
+        s = RTEnvGet ("LANG");
     if (s != 0)
         return QLocale (s).name();

trunk/src/VBox/Frontends/VirtualBox/src/VBoxSelectorWnd.cpp

@@ -43 +43 @@
 #include <qlayout.h>
 #include <qvbox.h>
+
+#ifdef Q_WS_X11
+#include <iprt/env.h>
+#endif
 
 
@@ -864 +868 @@
     /* make sure the VM process will start on the same display as the Selector */
     {
-        const char *display = getenv ("DISPLAY");
+        const char *display = RTEnvGet ("DISPLAY");
         if (display)
             env.sprintf ("DISPLAY=%s", display);

trunk/src/VBox/Main/HostImpl.cpp

@@ -51 +51 @@
 
 
-
 #include "HostImpl.h"
 #include "HostDVDDriveImpl.h"
@@ -77 +76 @@
 #include <iprt/time.h>
 #include <iprt/param.h>
+#include <iprt/env.h>
 
 #include <stdio.h>
@@ -208 +208 @@
 
     {
-        if (getenv("VBOX_CDROM"))
-        {
-            char *cdromEnv = strdupa(getenv("VBOX_CDROM"));
+        if (RTEnvGet("VBOX_CDROM"))
+        {
+            char *cdromEnv = strdupa(RTEnvGet("VBOX_CDROM"));
             char *cdromDrive;
             cdromDrive = strtok(cdromEnv, ":");
@@ -314 +314 @@
 
     {
-        if (getenv("VBOX_FLOPPY"))
-        {
-            char *floppyEnv = getenv("VBOX_FLOPPY");
+        if (RTEnvGet("VBOX_FLOPPY"))
+        {
+            char *floppyEnv = strdupa(RTEnvGet("VBOX_FLOPPY"));
             char *floppyDrive;
             floppyDrive = strtok(floppyEnv, ":");