diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-30 13:45:50 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-31 08:33:40 +0200 |
commit | 307be8c9cedb32560419bbb09e029b906e5f1acd (patch) | |
tree | cda408f6f320e7e7cb24dd7e022259c807f0c89e /sal | |
parent | 7c41a3e50433fe67eb361f79121d103929946d23 (diff) |
clang-tidy readability-redundant-control-flow
Change-Id: I832f7ef0f1bd55e365db7e49823fe8bc30390c04
Reviewed-on: https://gerrit.libreoffice.org/38215
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sal')
-rw-r--r-- | sal/osl/all/log.cxx | 1 | ||||
-rw-r--r-- | sal/osl/unx/conditn.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/mutex.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/profile.cxx | 9 | ||||
-rw-r--r-- | sal/osl/unx/socket.cxx | 5 | ||||
-rw-r--r-- | sal/rtl/strbuf.cxx | 1 | ||||
-rw-r--r-- | sal/rtl/ustrbuf.cxx | 1 |
7 files changed, 0 insertions, 21 deletions
diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx index 446108b3c042..1f0138f1266d 100644 --- a/sal/osl/all/log.cxx +++ b/sal/osl/all/log.cxx @@ -181,7 +181,6 @@ void maybeOutputTimestamp(std::ostringstream &s) { ; // nothing } } - return; } #endif diff --git a/sal/osl/unx/conditn.cxx b/sal/osl/unx/conditn.cxx index 56eadde87a17..64a1ea3ae0e7 100644 --- a/sal/osl/unx/conditn.cxx +++ b/sal/osl/unx/conditn.cxx @@ -93,8 +93,6 @@ void SAL_CALL osl_destroyCondition(oslCondition Condition) free(Condition); } - - return; } sal_Bool SAL_CALL osl_setCondition(oslCondition Condition) diff --git a/sal/osl/unx/mutex.cxx b/sal/osl/unx/mutex.cxx index 1e262dd63be8..570b452a4cfa 100644 --- a/sal/osl/unx/mutex.cxx +++ b/sal/osl/unx/mutex.cxx @@ -84,8 +84,6 @@ void SAL_CALL osl_destroyMutex(oslMutexImpl *pMutex) free(pMutex); } - - return; } sal_Bool SAL_CALL osl_acquireMutex(oslMutexImpl *pMutex) diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx index c5e5dd77d819..200bb5d2f578 100644 --- a/sal/osl/unx/profile.cxx +++ b/sal/osl/unx/profile.cxx @@ -1323,8 +1323,6 @@ static void removeLine(osl_TProfileImpl* pProfile, sal_uInt32 LineNo) pProfile->m_NoLines--; } - - return; } static void setEntry(osl_TProfileImpl* pProfile, osl_TProfileSection* pSection, @@ -1335,8 +1333,6 @@ static void setEntry(osl_TProfileImpl* pProfile, osl_TProfileSection* pSection, pSection->m_Entries[NoEntry].m_Line = Line; pSection->m_Entries[NoEntry].m_Offset = Entry - pProfile->m_Lines[Line]; pSection->m_Entries[NoEntry].m_Len = Len; - - return; } static bool addEntry(osl_TProfileImpl* pProfile, @@ -1398,7 +1394,6 @@ static void removeEntry(osl_TProfileSection *pSection, sal_uInt32 NoEntry) pSection->m_NoEntries--; } - return; } static bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char* Section, sal_uInt32 Len) @@ -1474,8 +1469,6 @@ static void removeSection(osl_TProfileImpl* pProfile, osl_TProfileSection *pSect pProfile->m_NoSections--; } - - return; } static osl_TProfileSection* findEntry(osl_TProfileImpl* pProfile, @@ -1763,8 +1756,6 @@ static void osl_ProfileGenerateExtension(const sal_Char* pszFileName, const sal_ cursor += BufferMaxLen - 1; } *cursor = 0; - - return; } static osl_TProfileImpl* acquireProfile(oslProfile Profile, bool bWriteable) diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx index 6b24b0ab0143..973c1d68699e 100644 --- a/sal/osl/unx/socket.cxx +++ b/sal/osl/unx/socket.cxx @@ -971,8 +971,6 @@ void SAL_CALL osl_getHostnameOfHostAddr ( pHostname = osl_psz_getHostnameOfHostAddr(Addr); rtl_uString_newFromAscii (ustrHostname, pHostname); - - return; } const sal_Char* SAL_CALL osl_psz_getHostnameOfHostAddr (const oslHostAddr pAddr) @@ -2276,8 +2274,6 @@ void SAL_CALL osl_getLastSocketErrorDescription(oslSocket Socket, rtl_uString ** osl_psz_getLastSocketErrorDescription(Socket,pszError,sizeof(pszError)); rtl_uString_newFromAscii(ustrError,pszError); - - return; } void SAL_CALL osl_psz_getLastSocketErrorDescription(oslSocket pSocket, sal_Char* pBuffer, sal_uInt32 BufferSize) @@ -2292,7 +2288,6 @@ void SAL_CALL osl_psz_getLastSocketErrorDescription(oslSocket pSocket, sal_Char* } strncpy(pBuffer, strerror(pSocket->m_nLastError), BufferSize-1); - return; } oslSocketError SAL_CALL osl_getLastSocketError(oslSocket pSocket) diff --git a/sal/rtl/strbuf.cxx b/sal/rtl/strbuf.cxx index 374f329f5a55..194e9b159af5 100644 --- a/sal/rtl/strbuf.cxx +++ b/sal/rtl/strbuf.cxx @@ -40,7 +40,6 @@ void SAL_CALL rtl_stringbuffer_newFromStr_WithLength( rtl_String ** newStr, rtl_string_new_WithLength( newStr, count + 16 ); (*newStr)->length = count; memcpy( (*newStr)->buffer, value, count ); - return; } /************************************************************************* diff --git a/sal/rtl/ustrbuf.cxx b/sal/rtl/ustrbuf.cxx index b73318b6e5f4..cef31a5da2ea 100644 --- a/sal/rtl/ustrbuf.cxx +++ b/sal/rtl/ustrbuf.cxx @@ -45,7 +45,6 @@ void SAL_CALL rtl_uStringbuffer_newFromStr_WithLength( rtl_uString ** newStr, (*newStr)->length = count; memcpy( (*newStr)->buffer, value, count * sizeof(sal_Unicode)); RTL_LOG_STRING_NEW( *newStr ); - return; } rtl_uString * SAL_CALL rtl_uStringBuffer_refReturn( rtl_uString * pThis ) |