diff options
author | Philipp Hofer <philipp.hofer@protonmail.com> | 2020-11-12 13:11:00 +0100 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2020-11-21 13:16:53 +0100 |
commit | 70e36068a43cb6747232441ee67e609c86362aa0 (patch) | |
tree | ca05d17c538d3230ff904296fbb7625b2d7d5660 | |
parent | e8e093f14b698fc710930b2dead57c7d4fb63b8e (diff) |
tdf#123936 Formatting files in module sal with clang-format
Change-Id: I04a773e8fd565f57dc0eb887fb4714b6edbb35e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105699
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
34 files changed, 111 insertions, 159 deletions
diff --git a/sal/inc/backtraceasstring.hxx b/sal/inc/backtraceasstring.hxx index d49aa2690ea5..e857ea476730 100644 --- a/sal/inc/backtraceasstring.hxx +++ b/sal/inc/backtraceasstring.hxx @@ -15,12 +15,10 @@ #include <rtl/ustring.hxx> #include <sal/types.h> -namespace osl::detail { - +namespace osl::detail +{ /// Build a debugging backtrace from current PC location. OUString backtraceAsString(sal_uInt32 maxDepth); - } #endif // INCLUDED_SAL_INC_INTERNAL_MISC_H - diff --git a/sal/inc/oslmemory.h b/sal/inc/oslmemory.h index 011a6e320606..de99e9851e80 100644 --- a/sal/inc/oslmemory.h +++ b/sal/inc/oslmemory.h @@ -17,9 +17,9 @@ extern "C" { #endif -void* osl_aligned_alloc( sal_Size align, sal_Size size ); +void* osl_aligned_alloc(sal_Size align, sal_Size size); -void osl_aligned_free( void* p ); +void osl_aligned_free(void* p); #if defined __cplusplus } diff --git a/sal/osl/all/signalshared.cxx b/sal/osl/all/signalshared.cxx index d6998eb006ca..2fc72c478fcc 100644 --- a/sal/osl/all/signalshared.cxx +++ b/sal/osl/all/signalshared.cxx @@ -47,7 +47,6 @@ bool deInitSignal() return bRet; } - } oslSignalAction callSignalHandler(oslSignalInfo* pInfo) @@ -57,8 +56,7 @@ oslSignalAction callSignalHandler(oslSignalInfo* pInfo) while (pHandler) { - if ((Action = pHandler->Handler(pHandler->pData, pInfo)) - != osl_Signal_ActCallNextHdl) + if ((Action = pHandler->Handler(pHandler->pData, pInfo)) != osl_Signal_ActCallNextHdl) break; pHandler = pHandler->pNext; @@ -75,17 +73,18 @@ oslSignalHandler SAL_CALL osl_addSignalHandler(oslSignalHandlerFunction handler, if (!bInitSignal) bInitSignal = initSignal(); - oslSignalHandlerImpl* pHandler = static_cast<oslSignalHandlerImpl*>(calloc(1, sizeof(oslSignalHandlerImpl))); + oslSignalHandlerImpl* pHandler + = static_cast<oslSignalHandlerImpl*>(calloc(1, sizeof(oslSignalHandlerImpl))); if (pHandler) { pHandler->Handler = handler; - pHandler->pData = pData; + pHandler->pData = pData; osl_acquireMutex(SignalListMutex); pHandler->pNext = SignalList; - SignalList = pHandler; + SignalList = pHandler; osl_releaseMutex(SignalListMutex); @@ -125,7 +124,7 @@ sal_Bool SAL_CALL osl_removeSignalHandler(oslSignalHandler handler) } pPrevious = pHandler; - pHandler = pHandler->pNext; + pHandler = pHandler->pNext; } osl_releaseMutex(SignalListMutex); @@ -152,7 +151,7 @@ oslSignalAction SAL_CALL osl_raiseSignal(sal_Int32 userSignal, void* userData) return action; } -sal_Bool SAL_CALL osl_setErrorReporting( sal_Bool /*bEnable*/ ) +sal_Bool SAL_CALL osl_setErrorReporting(sal_Bool /*bEnable*/) { // this is part of the stable API return false; diff --git a/sal/osl/unx/createfilehandlefromfd.hxx b/sal/osl/unx/createfilehandlefromfd.hxx index daf20e847d6f..bb8a768ef814 100644 --- a/sal/osl/unx/createfilehandlefromfd.hxx +++ b/sal/osl/unx/createfilehandlefromfd.hxx @@ -14,10 +14,9 @@ #include <osl/file.h> -namespace osl::detail { - +namespace osl::detail +{ oslFileHandle createFileHandleFromFD(int fd); // defined in file.cxx - } #endif diff --git a/sal/osl/unx/file_error_transl.cxx b/sal/osl/unx/file_error_transl.cxx index 60824f71ed34..ad6e00558a40 100644 --- a/sal/osl/unx/file_error_transl.cxx +++ b/sal/osl/unx/file_error_transl.cxx @@ -26,7 +26,7 @@ oslFileError oslTranslateFileError(int Errno) { - switch(Errno) + switch (Errno) { case EPERM: return osl_File_E_PERM; @@ -138,7 +138,7 @@ oslFileError oslTranslateFileError(int Errno) #if EOPNOTSUPP != ENOTSUP case EOPNOTSUPP: #endif - return osl_File_E_NOSYS; + return osl_File_E_NOSYS; #if !defined(AIX) || !(defined(_ALL_SOURCE) && !defined(_LINUX_SOURCE_COMPAT)) case ENOTEMPTY: @@ -148,7 +148,8 @@ oslFileError oslTranslateFileError(int Errno) case ELOOP: return osl_File_E_LOOP; -#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD) || defined(DRAGONFLY)) +#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD) \ + || defined(DRAGONFLY)) case EILSEQ: return osl_File_E_ILSEQ; diff --git a/sal/osl/unx/memory.cxx b/sal/osl/unx/memory.cxx index 745a7f14c3f2..be3e41fb5e8b 100644 --- a/sal/osl/unx/memory.cxx +++ b/sal/osl/unx/memory.cxx @@ -14,7 +14,7 @@ #include <malloc.h> #endif -void* osl_aligned_alloc( sal_Size align, sal_Size size ) +void* osl_aligned_alloc(sal_Size align, sal_Size size) { if (size == 0) { @@ -30,9 +30,6 @@ void* osl_aligned_alloc( sal_Size align, sal_Size size ) #endif } -void osl_aligned_free( void* p ) -{ - free(p); -} +void osl_aligned_free(void* p) { free(p); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/unx/nlsupport.hxx b/sal/osl/unx/nlsupport.hxx index dce5d65c3df8..ba5acf23c277 100644 --- a/sal/osl/unx/nlsupport.hxx +++ b/sal/osl/unx/nlsupport.hxx @@ -24,9 +24,12 @@ #include <rtl/locale.h> -namespace rtl { class OUString; } +namespace rtl +{ +class OUString; +} -void imp_getProcessLocale( rtl_Locale ** ); +void imp_getProcessLocale(rtl_Locale**); #if defined IOS || defined MACOSX OUString macosx_getLocale(); diff --git a/sal/osl/unx/random.cxx b/sal/osl/unx/random.cxx index 5904e7d575b3..260aa61ba8a4 100644 --- a/sal/osl/unx/random.cxx +++ b/sal/osl/unx/random.cxx @@ -18,9 +18,9 @@ int osl_get_system_random_data(char* buffer, size_t desired_len) assert(buffer); fd = open("/dev/urandom", O_RDONLY); - if(fd != -1) + if (fd != -1) { - while(desired_len) + while (desired_len) { ssize_t nb_read; if ((nb_read = read(fd, buffer, desired_len)) == -1) @@ -33,7 +33,7 @@ int osl_get_system_random_data(char* buffer, size_t desired_len) } else { - buffer += nb_read; + buffer += nb_read; desired_len -= nb_read; } } diff --git a/sal/osl/unx/readwrite_helper.hxx b/sal/osl/unx/readwrite_helper.hxx index d73ce56457cb..133ccd016fc9 100644 --- a/sal/osl/unx/readwrite_helper.hxx +++ b/sal/osl/unx/readwrite_helper.hxx @@ -14,12 +14,12 @@ #include <cstddef> -bool safeWrite( int fd, void* data, std::size_t dataSize ); +bool safeWrite(int fd, void* data, std::size_t dataSize); // This function *will* read |count| bytes from |fd|, busy looping // if needed. Don't use it when you don't know if you can request enough // data. It will return sal_False for any partial transfer or error. -bool safeRead( int fd, void* buffer, std::size_t count ); +bool safeRead(int fd, void* buffer, std::size_t count); #endif diff --git a/sal/osl/unx/secimpl.hxx b/sal/osl/unx/secimpl.hxx index f93b85f8f505..1577d6609bc7 100644 --- a/sal/osl/unx/secimpl.hxx +++ b/sal/osl/unx/secimpl.hxx @@ -22,12 +22,13 @@ #include <pwd.h> -struct oslSecurityImpl { +struct oslSecurityImpl +{ struct passwd m_pPasswd; char m_buffer[1]; /* should be a C99 flexible array member */ }; -bool osl_psz_getUserIdent(oslSecurity Security, char *pszIdent, sal_uInt32 nMax); +bool osl_psz_getUserIdent(oslSecurity Security, char* pszIdent, sal_uInt32 nMax); #endif diff --git a/sal/osl/w32/file-impl.hxx b/sal/osl/w32/file-impl.hxx index 550a22dbf6f9..3f1d2136def9 100644 --- a/sal/osl/w32/file-impl.hxx +++ b/sal/osl/w32/file-impl.hxx @@ -18,8 +18,7 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> -extern "C" oslFileHandle osl_createFileHandleFromOSHandle( - HANDLE hFile, sal_uInt32 uFlags); +extern "C" oslFileHandle osl_createFileHandleFromOSHandle(HANDLE hFile, sal_uInt32 uFlags); #endif diff --git a/sal/osl/w32/file_error.hxx b/sal/osl/w32/file_error.hxx index 714297c11eb9..4da87c132cfd 100644 --- a/sal/osl/w32/file_error.hxx +++ b/sal/osl/w32/file_error.hxx @@ -22,7 +22,7 @@ #include <osl/file.h> -oslFileError oslTranslateFileError (/*DWORD*/ unsigned long dwError); +oslFileError oslTranslateFileError(/*DWORD*/ unsigned long dwError); #endif diff --git a/sal/osl/w32/filetime.hxx b/sal/osl/w32/filetime.hxx index db21c4ca34b8..dc355591adce 100644 --- a/sal/osl/w32/filetime.hxx +++ b/sal/osl/w32/filetime.hxx @@ -17,21 +17,22 @@ #include <osl/time.h> -BOOL TimeValueToFileTime(TimeValue const * cpTimeVal, FILETIME * pFTime); +BOOL TimeValueToFileTime(TimeValue const* cpTimeVal, FILETIME* pFTime); -BOOL FileTimeToTimeValue(FILETIME const * cpFTime, TimeValue * pTimeVal); +BOOL FileTimeToTimeValue(FILETIME const* cpFTime, TimeValue* pTimeVal); -namespace osl::detail { - -inline __int64 getFiletime(FILETIME const & ft) { +namespace osl::detail +{ +inline __int64 getFiletime(FILETIME const& ft) +{ return (DWORD64(ft.dwHighDateTime) << 32) | ft.dwLowDateTime; } -inline void setFiletime(FILETIME & ft, __int64 value) { +inline void setFiletime(FILETIME& ft, __int64 value) +{ ft.dwHighDateTime = value >> 32; ft.dwLowDateTime = value & 0xFFFFFFFF; } - } #endif diff --git a/sal/osl/w32/mutex.cxx b/sal/osl/w32/mutex.cxx index 95aca0ce5cef..31a9117a8c68 100644 --- a/sal/osl/w32/mutex.cxx +++ b/sal/osl/w32/mutex.cxx @@ -33,9 +33,9 @@ oslMutex SAL_CALL osl_createMutex(void) { - CRITICAL_SECTION *pMutexImpl; + CRITICAL_SECTION* pMutexImpl; - pMutexImpl = static_cast<CRITICAL_SECTION *>(calloc(sizeof(CRITICAL_SECTION), 1)); + pMutexImpl = static_cast<CRITICAL_SECTION*>(calloc(sizeof(CRITICAL_SECTION), 1)); OSL_ASSERT(pMutexImpl); /* alloc successful? */ @@ -46,7 +46,7 @@ oslMutex SAL_CALL osl_createMutex(void) void SAL_CALL osl_destroyMutex(oslMutex Mutex) { - CRITICAL_SECTION *pMutexImpl = reinterpret_cast<CRITICAL_SECTION *>(Mutex); + CRITICAL_SECTION* pMutexImpl = reinterpret_cast<CRITICAL_SECTION*>(Mutex); if (pMutexImpl) { @@ -57,7 +57,7 @@ void SAL_CALL osl_destroyMutex(oslMutex Mutex) sal_Bool SAL_CALL osl_acquireMutex(oslMutex Mutex) { - CRITICAL_SECTION *pMutexImpl = reinterpret_cast<CRITICAL_SECTION *>(Mutex); + CRITICAL_SECTION* pMutexImpl = reinterpret_cast<CRITICAL_SECTION*>(Mutex); OSL_ASSERT(Mutex); @@ -68,7 +68,7 @@ sal_Bool SAL_CALL osl_acquireMutex(oslMutex Mutex) sal_Bool SAL_CALL osl_tryToAcquireMutex(oslMutex Mutex) { - CRITICAL_SECTION *pMutexImpl = reinterpret_cast<CRITICAL_SECTION *>(Mutex); + CRITICAL_SECTION* pMutexImpl = reinterpret_cast<CRITICAL_SECTION*>(Mutex); OSL_ASSERT(Mutex); @@ -77,7 +77,7 @@ sal_Bool SAL_CALL osl_tryToAcquireMutex(oslMutex Mutex) sal_Bool SAL_CALL osl_releaseMutex(oslMutex Mutex) { - CRITICAL_SECTION *pMutexImpl = reinterpret_cast<CRITICAL_SECTION *>(Mutex); + CRITICAL_SECTION* pMutexImpl = reinterpret_cast<CRITICAL_SECTION*>(Mutex); OSL_ASSERT(Mutex); @@ -89,9 +89,6 @@ sal_Bool SAL_CALL osl_releaseMutex(oslMutex Mutex) /* initialized in dllentry.c */ oslMutex g_Mutex; -oslMutex * SAL_CALL osl_getGlobalMutex(void) -{ - return &g_Mutex; -} +oslMutex* SAL_CALL osl_getGlobalMutex(void) { return &g_Mutex; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/w32/nlsupport.hxx b/sal/osl/w32/nlsupport.hxx index cd09babb21d1..2d818c378b3e 100644 --- a/sal/osl/w32/nlsupport.hxx +++ b/sal/osl/w32/nlsupport.hxx @@ -14,7 +14,7 @@ #include <rtl/locale.h> -void imp_getProcessLocale(rtl_Locale ** ppLocale); +void imp_getProcessLocale(rtl_Locale** ppLocale); #endif diff --git a/sal/osl/w32/procimpl.hxx b/sal/osl/w32/procimpl.hxx index ee985e3229eb..fb1263fa78a3 100644 --- a/sal/osl/w32/procimpl.hxx +++ b/sal/osl/w32/procimpl.hxx @@ -22,9 +22,10 @@ #include <osl/process.h> -struct oslProcessImpl { +struct oslProcessImpl +{ HANDLE m_hProcess; - DWORD m_IdProcess; + DWORD m_IdProcess; }; #endif diff --git a/sal/osl/w32/random.cxx b/sal/osl/w32/random.cxx index ce495a8e3dc4..c873a8d3b5f0 100644 --- a/sal/osl/w32/random.cxx +++ b/sal/osl/w32/random.cxx @@ -21,15 +21,15 @@ int osl_get_system_random_data(char* buffer, size_t desired_len) unsigned int val; /* if unaligned fill to alignment */ - if(reinterpret_cast<uintptr_t>(buffer) & 3) + if (reinterpret_cast<uintptr_t>(buffer) & 3) { size_t len = 4 - (reinterpret_cast<size_t>(buffer) & 3); - if(len > desired_len) + if (len > desired_len) { len = desired_len; } - if(rand_s(&val)) + if (rand_s(&val)) { return 0; } @@ -38,9 +38,9 @@ int osl_get_system_random_data(char* buffer, size_t desired_len) desired_len -= len; } /* fill directly into the buffer as long as we can */ - while(desired_len >= 4) + while (desired_len >= 4) { - if(rand_s(reinterpret_cast<unsigned int*>(buffer))) + if (rand_s(reinterpret_cast<unsigned int*>(buffer))) { return 0; } @@ -51,9 +51,9 @@ int osl_get_system_random_data(char* buffer, size_t desired_len) } } /* deal with the partial int reminder to fill */ - if(desired_len) + if (desired_len) { - if(rand_s(&val)) + if (rand_s(&val)) { return 0; } @@ -62,5 +62,4 @@ int osl_get_system_random_data(char* buffer, size_t desired_len) return 1; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/w32/secimpl.hxx b/sal/osl/w32/secimpl.hxx index b1f8746f912f..7c952bb64250 100644 --- a/sal/osl/w32/secimpl.hxx +++ b/sal/osl/w32/secimpl.hxx @@ -26,12 +26,13 @@ #define USER_BUFFER_SIZE 256 -typedef struct { +typedef struct +{ HANDLE m_hProfile; HANDLE m_hToken; - sal_Unicode m_User[USER_BUFFER_SIZE]; -/* extension by fileserver login */ - NETRESOURCEW *m_pNetResource; + sal_Unicode m_User[USER_BUFFER_SIZE]; + /* extension by fileserver login */ + NETRESOURCEW* m_pNetResource; } oslSecurityImpl; #endif diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx index aa5662221c7c..dcb05beae097 100644 --- a/sal/osl/w32/signal.cxx +++ b/sal/osl/w32/signal.cxx @@ -71,7 +71,7 @@ long WINAPI signalHandlerFunction(LPEXCEPTION_POINTERS lpEP) oslSignalInfo info; info.UserSignal = lpEP->ExceptionRecord->ExceptionCode; - info.UserData = nullptr; + info.UserData = nullptr; switch (lpEP->ExceptionRecord->ExceptionCode) { @@ -102,7 +102,7 @@ long WINAPI signalHandlerFunction(LPEXCEPTION_POINTERS lpEP) oslSignalAction action; - if ( !bNested ) + if (!bNested) { bNested = true; action = callSignalHandler(&info); @@ -110,7 +110,7 @@ long WINAPI signalHandlerFunction(LPEXCEPTION_POINTERS lpEP) else action = osl_Signal_ActKillApp; - switch ( action ) + switch (action) { case osl_Signal_ActCallNextHdl: return EXCEPTION_CONTINUE_SEARCH; @@ -128,7 +128,6 @@ long WINAPI signalHandlerFunction(LPEXCEPTION_POINTERS lpEP) return EXCEPTION_CONTINUE_EXECUTION; } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/w32/system.h b/sal/osl/w32/system.h index e1896f13e23c..921d746fd962 100644 --- a/sal/osl/w32/system.h +++ b/sal/osl/w32/system.h @@ -18,7 +18,7 @@ */ #if OSL_DEBUG_LEVEL <= 3 -# define NO_DEBUG_CRT +#define NO_DEBUG_CRT #endif #include <stdio.h> @@ -48,7 +48,7 @@ #include <ws2tcpip.h> #include <shlobj.h> #ifndef NO_DEBUG_CRT - #include <crtdbg.h> +#include <crtdbg.h> #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/inc/stringhelper.hxx b/sal/qa/inc/stringhelper.hxx index 5bce6ebbb7e9..24222b915c5b 100644 --- a/sal/qa/inc/stringhelper.hxx +++ b/sal/qa/inc/stringhelper.hxx @@ -23,9 +23,9 @@ #include <rtl/ustring.hxx> #include <rtl/string.hxx> -inline void operator <<= (OString& _rAsciiString, OUString const & _rUnicodeString) +inline void operator<<=(OString& _rAsciiString, OUString const& _rUnicodeString) { - _rAsciiString = OUStringToOString(_rUnicodeString,RTL_TEXTENCODING_ASCII_US); + _rAsciiString = OUStringToOString(_rUnicodeString, RTL_TEXTENCODING_ASCII_US); } #endif diff --git a/sal/qa/osl/condition/osl_Condition_Const.h b/sal/qa/osl/condition/osl_Condition_Const.h index 6bcf9e73018d..89b26121ba88 100644 --- a/sal/qa/osl/condition/osl_Condition_Const.h +++ b/sal/qa/osl/condition/osl_Condition_Const.h @@ -38,7 +38,7 @@ // condition names -OUString aTestCon( "testcondition" ); +OUString aTestCon("testcondition"); const char pTestString[17] = "Sun Microsystems"; diff --git a/sal/qa/osl/module/osl_Module_DLL.cxx b/sal/qa/osl/module/osl_Module_DLL.cxx index b8d4885969cb..59f30b137a6f 100644 --- a/sal/qa/osl/module/osl_Module_DLL.cxx +++ b/sal/qa/osl/module/osl_Module_DLL.cxx @@ -27,9 +27,6 @@ // But we instantiate a test plugin to fake the build process. CPPUNIT_PLUGIN_IMPLEMENT(); -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool firstfunc( sal_Bool ) -{ - return true; -} +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool firstfunc(sal_Bool) { return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/security/osl_Security_Const.h b/sal/qa/osl/security/osl_Security_Const.h index 58f578814693..8329962a3dfb 100644 --- a/sal/qa/osl/security/osl_Security_Const.h +++ b/sal/qa/osl/security/osl_Security_Const.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_SAL_QA_OSL_SECURITY_OSL_SECURITY_CONST_H #define INCLUDED_SAL_QA_OSL_SECURITY_OSL_SECURITY_CONST_H -#if defined(_WIN32) // Windows +#if defined(_WIN32) // Windows #include <io.h> #endif @@ -32,7 +32,7 @@ #include <stdlib.h> #include <stdio.h> -#if ( defined UNX ) +#if (defined UNX) #include <unistd.h> #include <pwd.h> #endif diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx index dc09f2a0da08..10f378c1acf9 100644 --- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx +++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx @@ -16,11 +16,13 @@ #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> -namespace { - -class Test: public CppUnit::TestFixture { +namespace +{ +class Test : public CppUnit::TestFixture +{ private: - void test() { + void test() + { OUStringBuffer b1; OUString s1("123456789012345"); b1 = s1; @@ -70,7 +72,6 @@ private: CPPUNIT_TEST(test); CPPUNIT_TEST_SUITE_END(); }; - } CPPUNIT_TEST_SUITE_REGISTRATION(Test); diff --git a/sal/qa/rtl/process/child_process_id.cxx b/sal/qa/rtl/process/child_process_id.cxx index 17f330fa703f..077f5c668761 100644 --- a/sal/qa/rtl/process/child_process_id.cxx +++ b/sal/qa/rtl/process/child_process_id.cxx @@ -22,20 +22,20 @@ #include <rtl/process.h> #include <rtl_Process_Const.h> -void printUuid( sal_uInt8 *pNode ) +void printUuid(sal_uInt8* pNode) { - for( sal_Int32 i1 = 0 ; i1 < 4 ; i1++ ) + for (sal_Int32 i1 = 0; i1 < 4; i1++) { - for( sal_Int32 i2 = 0 ; i2 < 4 ; i2++ ) + for (sal_Int32 i2 = 0; i2 < 4; i2++) { - sal_uInt8 nValue = pNode[i1*4 +i2]; + sal_uInt8 nValue = pNode[i1 * 4 + i2]; if (nValue < 16) { - printf( "0"); + printf("0"); } - printf( "%02x" ,nValue ); + printf("%02x", nValue); } - if( i1 == 3 ) + if (i1 == 3) break; //printf( "-" ); } @@ -46,8 +46,8 @@ void printUuid( sal_uInt8 *pNode ) SAL_IMPLEMENT_MAIN() { sal_uInt8 pTargetUUID[16]; - rtl_getGlobalProcessId( pTargetUUID ); - printUuid( pTargetUUID ); + rtl_getGlobalProcessId(pTargetUUID); + printUuid(pTargetUUID); return 1; } diff --git a/sal/qa/rtl/process/rtl_Process_Const.h b/sal/qa/rtl/process/rtl_Process_Const.h index 50c38eb97e6a..aab40ff9a86f 100644 --- a/sal/qa/rtl/process/rtl_Process_Const.h +++ b/sal/qa/rtl/process/rtl_Process_Const.h @@ -23,8 +23,7 @@ #include <rtl/ustring.hxx> #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif OUString suParam0("-join"); diff --git a/sal/rtl/unload.cxx b/sal/rtl/unload.cxx index 975e575db5e9..beac56ffa1ad 100644 --- a/sal/rtl/unload.cxx +++ b/sal/rtl/unload.cxx @@ -22,12 +22,11 @@ #include <osl/time.h> #include <rtl/unload.h> -extern "C" void rtl_moduleCount_acquire(rtl_ModuleCount *) {} +extern "C" void rtl_moduleCount_acquire(rtl_ModuleCount*) {} -extern "C" void rtl_moduleCount_release(rtl_ModuleCount *) {} +extern "C" void rtl_moduleCount_release(rtl_ModuleCount*) {} -extern "C" sal_Bool rtl_moduleCount_canUnload( - rtl_StandardModuleCount *, TimeValue *) +extern "C" sal_Bool rtl_moduleCount_canUnload(rtl_StandardModuleCount*, TimeValue*) { return false; } diff --git a/sal/textenc/context.cxx b/sal/textenc/context.cxx index 1b7a2eff8a40..7d7e75d3b878 100644 --- a/sal/textenc/context.cxx +++ b/sal/textenc/context.cxx @@ -21,23 +21,22 @@ #include "context.hxx" -void * ImplCreateUnicodeToTextContext() +void* ImplCreateUnicodeToTextContext() { - ImplUnicodeToTextContext * pContext = new ImplUnicodeToTextContext; + ImplUnicodeToTextContext* pContext = new ImplUnicodeToTextContext; pContext->m_nHighSurrogate = 0; return pContext; } -void ImplResetUnicodeToTextContext(void * pContext) +void ImplResetUnicodeToTextContext(void* pContext) { if (pContext) - static_cast< ImplUnicodeToTextContext * >(pContext)->m_nHighSurrogate = - 0; + static_cast<ImplUnicodeToTextContext*>(pContext)->m_nHighSurrogate = 0; } -void ImplDestroyUnicodeToTextContext(void * pContext) +void ImplDestroyUnicodeToTextContext(void* pContext) { - delete static_cast< ImplUnicodeToTextContext * >(pContext); + delete static_cast<ImplUnicodeToTextContext*>(pContext); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/textenc/context.hxx b/sal/textenc/context.hxx index e887bab53ccc..11684cf49f61 100644 --- a/sal/textenc/context.hxx +++ b/sal/textenc/context.hxx @@ -26,10 +26,10 @@ struct ImplUnicodeToTextContext sal_Unicode m_nHighSurrogate; }; -void * ImplCreateUnicodeToTextContext(); +void* ImplCreateUnicodeToTextContext(); -void ImplResetUnicodeToTextContext(void * pContext); +void ImplResetUnicodeToTextContext(void* pContext); -void ImplDestroyUnicodeToTextContext(void * pContext); +void ImplDestroyUnicodeToTextContext(void* pContext); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/textenc/gettextencodingdata.hxx b/sal/textenc/gettextencodingdata.hxx index 88f22be36424..8dbab7c08980 100644 --- a/sal/textenc/gettextencodingdata.hxx +++ b/sal/textenc/gettextencodingdata.hxx @@ -25,7 +25,6 @@ #include "tenchelp.hxx" -ImplTextEncodingData const * -Impl_getTextEncodingData(rtl_TextEncoding nEncoding); +ImplTextEncodingData const* Impl_getTextEncodingData(rtl_TextEncoding nEncoding); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/textenc/unichars.cxx b/sal/textenc/unichars.cxx index 165ebbeb78de..abd6945cfb31 100644 --- a/sal/textenc/unichars.cxx +++ b/sal/textenc/unichars.cxx @@ -27,8 +27,7 @@ bool ImplIsControlOrFormat(sal_uInt32 nUtf32) // <http://www.unicode.org/Public/UNIDATA/UnicodeData.txt>, Version 3.1.1, // that have a General Category of Cc (Other, Control) or Cf (Other, // Format): - return nUtf32 <= 0x001F - || (nUtf32 >= 0x007F && nUtf32 <= 0x009F) + return nUtf32 <= 0x001F || (nUtf32 >= 0x007F && nUtf32 <= 0x009F) || nUtf32 == 0x070F // SYRIAC ABBREVIATION MARK || nUtf32 == 0x180B // MONGOLIAN FREE VARIATION SELECTOR ONE || nUtf32 == 0x180C // MONGOLIAN FREE VARIATION SELECTOR TWO @@ -70,8 +69,7 @@ bool ImplIsPrivateUse(sal_uInt32 nUtf32) // All code points of // <http://www.unicode.org/Public/UNIDATA/UnicodeData.txt>, Version 3.1.1, // that have a General Category of Co (Other, Private Use): - return (nUtf32 >= 0xE000 && nUtf32 <= 0xF8FF) - || (nUtf32 >= 0xF0000 && nUtf32 <= 0xFFFFD) + return (nUtf32 >= 0xE000 && nUtf32 <= 0xF8FF) || (nUtf32 >= 0xF0000 && nUtf32 <= 0xFFFFD) || (nUtf32 >= 0x100000 && nUtf32 <= 0x10FFFD); } diff --git a/sal/textenc/unichars.hxx b/sal/textenc/unichars.hxx index e11e47493183..8ca1021da005 100644 --- a/sal/textenc/unichars.hxx +++ b/sal/textenc/unichars.hxx @@ -31,13 +31,11 @@ bool ImplIsControlOrFormat(sal_uInt32 nUtf32); -inline bool ImplIsHighSurrogate(sal_uInt32 nUtf32) -{ return nUtf32 >= 0xD800 && nUtf32 <= 0xDBFF; } - // All code points that are high-surrogates, as of Unicode 3.1.1. +// All code points that are high-surrogates, as of Unicode 3.1.1. +inline bool ImplIsHighSurrogate(sal_uInt32 nUtf32) { return nUtf32 >= 0xD800 && nUtf32 <= 0xDBFF; } -inline bool ImplIsLowSurrogate(sal_uInt32 nUtf32) -{ return nUtf32 >= 0xDC00 && nUtf32 <= 0xDFFF; } - // All code points that are low-surrogates, as of Unicode 3.1.1. +// All code points that are low-surrogates, as of Unicode 3.1.1. +inline bool ImplIsLowSurrogate(sal_uInt32 nUtf32) { return nUtf32 >= 0xDC00 && nUtf32 <= 0xDFFF; } bool ImplIsPrivateUse(sal_uInt32 nUtf32); diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index adc338c3b886..8fad39526971 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -8199,23 +8199,18 @@ sal/android/libreofficekit-jni.c sal/android/lo-bootstrap.c sal/android/uthash.h sal/cppunittester/cppunittester.cxx -sal/inc/backtraceasstring.hxx -sal/inc/oslmemory.h sal/inc/signalshared.hxx sal/osl/all/compat.cxx sal/osl/all/debugbase.cxx sal/osl/all/filepath.cxx sal/osl/all/loadmodulerelative.cxx sal/osl/all/log.cxx -sal/osl/all/signalshared.cxx sal/osl/all/utility.cxx sal/osl/unx/backtrace.c sal/osl/unx/backtrace.h sal/osl/unx/backtraceapi.cxx sal/osl/unx/conditn.cxx -sal/osl/unx/createfilehandlefromfd.hxx sal/osl/unx/file.cxx -sal/osl/unx/file_error_transl.cxx sal/osl/unx/file_impl.hxx sal/osl/unx/file_misc.cxx sal/osl/unx/file_path_helper.cxx @@ -8225,21 +8220,16 @@ sal/osl/unx/file_url.cxx sal/osl/unx/file_url.hxx sal/osl/unx/file_volume.cxx sal/osl/unx/interlck.cxx -sal/osl/unx/memory.cxx sal/osl/unx/module.cxx sal/osl/unx/mutex.cxx sal/osl/unx/nlsupport.cxx -sal/osl/unx/nlsupport.hxx sal/osl/unx/osxlocale.cxx sal/osl/unx/pipe.cxx sal/osl/unx/process.cxx sal/osl/unx/process_impl.cxx sal/osl/unx/profile.cxx -sal/osl/unx/random.cxx sal/osl/unx/readwrite_helper.cxx -sal/osl/unx/readwrite_helper.hxx sal/osl/unx/salinit.cxx -sal/osl/unx/secimpl.hxx sal/osl/unx/security.cxx sal/osl/unx/signal.cxx sal/osl/unx/socket.cxx @@ -8254,34 +8244,24 @@ sal/osl/unx/uunxapi.hxx sal/osl/w32/backtrace.cxx sal/osl/w32/conditn.cxx sal/osl/w32/dllentry.cxx -sal/osl/w32/file-impl.hxx sal/osl/w32/file.cxx sal/osl/w32/file_dirvol.cxx sal/osl/w32/file_error.cxx -sal/osl/w32/file_error.hxx sal/osl/w32/file_url.cxx sal/osl/w32/file_url.hxx -sal/osl/w32/filetime.hxx sal/osl/w32/memory.cxx sal/osl/w32/module.cxx -sal/osl/w32/mutex.cxx sal/osl/w32/nlsupport.cxx -sal/osl/w32/nlsupport.hxx sal/osl/w32/path_helper.cxx sal/osl/w32/path_helper.hxx sal/osl/w32/pipe.cxx sal/osl/w32/process.cxx sal/osl/w32/procimpl.cxx -sal/osl/w32/procimpl.hxx sal/osl/w32/profile.cxx -sal/osl/w32/random.cxx sal/osl/w32/salinit.cxx -sal/osl/w32/secimpl.hxx sal/osl/w32/security.cxx -sal/osl/w32/signal.cxx sal/osl/w32/socket.cxx sal/osl/w32/sockimpl.hxx -sal/osl/w32/system.h sal/osl/w32/tempfile.cxx sal/osl/w32/thread.cxx sal/osl/w32/time.cxx @@ -8289,10 +8269,8 @@ sal/qa/ByteSequence/ByteSequence.cxx sal/qa/OStringBuffer/rtl_OStringBuffer.cxx sal/qa/OStringBuffer/rtl_String_Const.h sal/qa/OStringBuffer/rtl_String_Utils_Const.h -sal/qa/inc/stringhelper.hxx sal/qa/inc/valueequal.hxx sal/qa/osl/condition/osl_Condition.cxx -sal/qa/osl/condition/osl_Condition_Const.h sal/qa/osl/file/osl_File.cxx sal/qa/osl/file/osl_File_Const.h sal/qa/osl/file/osl_old_test_file.cxx @@ -8300,7 +8278,6 @@ sal/qa/osl/file/test_cpy_wrt_file.cxx sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx sal/qa/osl/module/osl_Module.cxx sal/qa/osl/module/osl_Module_Const.h -sal/qa/osl/module/osl_Module_DLL.cxx sal/qa/osl/mutex/osl_Mutex.cxx sal/qa/osl/pipe/osl_Pipe.cxx sal/qa/osl/process/osl_Thread.cxx @@ -8309,7 +8286,6 @@ sal/qa/osl/process/osl_process_child.cxx sal/qa/osl/profile/osl_old_testprofile.cxx sal/qa/osl/security/TODO.h sal/qa/osl/security/osl_Security.cxx -sal/qa/osl/security/osl_Security_Const.h sal/qa/osl/setthreadname/test-setthreadname.cxx sal/qa/osl/thread/test_thread.cxx sal/qa/rtl/alloc/rtl_alloc.cxx @@ -8327,13 +8303,10 @@ sal/qa/rtl/oustring/rtl_OUString2.cxx sal/qa/rtl/oustring/rtl_ustr.cxx sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx sal/qa/rtl/oustringbuffer/test_oustringbuffer_appenduninitialized.cxx -sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx sal/qa/rtl/process/child_process.cxx -sal/qa/rtl/process/child_process_id.cxx sal/qa/rtl/process/rtl_Process.cxx -sal/qa/rtl/process/rtl_Process_Const.h sal/qa/rtl/random/rtl_random.cxx sal/qa/rtl/ref/rtl_ref.cxx sal/qa/rtl/strings/test_ostring.cxx @@ -8379,14 +8352,11 @@ sal/rtl/strimp.cxx sal/rtl/strimp.hxx sal/rtl/string.cxx sal/rtl/strtmpl.cxx -sal/rtl/unload.cxx sal/rtl/uri.cxx sal/rtl/ustrbuf.cxx sal/rtl/ustring.cxx sal/rtl/uuid.cxx sal/test/testbootstrap.cxx -sal/textenc/context.cxx -sal/textenc/context.hxx sal/textenc/convertbig5hkscs.cxx sal/textenc/convertbig5hkscs.hxx sal/textenc/converter.cxx @@ -8407,7 +8377,6 @@ sal/textenc/convertsimple.cxx sal/textenc/convertsimple.hxx sal/textenc/convertsinglebytetobmpunicode.cxx sal/textenc/convertsinglebytetobmpunicode.hxx -sal/textenc/gettextencodingdata.hxx sal/textenc/handleundefinedunicodetotextchar.cxx sal/textenc/handleundefinedunicodetotextchar.hxx sal/textenc/tables.cxx @@ -8421,8 +8390,6 @@ sal/textenc/tenchelp.hxx sal/textenc/tencinfo.cxx sal/textenc/textcvt.cxx sal/textenc/textenc.cxx -sal/textenc/unichars.cxx -sal/textenc/unichars.hxx salhelper/qa/test_api.cxx salhelper/source/condition.cxx salhelper/source/dynload.cxx |