diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-09 10:43:00 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-10 18:32:00 +0100 |
commit | 9747c41d6c3106a82092b3732323d9c78f500ed8 (patch) | |
tree | 8bcdb5e76ada85ee4d1669f29dd21e356e9d3108 /sal | |
parent | 34dc2317b2f9e5f181dc0a5420e24cafc3561a09 (diff) |
Drop __osl_ prefix from static entities (avoid reserved identifiers)
Change-Id: I725783d10bc1e6300c480542c536d409433ff532
Diffstat (limited to 'sal')
-rw-r--r-- | sal/osl/unx/pipe.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sal/osl/unx/pipe.cxx b/sal/osl/unx/pipe.cxx index 37ac7ec91e8f..c47d92b429c5 100644 --- a/sal/osl/unx/pipe.cxx +++ b/sal/osl/unx/pipe.cxx @@ -73,7 +73,7 @@ static oslPipeError osl_PipeErrorFromNative(int nativeType) return PipeError[i].error; } -oslPipe __osl_createPipeImpl() +static oslPipe createPipeImpl() { oslPipe pPipeImpl; @@ -89,7 +89,7 @@ oslPipe __osl_createPipeImpl() return pPipeImpl; } -void __osl_destroyPipeImpl(oslPipe pImpl) +static void destroyPipeImpl(oslPipe pImpl) { if (pImpl != nullptr) free(pImpl); @@ -214,7 +214,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions } /* alloc memory */ - pPipe = __osl_createPipeImpl(); + pPipe = createPipeImpl(); if (pPipe == nullptr) return nullptr; @@ -224,7 +224,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions if ( pPipe->m_Socket < 0 ) { SAL_WARN("sal.osl.pipe", "socket() failed: " << strerror(errno)); - __osl_destroyPipeImpl(pPipe); + destroyPipeImpl(pPipe); return nullptr; } @@ -261,7 +261,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions if ( connect(pPipe->m_Socket, reinterpret_cast<sockaddr *>(&addr), len) >= 0 ) { close (pPipe->m_Socket); - __osl_destroyPipeImpl(pPipe); + destroyPipeImpl(pPipe); return nullptr; } @@ -273,7 +273,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions { SAL_WARN("sal.osl.pipe", "bind() failed: " << strerror(errno)); close (pPipe->m_Socket); - __osl_destroyPipeImpl(pPipe); + destroyPipeImpl(pPipe); return nullptr; } @@ -294,7 +294,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions // that point in time: unlink(name); /* remove filesystem entry */ close (pPipe->m_Socket); - __osl_destroyPipeImpl(pPipe); + destroyPipeImpl(pPipe); return nullptr; } @@ -313,7 +313,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions } close (pPipe->m_Socket); - __osl_destroyPipeImpl(pPipe); + destroyPipeImpl(pPipe); return nullptr; } } @@ -334,7 +334,7 @@ void SAL_CALL osl_releasePipe( oslPipe pPipe ) if( ! pPipe->m_bClosed ) osl_closePipe( pPipe ); - __osl_destroyPipeImpl( pPipe ); + destroyPipeImpl( pPipe ); } } @@ -447,7 +447,7 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe) else { /* alloc memory */ - pAcceptedPipe = __osl_createPipeImpl(); + pAcceptedPipe = createPipeImpl(); OSL_ASSERT(pAcceptedPipe); if(pAcceptedPipe==nullptr) |