From: Rhys Kidd <rhyskidd@gmail.com>
Date: Sun, 23 Aug 2015 14:37:47 +0000 (+0000)
Subject: docs: env variable handling behaviour consistent between OS X and Linux, thus remove... 
X-Git-Tag: svn/VALGRIND_3_11_0~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88e8611524c8baa631a53d5e1c43e7dd1498ea7c;p=thirdparty%2Fvalgrind.git

docs: env variable handling behaviour consistent between OS X and Linux, thus remove redundant comment and #ifdef. n-i-bz.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15585
---

diff --git a/coregrind/m_libcproc.c b/coregrind/m_libcproc.c
index e573af591c..f314b55eea 100644
--- a/coregrind/m_libcproc.c
+++ b/coregrind/m_libcproc.c
@@ -230,14 +230,6 @@ static void mash_colon_env(HChar *varp, const HChar *remove_pattern)
 void VG_(env_remove_valgrind_env_stuff)(HChar** envp, Bool ro_strings,
                                         void (*free_fn) (void *) )
 {
-
-#if defined(VGO_darwin)
-
-   // Environment cleanup is also handled during parent launch 
-   // in vg_preloaded.c:vg_cleanup_env().
-
-#endif
-
    Int i;
    HChar* ld_preload_str = NULL;
    HChar* ld_library_path_str = NULL;
diff --git a/docs/internals/Darwin-notes.txt b/docs/internals/Darwin-notes.txt
index f526c4fe82..85c9e8e48a 100644
--- a/docs/internals/Darwin-notes.txt
+++ b/docs/internals/Darwin-notes.txt
@@ -69,13 +69,6 @@ Valgrind-developer notes, todos re the MacOSX port
   - PRE(sys_posix_spawn) completely ignores signal issues, and
     also ignores the file_actions argument
 
-* env var handling w/ exec on Darwin: is there something odd?  Compare
-  "valgrind env" on Darwin and Linux.  On the former there are
-  settings VALGRIND_LIB and VALGRIND_LIB_INNER, but not for the
-  former.
-  There's a suspicious-looking "#if defined(VGO_darwin)" in 
-  VG_(env_remove_valgrind_env_stuff).  Maybe related?
-
 * Cleanups: sort wrappers in syswrap-darwin.c and priv_syswrap-darwin.h
   alphabetically.  Also, some aren't properly implemented -- check and
   print warnings