diff options
author | Matúš Kukan <matus.kukan@collabora.com> | 2014-03-03 17:17:52 +0100 |
---|---|---|
committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-03-18 20:13:57 +0100 |
commit | aae5ef0e5c48bf4ff5bd72d25811a93f46f334bb (patch) | |
tree | f29ce43c918f49a94bcac95c480fd0ce78e76a52 /ucb | |
parent | webdav: OSL_ENSURE -> SAL_WARN_IF (diff) | |
download | core-aae5ef0e5c48bf4ff5bd72d25811a93f46f334bb.tar.gz core-aae5ef0e5c48bf4ff5bd72d25811a93f46f334bb.zip |
webdav: OSL_ASSERT -> assert
Change-Id: Ic6c7307aa9f8422816b9a335cbf3541c948026ce
Diffstat (limited to 'ucb')
-rw-r--r-- | ucb/source/ucp/webdav/DAVSessionFactory.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/webdav/SerfSession.cxx | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.cxx b/ucb/source/ucp/webdav/DAVSessionFactory.cxx index 409d2e9c55ee..c2f1dd29845e 100644 --- a/ucb/source/ucp/webdav/DAVSessionFactory.cxx +++ b/ucb/source/ucp/webdav/DAVSessionFactory.cxx @@ -88,7 +88,7 @@ rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession( void DAVSessionFactory::releaseElement( DAVSession * pElement ) SAL_THROW(()) { - OSL_ASSERT( pElement ); + assert( pElement ); osl::MutexGuard aGuard( m_aMutex ); if ( pElement->m_aContainerIt != m_aMap.end() ) m_aMap.erase( pElement->m_aContainerIt ); diff --git a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx index bcbc54bb5f1e..2661e10522ee 100644 --- a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx @@ -163,7 +163,7 @@ serf_bucket_t * SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t } else { - OSL_ASSERT("Headers Bucket missing"); + assert("Headers Bucket missing"); } return req_bkt; diff --git a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx index 86a97aee971b..950eb16b74bd 100644 --- a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx @@ -169,7 +169,7 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_ } else { - OSL_ASSERT("Headers Bucket missing"); + assert("Headers Bucket missing"); } return req_bkt; diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx index fd5850aa58ab..a124d107321a 100644 --- a/ucb/source/ucp/webdav/SerfSession.cxx +++ b/ucb/source/ucp/webdav/SerfSession.cxx @@ -372,8 +372,8 @@ apr_status_t SerfSession::verifySerfCertificateChain ( // Check arguments. if (pCertificateChainBase64Encoded == NULL || nCertificateChainLength<=0) { - OSL_ASSERT(pCertificateChainBase64Encoded != NULL); - OSL_ASSERT(nCertificateChainLength>0); + assert(pCertificateChainBase64Encoded != NULL); + assert(nCertificateChainLength>0); return SERF_SSL_CERT_UNKNOWN_FAILURE; } |