ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Use osl_getEnvironment instead of getenv

Browse Source 
Fix a TODO

Change-Id: I8647b6b90f3fb50180363f8241f27329be426a1a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183505
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski
2025-03-30 15:08:33 +02:00
parent 7e5a704e7c
commit 269b588647
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cppuhelper/source/shlib.cxx
+6 -6
View File
@@ -36,6 +36,7 @@
#include <cppuhelper/shlib.hxx>
#include <o3tl/string_view.hxx>
#include <osl/module.hxx>
#include <osl/process.h>
#include <sal/log.hxx>
#include <uno/environment.hxx>
#include <uno/mapping.hxx>
@@ -51,13 +52,12 @@ css::uno::Environment cppuhelper::detail::getEnvironment(
{
OUString n(name);
if (!implementation.empty()) {
static char const * log = std::getenv("UNO_ENV_LOG");
if (log != nullptr && *log != 0) {
OString imps(log);
OUString imps;
if (osl_getEnvironment(u"UNO_ENV_LOG"_ustr.pData, &imps.pData) == osl_Process_E_None
&& !imps.isEmpty()) {
for (sal_Int32 i = 0; i != -1;) {
std::string_view imp(o3tl::getToken(imps, 0, ';', i));
//TODO: this assumes UNO_ENV_LOG only contains ASCII characters:
if (o3tl::equalsAscii(implementation, imp))
std::u16string_view imp(o3tl::getToken(imps, 0, ';', i));
if (implementation == imp)
{
n += ":log";
break;