From eb758877fb799111673b909e73065cb6d966881a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 28 Jan 2014 20:00:40 +0100 Subject: [PATCH 038/137] bool improvements Change-Id: I7ae2b02e435d21390843c6c56877a8ce3a73f9f2 (cherry picked from commit bd4053f895167978978023309925c85c3826b31a) Signed-off-by: Michael Stahl --- sal/osl/all/debugbase.cxx | 2 +- sal/qa/osl/file/osl_File.cxx | 4 ++-- sal/qa/osl/module/osl_Module.cxx | 8 ++++---- sal/qa/osl/mutex/osl_Mutex.cxx | 2 +- sal/qa/osl/process/osl_Thread.cxx | 2 +- sal/qa/osl/security/osl_Security.cxx | 2 +- sal/rtl/alloc_global.cxx | 6 +++--- sal/rtl/hash.cxx | 4 ++-- sal/rtl/uri.cxx | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx index 8bc0c46..57238ce 100644 --- a/sal/osl/all/debugbase.cxx +++ b/sal/osl/all/debugbase.cxx @@ -32,7 +32,7 @@ { \ if (!(c) && _OSL_GLOBAL osl_assertFailedLine(f, l, m)) \ _OSL_GLOBAL osl_breakDebug(); \ - } while (0) + } while (false) #define DEBUGBASE_ENSURE(c, m) DEBUGBASE_ENSURE_(c, OSL_THIS_FILE, __LINE__, m) namespace { diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 43f255c..54055fe 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -2587,7 +2587,7 @@ namespace osl_FileStatus ::osl::FileBase::RC nError1 = testDirectory.open(); ::rtl::OUString aFileName ("link.file"); sal_Bool bOk = sal_False; - while (1) { + while (true) { nError1 = testDirectory.getNextItem( rItem_link, 4 ); if (::osl::FileBase::E_None == nError1) { sal_uInt32 mask_link = osl_FileStatus_Mask_FileName | osl_FileStatus_Mask_LinkTargetURL; @@ -5639,7 +5639,7 @@ namespace osl_Directory CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); ::rtl::OUString aFileName ("link.file"); - while (1) { + while (true) { nError1 = testDirectory.getNextItem( rItem, 4 ); if (::osl::FileBase::E_None == nError1) { ::osl::FileStatus rFileStatus( osl_FileStatus_Mask_FileName | osl_FileStatus_Mask_Type ); diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx index d6358d4..ee547fb 100644 --- a/sal/qa/osl/module/osl_Module.cxx +++ b/sal/qa/osl/module/osl_Module.cxx @@ -189,7 +189,7 @@ namespace osl_Module if ( !( bRes ) ) { - CPPUNIT_ASSERT_MESSAGE("Cannot locate current module.", sal_False ); + CPPUNIT_ASSERT_MESSAGE("Cannot locate current module.", false ); } ::osl::Module aMod( aFileURL ); @@ -221,7 +221,7 @@ namespace osl_Module bRes = osl::Module::getUrlFromAddress( ( void* ) &::osl_Module::testClass::myFunc, aFileURL ) ; if ( !( bRes ) ) { - CPPUNIT_ASSERT_MESSAGE("Cannot locate current module.", sal_False ); + CPPUNIT_ASSERT_MESSAGE("Cannot locate current module.", false ); } CPPUNIT_ASSERT_MESSAGE( "#test comment#: test get Module URL from address.", @@ -239,7 +239,7 @@ namespace osl_Module bRes = osl::Module::getUrlFromAddress( ( void* )pFunc, aFileURL ); if ( !( bRes ) ) { - CPPUNIT_ASSERT_MESSAGE("Cannot locate current module.", sal_False ); + CPPUNIT_ASSERT_MESSAGE("Cannot locate current module.", false ); } aMod.unload( ); @@ -325,7 +325,7 @@ namespace osl_Module bRes = osl::Module::getUrlFromAddress( ( void* ) &::osl_Module::testClass::myFunc, aFileURL ); if ( !( bRes ) ) { - CPPUNIT_ASSERT_MESSAGE("Cannot locate current module - using executable instead", sal_False ); + CPPUNIT_ASSERT_MESSAGE("Cannot locate current module - using executable instead", false ); } ::osl::Module aMod; diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx index 0e9ce85..3f86f9c 100644 --- a/sal/qa/osl/mutex/osl_Mutex.cxx +++ b/sal/qa/osl/mutex/osl_Mutex.cxx @@ -732,7 +732,7 @@ namespace osl_ClearableGuard // wait 1 second to assure the child thread has begun ThreadHelper::thread_sleep(1); - while (1) + while (true) { if (aMutex.tryToAcquire() == sal_True) { diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx index 3e394aa..aeab4e9 100644 --- a/sal/qa/osl/process/osl_Thread.cxx +++ b/sal/qa/osl/process/osl_Thread.cxx @@ -626,7 +626,7 @@ namespace osl_Thread void suspendCountThread(OCountThread* _pCountThread) { sal_Int32 nValue = 0; - while (1) + while (true) { nValue = _pCountThread->getValue(); if (nValue >= 3) diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx index e9ad1a7..3ad78b0 100644 --- a/sal/qa/osl/security/osl_Security.cxx +++ b/sal/qa/osl/security/osl_Security.cxx @@ -280,7 +280,7 @@ namespace osl_Security { ::osl::Security aSec; osl_unloadUserProfile(aSec.getHandle()); - CPPUNIT_ASSERT_MESSAGE( "empty function.", sal_True ); + CPPUNIT_ASSERT_MESSAGE( "empty function.", true ); } CPPUNIT_TEST_SUITE( UserProfile ); diff --git a/sal/rtl/alloc_global.cxx b/sal/rtl/alloc_global.cxx index 8194b13..07cded3 100644 --- a/sal/rtl/alloc_global.cxx +++ b/sal/rtl/alloc_global.cxx @@ -291,7 +291,7 @@ void* SAL_CALL rtl_allocateMemory (sal_Size n) SAL_THROW_EXTERN_C() n >= SAL_MAX_INT32, "sal.rtl", "suspicious massive alloc " << n); #if !defined(FORCE_SYSALLOC) - while (1) + while (true) { if (alloc_mode == AMode_CUSTOM) { @@ -314,7 +314,7 @@ void* SAL_CALL rtl_reallocateMemory (void * p, sal_Size n) SAL_THROW_EXTERN_C() n >= SAL_MAX_INT32, "sal.rtl", "suspicious massive alloc " << n); #if !defined(FORCE_SYSALLOC) - while (1) + while (true) { if (alloc_mode == AMode_CUSTOM) { @@ -334,7 +334,7 @@ void* SAL_CALL rtl_reallocateMemory (void * p, sal_Size n) SAL_THROW_EXTERN_C() void SAL_CALL rtl_freeMemory (void * p) SAL_THROW_EXTERN_C() { #if !defined(FORCE_SYSALLOC) - while (1) + while (true) { if (alloc_mode == AMode_CUSTOM) { diff --git a/sal/rtl/hash.cxx b/sal/rtl/hash.cxx index 823e56a..47e8681 100644 --- a/sal/rtl/hash.cxx +++ b/sal/rtl/hash.cxx @@ -139,9 +139,9 @@ static int compareEqual (rtl_uString *pStringA, rtl_uString *pStringB) { if (pStringA == pStringB) - return 1; + return true; if (pStringA->length != pStringB->length) - return 0; + return false; return !rtl_ustr_compare_WithLength( pStringA->buffer, pStringA->length, pStringB->buffer, pStringB->length); } diff --git a/sal/rtl/uri.cxx b/sal/rtl/uri.cxx index 7e4402f..513fb51 100644 --- a/sal/rtl/uri.cxx +++ b/sal/rtl/uri.cxx @@ -142,7 +142,7 @@ sal_uInt32 readUcs4(sal_Unicode const ** pBegin, sal_Unicode const * pEnd, || nWeight1 > 11 || (nWeight2 = getHexWeight(p[2])) < 0) { - bUTF8 = sal_False; + bUTF8 = false; break; } p += 3; -- 1.9.3