diff options
| author | Rohan Kumar <rohankanojia420@gmail.com> | 2016-03-02 01:28:58 +0530 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-03-03 17:00:26 +0000 |
| commit | f59136a2ed1e3eb01cc5b62c5a7da07c34cbdfae (patch) | |
| tree | e34d2b6db403fce36c6d8a57e9c3adf31c935e90 /sal/rtl | |
| parent | f336f63da900d76c2bf6e5690f1c8a7bd15a0aa2 (diff) | |
tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals
Change-Id: If329cf8257684e7bd2936641b8f14ec3e9b9f733
Reviewed-on: https://gerrit.libreoffice.org/22647
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sal/rtl')
| -rw-r--r-- | sal/rtl/bootstrap.cxx | 32 |
1 files changed, 5 insertions, 27 deletions
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx index 16af28916628..7b4150d06526 100644 --- a/sal/rtl/bootstrap.cxx +++ b/sal/rtl/bootstrap.cxx @@ -348,12 +348,7 @@ Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName ) rtl_bootstrap_args_open( base_ini.pData ) ); } } - -#if OSL_DEBUG_LEVEL > 1 - OString sFile = OUStringToOString(_iniName, RTL_TEXTENCODING_ASCII_US); - OSL_TRACE("Bootstrap_Impl(): sFile=%s", sFile.getStr()); -#endif /* OSL_DEBUG_LEVEL > 1 */ - + SAL_INFO("sal.rtl", "Bootstrap_Impl(): sFile=" << _iniName); oslFileHandle handle; if (!_iniName.isEmpty() && osl_File_E_None == osl_openFile(_iniName.pData, &handle, osl_File_OpenFlag_Read)) @@ -372,26 +367,17 @@ Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName ) nameValue.sValue = OStringToOUString( line.copy(nIndex+1).trim(), RTL_TEXTENCODING_UTF8 ); -#if OSL_DEBUG_LEVEL > 1 - OString name_tmp = OUStringToOString(nameValue.sName, RTL_TEXTENCODING_ASCII_US); - OString value_tmp = OUStringToOString(nameValue.sValue, RTL_TEXTENCODING_UTF8); - OSL_TRACE( - "pushing: name=%s value=%s", - name_tmp.getStr(), value_tmp.getStr() ); -#endif /* OSL_DEBUG_LEVEL > 1 */ + SAL_INFO("sal.rtl", "pushing: name=" << nameValue.sName << " value= " << nameValue.sValue); _nameValueList.push_back(nameValue); } } osl_closeFile(handle); } -#if OSL_DEBUG_LEVEL > 1 else { - OString file_tmp = OUStringToOString(_iniName, RTL_TEXTENCODING_ASCII_US); - OSL_TRACE( "couldn't open file: %s", file_tmp.getStr() ); + SAL_WARN( "sal.rtl", "couldn't open file: " << _iniName ); } -#endif /* OSL_DEBUG_LEVEL > 1 */ } Bootstrap_Impl::~Bootstrap_Impl() @@ -693,10 +679,8 @@ void SAL_CALL rtl_bootstrap_args_close ( { ::std::size_t nLeaking = 8; // only hold up to 8 files statically -#if OSL_DEBUG_LEVEL == 1 // nonpro +#if OSL_DEBUG_LEVEL > 0 // debug nLeaking = 0; -#elif OSL_DEBUG_LEVEL > 1 // debug - nLeaking = 1; #endif /* OSL_DEBUG_LEVEL */ if (p_bootstrap_map->size() > nLeaking) @@ -792,13 +776,7 @@ void SAL_CALL rtl_bootstrap_set ( } } -#if OSL_DEBUG_LEVEL > 1 - OString cstr_name( OUStringToOString( name, RTL_TEXTENCODING_ASCII_US ) ); - OString cstr_value( OUStringToOString( value, RTL_TEXTENCODING_ASCII_US ) ); - OSL_TRACE( - "bootstrap.cxx: explicitly setting: name=%s value=%s\n", - cstr_name.getStr(), cstr_value.getStr() ); -#endif /* OSL_DEBUG_LEVEL > 1 */ + SAL_INFO("sal.rtl", "explicitly getting: name=" << name << " value= " <<value); r_rtl_bootstrap_set_list.push_back( rtl_bootstrap_NameValue( name, value ) ); } |