[Libreoffice-commits] core.git: sal/osl
Stephan Bergmann
sbergman at redhat.com
Wed Apr 10 05:21:56 PDT 2013
sal/osl/unx/module.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit fa6c211a454fa51feb36f7e4dae966c31bef432e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Apr 10 14:15:39 2013 +0200
Revert "If you can't load a shared library it should be a warning"
This reverts commit 8b561c0012546aabbaff33b32a79833997aa8902. There are
legitimate cases for osl_loadModule to fail (like when UNO only resorts to
indirect bridging via binary UNO once it has not found a direct bridge
implementation), so this adds too much noise. (Rather add SAL_WARNs to those
places up the call stack where it is known to be an error, and/or enable
+INFO.sal.osl.)
diff --git a/sal/osl/unx/module.cxx b/sal/osl/unx/module.cxx
index ebeceb6..cc615bf 100644
--- a/sal/osl/unx/module.cxx
+++ b/sal/osl/unx/module.cxx
@@ -162,7 +162,7 @@ oslModule SAL_CALL osl_loadModuleAscii(const sal_Char *pModuleName, sal_Int32 nR
((nRtldMode & SAL_LOADMODULE_GLOBAL) ? RTLD_GLOBAL : RTLD_LOCAL);
void* pLib = dlopen(pModuleName, rtld_mode);
- SAL_WARN_IF(
+ SAL_INFO_IF(
pLib == 0, "sal.osl",
"dlopen(" << pModuleName << ", " << rtld_mode << "): "
<< dlerror());
More information about the Libreoffice-commits
mailing list