From 15d50a403f6030af0a3ba75996e110ffedca38dd Mon Sep 17 00:00:00 2001 From: Vladislav Perevezentsev Date: Mon, 19 Jun 2023 17:30:58 +0200 Subject: [PATCH 1/2] Use _depenv_s in libsyclinterface on Windows --- .../helper/source/dpctl_error_handlers.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/libsyclinterface/helper/source/dpctl_error_handlers.cpp b/libsyclinterface/helper/source/dpctl_error_handlers.cpp index ecbd91080d..6ea4ad1a7f 100644 --- a/libsyclinterface/helper/source/dpctl_error_handlers.cpp +++ b/libsyclinterface/helper/source/dpctl_error_handlers.cpp @@ -27,6 +27,9 @@ #include "dpctl_service.h" #include #include +#ifdef _WIN32 +#include +#endif #ifdef ENABLE_GLOG #include #endif @@ -48,9 +51,16 @@ namespace { int requested_verbosity_level(void) { - int requested_level = 0; + char *verbose = nullptr; + size_t len = 0; + +#ifdef _WIN32 + _dupenv_s(&verbose, &len, "DPCTL_VERBOSITY"); +#else + verbose = std::getenv("DPCTL_VERBOSITY"); +#endif - const char *verbose = std::getenv("DPCTL_VERBOSITY"); + int requested_level = 0; if (verbose) { if (!std::strncmp(verbose, "none", 4)) @@ -61,6 +71,11 @@ int requested_verbosity_level(void) requested_level = error_level::warning; } +#ifdef _WIN32 + if (verbose) + free(verbose); +#endif + return requested_level; } From fb4e64bd50ed7808f6687d779f5d396ad885e73f Mon Sep 17 00:00:00 2001 From: Vladislav Perevezentsev Date: Tue, 20 Jun 2023 18:37:44 +0200 Subject: [PATCH 2/2] Small fix --- libsyclinterface/helper/source/dpctl_error_handlers.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libsyclinterface/helper/source/dpctl_error_handlers.cpp b/libsyclinterface/helper/source/dpctl_error_handlers.cpp index 6ea4ad1a7f..379f15384d 100644 --- a/libsyclinterface/helper/source/dpctl_error_handlers.cpp +++ b/libsyclinterface/helper/source/dpctl_error_handlers.cpp @@ -52,9 +52,9 @@ namespace int requested_verbosity_level(void) { char *verbose = nullptr; - size_t len = 0; #ifdef _WIN32 + size_t len = 0; _dupenv_s(&verbose, &len, "DPCTL_VERBOSITY"); #else verbose = std::getenv("DPCTL_VERBOSITY");