[PATCH] fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
Ioan Radu (via Code Review)
gerrit at gerrit.libreoffice.org
Mon Jan 21 13:53:22 PST 2013
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1804
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/04/1804/1
fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
- replaced OSL_TRACE with SAL_INFO
Change-Id: I4d63df493e85bc095b8a11e3842b0d69c5217c96
---
M fpicker/source/aqua/CFStringUtilities.hxx
1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/fpicker/source/aqua/CFStringUtilities.hxx b/fpicker/source/aqua/CFStringUtilities.hxx
index 9845e92..22f9474 100644
--- a/fpicker/source/aqua/CFStringUtilities.hxx
+++ b/fpicker/source/aqua/CFStringUtilities.hxx
@@ -26,7 +26,7 @@
#include <postmac.h>
#include <rtl/ustring.hxx>
#include <sal/types.h>
-#include <osl/diagnose.h>
+#include "sal/log.hxx"
enum InfoType {
FULLPATH,
@@ -43,71 +43,71 @@
#define PARAMFILLER "\n "
inline void DBG_PRINT_ENTRY() {
- OSL_TRACE(">>> %s", __func__);
+ SAL_INFO(">>> "<< __func__);
}
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname) {
- OSL_TRACE(">>> %s::%s", classname, methodname);
+ SAL_INFO(">>> " << classname << "::" << methodname);
}
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const char* value1) {
- OSL_TRACE(">>> %s::%s%s%s = %s", classname, methodname, PARAMFILLER, param1, value1);
+ SAL_INFO(">>> " << classname << "::" << methodname << PARAMFILLER << param1 << " = " << value1);
}
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const OUString& value1) {
- OSL_TRACE(">>> %s::%s%s%s = %s", classname, methodname, PARAMFILLER, param1, OUStringToOString(value1, RTL_TEXTENCODING_UTF8).getStr());
+ SAL_INFO(">>> " << classname << "::" << methodname << PARAMFILLER << param1 << " = " << OUStringToOString(value1, RTL_TEXTENCODING_UTF8).getStr());
}
#if OSL_DEBUG_LEVEL > 1
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const CFStringRef value1)
{
- OSL_TRACE(">>> %s::%s%s%s =", classname, methodname, PARAMFILLER, param1);
+ SAL_INFO(">>> " << classname << "::" << methodname<< PARAMFILLER << param1 <<" =");
CFShow(value1);
}
#else
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const CFStringRef /* value1 */)
{
- OSL_TRACE(">>> %s::%s%s%s =", classname, methodname, PARAMFILLER, param1);
+ SAL_INFO(">>> " << classname << "::" << methodname << PARAMFILLER << param1 << " =");
}
#endif
#if OSL_DEBUG_LEVEL > 1
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const NSString* value1)
{
- OSL_TRACE(">>> %s::%s%s%s =", classname, methodname, PARAMFILLER, param1);
+ SAL_INFO(">>> " << classname << "::" << methodname << PARAMFILLER << param1 << " =");
NSLog(value1);
}
#else
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const NSString* /* value1 */)
{
- OSL_TRACE(">>> %s::%s%s%s =", classname, methodname, PARAMFILLER, param1);
+ SAL_INFO(">>> " << classname << "::" << methodname << PARAMFILLER << param1 << " =");
}
#endif
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const int value1) {
- OSL_TRACE(">>> %s::%s%s%s = %d", classname, methodname, PARAMFILLER, param1, value1);
+ SAL_INFO(">>> " << classname << "::" << methodname << PARAMFILLER << param1 << " = " << value1);
}
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const char* value1, const char* param2, const int value2) {
- OSL_TRACE(">>> %s::%s%s%s = %s%s%s = %d", classname, methodname, PARAMFILLER, param1, value1, PARAMFILLER, param2, value2);
+ SAL_INFO(">>> " << classname << "::" << methodname << PARAMFILLER << param1 <<" = " << value1 << PARAMFILLER << param2 << " = " << value2);
}
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const char* value1, const char* param2, const char* value2) {
- OSL_TRACE(">>> %s::%s%s%s = %s%s%s = %s", classname, methodname, PARAMFILLER, param1, value1, PARAMFILLER, param2, value2);
+ SAL_INFO(">>> " << classname << "::" << methodname << PARAMFILLER << param1 << " = " << value1 << PARAMFILLER << param2 << " = " << value2);
}
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const int value1, const char* param2, const int value2) {
- OSL_TRACE(">>> %s::%s%s%s = %d%s%s = %d", classname, methodname, PARAMFILLER, param1, value1, PARAMFILLER, param2, value2);
+ SAL_INFO(">>> " << classname << "::" << methodname << PARAMFILLER << param1 << " = " << value1 << PARAMFILLER << param2 << " = " << value2);
}
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const int value1, const char* param2, const char* value2) {
- OSL_TRACE(">>> %s::%s%s%s = %d%s%s = %s", classname, methodname, PARAMFILLER, param1, value1, PARAMFILLER, param2, value2);
+ SAL_INFO(">>> " << classname << "::" << methodname << PARAMFILLER << param1 << " = " << value1 << PARAMFILLER << param2 << " = " << value2);
}
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const int value1, const char* param2, const CFStringRef value2)
{
- OSL_TRACE(">>> %s::%s%s%s = %d%s%s =", classname, methodname, PARAMFILLER, param1, value1, PARAMFILLER, param2, value2);
+ SAL_INFO(">>> " << classname << "::" << methodname << PARAMFILLER << param1 << " = " << value1 << PARAMFILLER << param2 << " =" << value2);
#if OSL_DEBUG_LEVEL > 1
CFShow(value2);
#endif
@@ -115,7 +115,7 @@
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const int value1, const char* param2, const NSString* value2)
{
- OSL_TRACE(">>> %s::%s%s%s = %d%s%s =", classname, methodname, PARAMFILLER, param1, value1, PARAMFILLER, param2, value2);
+ SAL_INFO(">>> " << classname << "::" << methodname << PARAMFILLER << param1 << " = " << value1 << PARAMFILLER << param2 << " =" << value2);
#if OSL_DEBUG_LEVEL > 1
NSLog(value2);
#endif
@@ -123,59 +123,59 @@
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const OUString& value1, const char* param2, const OUString& value2) {
- OSL_TRACE(">>> %s::%s%s%s = %s%s%s = %s", classname, methodname, PARAMFILLER, param1, OUStringToOString(value1, RTL_TEXTENCODING_UTF8).getStr(), PARAMFILLER, param2, OUStringToOString(value2, RTL_TEXTENCODING_UTF8).getStr());
+ SAL_INFO(">>> " << classname << "::" << methodname << PARAMFILLER << param1 << " = " << OUStringToOString(value1, RTL_TEXTENCODING_UTF8).getStr() << PARAMFILLER << param2 << " = " << OUStringToOString(value2, RTL_TEXTENCODING_UTF8).getStr());
}
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, const char* param1, const OUString& value1, const char* param2, const int value2) {
- OSL_TRACE(">>> %s::%s%s%s = %s%s%s = %d", classname, methodname, PARAMFILLER, param1, OUStringToOString(value1, RTL_TEXTENCODING_UTF8).getStr(), PARAMFILLER, param2, value2);
+ SAL_INFO(">>> " << classname << "::" << methodname << PARAMFILLER << param1 << " = " << OUStringToOString(value1, RTL_TEXTENCODING_UTF8).getStr() << PARAMFILLER << param2 <<" = " << value2);
}
//exit method debugs
inline void DBG_PRINT_EXIT() {
- OSL_TRACE("<<< %s", __func__);
+ SAL_INFO("<<< " << __func__);
}
inline void DBG_PRINT_EXIT(const char * classname, const char * methodname) {
- OSL_TRACE("<<< %s::%s", classname, methodname);
+ SAL_INFO("<<< " << classname << "::" << methodname);
}
inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, const char* retVal) {
- OSL_TRACE("<<< %s::%s%sreturnValue = %s", classname, methodname, PARAMFILLER, retVal);
+ SAL_INFO("<<< " << classname << "::" << methodname << PARAMFILLER << "returnValue = " << retVal);
}
inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, int retVal) {
- OSL_TRACE("<<< %s::%s%sreturnValue = %d", classname, methodname, PARAMFILLER, retVal);
+ SAL_INFO("<<< " << classname << "::" << methodname << PARAMFILLER << "returnValue = " << retVal);
}
#if OSL_DEBUG_LEVEL > 1
inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, const CFStringRef retVal)
{
- OSL_TRACE("<<< %s::%s%sreturnValue = ", classname, methodname, PARAMFILLER);
+ SAL_INFO("<<< " << classname << "::" << methodname << PARAMFILLER << "returnValue = ");
CFShow(retVal);
}
#else
inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, const CFStringRef /* retVal */)
{
- OSL_TRACE("<<< %s::%s%sreturnValue = ", classname, methodname, PARAMFILLER);
+ SAL_INFO("<<< " << classname << "::" << methodname << PARAMFILLER << "returnValue = ");
}
#endif
#if OSL_DEBUG_LEVEL > 1
inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, const NSString* retVal)
{
- OSL_TRACE("<<< %s::%s%sreturnValue = ", classname, methodname, PARAMFILLER);
+ SAL_INFO("<<< " << classname << "::" << methodname << PARAMFILLER << "returnValue = ");
NSLog(retVal);
}
#else
inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, const NSString* /* retVal */ )
{
- OSL_TRACE("<<< %s::%s%sreturnValue = ", classname, methodname, PARAMFILLER);
+ SAL_INFO("<<< " << classname << "::" << methodname << PARAMFILLER << "returnValue = ");
}
#endif
inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, const OUString& retVal) {
- OSL_TRACE("<<< %s::%s%sreturnValue = %s", classname, methodname, PARAMFILLER, OUStringToOString(retVal, RTL_TEXTENCODING_UTF8).getStr());
+ OSL_TRACE("<<< " << classname << "::" << methodname << PARAMFILLER << "returnValue = " << OUStringToOString(retVal, RTL_TEXTENCODING_UTF8).getStr());
}
#endif //_CFSTRINGUTILITIES_HXX_
--
To view, visit https://gerrit.libreoffice.org/1804
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d63df493e85bc095b8a11e3842b0d69c5217c96
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ioan Radu <ioan.radu.g at gmail.com>
More information about the LibreOffice
mailing list