From ba233e87efddf0a6751b35784dca1c805364ff3b Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 11 Feb 2015 13:20:49 +0200 Subject: remove unnecessary parenthesis in return statements found with $ git grep -lP 'return\s*\(\s*\w+\s*\)\s*;' Change-Id: Ic51606877a9edcadeb647c5bf17bc928b69ab60e --- store/source/lockbyte.cxx | 6 +++--- store/source/storbase.hxx | 8 ++++---- store/source/storcach.cxx | 4 ++-- store/source/stortree.cxx | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'store') diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx index 1fd9a0d0bf09..da6170cfe7d0 100644 --- a/store/source/lockbyte.cxx +++ b/store/source/lockbyte.cxx @@ -347,11 +347,11 @@ storeError FileLockBytes::initialize_Impl (rtl::Reference< PageData::Allocator > { storeError result = initSize_Impl (m_nSize); if (result != store_E_None) - return (result); + return result; result = PageData::Allocator::createInstance (rxAllocator, nPageSize); if (result != store_E_None) - return (result); + return result; // @see readPageAt_Impl(). m_xAllocator = rxAllocator; @@ -844,7 +844,7 @@ FileLockBytes_createInstance ( ResourceHolder xFile; storeError result = xFile.get().initialize (pFilename, eAccessMode); if (result != store_E_None) - return (result); + return result; if (eAccessMode == store_AccessReadOnly) { diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx index 2cc68bd2864f..eb980a16320c 100644 --- a/store/source/storbase.hxx +++ b/store/source/storbase.hxx @@ -76,11 +76,11 @@ inline sal_uInt16 ntohs (sal_uInt16 n) { return OSL_SWAPWORD(n); } inline sal_uInt32 htonl (sal_uInt32 h) { return OSL_SWAPDWORD(h); } inline sal_uInt32 ntohl (sal_uInt32 n) { return OSL_SWAPDWORD(n); } #else -inline sal_uInt16 htons (sal_uInt16 h) { return (h); } -inline sal_uInt16 ntohs (sal_uInt16 n) { return (n); } +inline sal_uInt16 htons (sal_uInt16 h) { return h; } +inline sal_uInt16 ntohs (sal_uInt16 n) { return n; } -inline sal_uInt32 htonl (sal_uInt32 h) { return (h); } -inline sal_uInt32 ntohl (sal_uInt32 n) { return (n); } +inline sal_uInt32 htonl (sal_uInt32 h) { return h; } +inline sal_uInt32 ntohl (sal_uInt32 n) { return n; } #endif /* OSL_BIGENDIAN */ /** swap. diff --git a/store/source/storcach.cxx b/store/source/storcach.cxx index ed86b3e31d3a..e4c348f29865 100644 --- a/store/source/storcach.cxx +++ b/store/source/storcach.cxx @@ -199,7 +199,7 @@ static int highbit(sal_Size n) int k = 1; if (n == 0) - return (0); + return 0; #if SAL_TYPES_SIZEOFLONG == 8 if (n & 0xffffffff00000000ul) k |= 32, n >>= 32; @@ -215,7 +215,7 @@ static int highbit(sal_Size n) if (n & 0x02) k++; - return (k); + return k; } //PageCache_Impl implementation diff --git a/store/source/stortree.cxx b/store/source/stortree.cxx index a491aff81524..87f731649159 100644 --- a/store/source/stortree.cxx +++ b/store/source/stortree.cxx @@ -68,7 +68,7 @@ sal_uInt16 OStoreBTreeNodeData::find (const T& t) const sal_Int32 const m = ((l + r) >> 1); if (t.m_aKey == m_pData[m].m_aKey) - return ((sal_uInt16)(m)); + return (sal_uInt16)m; if (t.m_aKey < m_pData[m].m_aKey) r = m - 1; else @@ -77,9 +77,9 @@ sal_uInt16 OStoreBTreeNodeData::find (const T& t) const sal_uInt16 const k = ((sal_uInt16)(r)); if ((k < capacityCount()) && (t.m_aKey < m_pData[k].m_aKey)) - return(k - 1); + return k - 1; else - return(k); + return k; } /* -- cgit