summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-12-14 09:49:39 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-12-15 06:45:14 +0000
commitd15b4e204598fc7e4c1682c4f10228e217575937 (patch)
tree1173b2725abac5f06bfd2e28965a95256283e6a4 /sal
parent14a0d26d6ae0ee59a685c254ec235fea81636475 (diff)
teach sallogareas plugin to catch inconsistencies
Change-Id: I8bcea5ffc74d48148bea78da8c17744e288c069a Reviewed-on: https://gerrit.libreoffice.org/32004 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sal')
-rw-r--r--sal/osl/unx/file_url.cxx5
-rw-r--r--sal/rtl/bootstrap.cxx8
2 files changed, 6 insertions, 7 deletions
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index 50528effad87..ddf2be4d8098 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -182,7 +182,7 @@ oslFileError getSystemPathFromFileUrl(
if (j == 2) {
OUString home;
if (!osl::Security().getHomeDir(home)) {
- SAL_WARN("sal.osl", "osl::Security::getHomeDir failed");
+ SAL_WARN("sal.file", "osl::Security::getHomeDir failed");
return osl_File_E_INVAL;
}
i = url.indexOf('/', i + 1);
@@ -198,8 +198,7 @@ oslFileError getSystemPathFromFileUrl(
try {
home = rtl::Uri::convertRelToAbs(home, url.copy(i));
} catch (rtl::MalformedUriException & e) {
- SAL_WARN(
- "sal.osl", "rtl::MalformedUriException " << e.getMessage());
+ SAL_WARN("sal.file", "rtl::MalformedUriException " << e.getMessage());
return osl_File_E_INVAL;
}
return getSystemPathFromFileUrl(home, path, false);
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index 324ca2374d8d..2a99e0aecda1 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -348,7 +348,7 @@ Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName )
rtl_bootstrap_args_open( base_ini.pData ) );
}
}
- SAL_INFO("sal.rtl", "Bootstrap_Impl(): sFile=" << _iniName);
+ SAL_INFO("sal.bootstrap", "Bootstrap_Impl(): sFile=" << _iniName);
oslFileHandle handle;
if (!_iniName.isEmpty() &&
osl_openFile(_iniName.pData, &handle, osl_File_OpenFlag_Read) == osl_File_E_None)
@@ -367,7 +367,7 @@ Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName )
nameValue.sValue = OStringToOUString(
line.copy(nIndex+1).trim(), RTL_TEXTENCODING_UTF8 );
- SAL_INFO("sal.rtl", "pushing: name=" << nameValue.sName << " value=" << nameValue.sValue);
+ SAL_INFO("sal.bootstrap", "pushing: name=" << nameValue.sName << " value=" << nameValue.sValue);
_nameValueList.push_back(nameValue);
}
@@ -376,7 +376,7 @@ Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName )
}
else
{
- SAL_WARN( "sal.rtl", "couldn't open file: " << _iniName );
+ SAL_WARN( "sal.bootstrap", "couldn't open file: " << _iniName );
}
}
@@ -776,7 +776,7 @@ void SAL_CALL rtl_bootstrap_set (
}
}
- SAL_INFO("sal.rtl", "explicitly getting: name=" << name << " value=" <<value);
+ SAL_INFO("sal.bootstrap", "explicitly getting: name=" << name << " value=" <<value);
r_rtl_bootstrap_set_list.push_back( rtl_bootstrap_NameValue( name, value ) );
}