From 5bde394d2baaadb2978aefcc846b0dd358b32350 Mon Sep 17 00:00:00 2001 From: Philip Top Date: Fri, 23 Jun 2023 12:39:07 -0700 Subject: [PATCH] fix compilation issue on non-msvc systems --- include/CLI/impl/StringTools_inl.hpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/include/CLI/impl/StringTools_inl.hpp b/include/CLI/impl/StringTools_inl.hpp index 5a809fb97..a9a498a0d 100644 --- a/include/CLI/impl/StringTools_inl.hpp +++ b/include/CLI/impl/StringTools_inl.hpp @@ -255,22 +255,23 @@ CLI11_INLINE std::string &add_quotes_if_needed(std::string &str) { return str; } -std::string get_environment_value(const std::string &env_name) { - char *buffer = nullptr; +std::string get_environment_value(const std::string& env_name) { + char* buffer = nullptr; std::string ename_string; #ifdef _MSC_VER // Windows version std::size_t sz = 0; - if(_dupenv_s(&buffer, &sz, env_name.c_str()) == 0 && buffer != nullptr) { + if (_dupenv_s(&buffer, &sz, env_name.c_str()) == 0 && buffer != nullptr) { ename_string = std::string(buffer); free(buffer); } #else // This also works on Windows, but gives a warning - buffer = std::getenv(opt->envname_.c_str()); - if(buffer != nullptr) + buffer = std::getenv(env_name_.c_str()); + if (buffer != nullptr) { ename_string = std::string(buffer); + } #endif return ename_string; }