Fix Windows and macOS clearenv implementation

Signed-off-by: Michael Carroll <[email protected]>
gazebosim · Nov 1, 2023 · 65f81d7 · 65f81d7
1 parent 917faea
commit 65f81d7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/include/gz/utils/Environment.hh b/include/gz/utils/Environment.hh
@@ -106,8 +106,8 @@ bool GZ_UTILS_VISIBLE setenv(const EnvironmentMap &_vars);
 /// concurrently with `setenv` or `unsetenv`
 ///
 /// \return A string containing all environment variables
-std::string printenv();
-
+/// NOLINTNEXTLINE - This is incorrectly parsed as a global variable
+std::string GZ_UTILS_VISIBLE printenv();
 }  // namespace GZ_UTILS_VERSION_NAMESPACE
 }  // namespace utils
 }  // namespace gz

diff --git a/src/Environment.cc b/src/Environment.cc
@@ -104,16 +104,22 @@ bool unsetenv(const std::string &_name)
 /////////////////////////////////////////////////
 bool clearenv()
 {
-  ::clearenv();
-  return true;
-  /*
   bool success = true;
+#if __linux__
+  if (0 != ::clearenv())
+  {
+    success = false;
+  }
+#else
+  // Windows and macOS don't have clearenv
+  // so iterate and clear one-by-one
   for (const auto &[key, value] : env())
   {
     success &= unsetenv(key);
   }
+#endif
   return success;
-  */
+
 }
 
 /////////////////////////////////////////////////