summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/ucp/webdav/AprEnv.cxx4
-rw-r--r--ucb/source/ucp/webdav/ContentProperties.cxx2
-rw-r--r--ucb/source/ucp/webdav/DAVResourceAccess.hxx2
-rw-r--r--ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx2
-rw-r--r--ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx2
-rw-r--r--ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx14
-rw-r--r--ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx7
-rw-r--r--ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx4
-rw-r--r--ucb/source/ucp/webdav/SerfLockReqProcImpl.hxx2
-rw-r--r--ucb/source/ucp/webdav/SerfLockStore.cxx4
-rw-r--r--ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx2
-rw-r--r--ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx2
-rw-r--r--ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx8
-rw-r--r--ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx16
-rw-r--r--ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx8
-rw-r--r--ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx4
-rw-r--r--ucb/source/ucp/webdav/SerfRequestProcessor.cxx12
-rw-r--r--ucb/source/ucp/webdav/SerfRequestProcessor.hxx2
-rw-r--r--ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx2
-rw-r--r--ucb/source/ucp/webdav/SerfSession.cxx30
20 files changed, 65 insertions, 64 deletions
diff --git a/ucb/source/ucp/webdav/AprEnv.cxx b/ucb/source/ucp/webdav/AprEnv.cxx
index e9e650f8c7a7..a1e61e5f97a2 100644
--- a/ucb/source/ucp/webdav/AprEnv.cxx
+++ b/ucb/source/ucp/webdav/AprEnv.cxx
@@ -23,11 +23,11 @@ namespace apr_environment
{
AprEnv::AprEnv()
- : mpAprPool( 0 )
+ : mpAprPool( nullptr )
{
apr_initialize();
- apr_pool_create(&mpAprPool, NULL);
+ apr_pool_create(&mpAprPool, nullptr);
mpSerfLockStore = new http_dav_ucp::SerfLockStore();
}
diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav/ContentProperties.cxx
index cb30d9affd5d..41830f6264af 100644
--- a/ucb/source/ucp/webdav/ContentProperties.cxx
+++ b/ucb/source/ucp/webdav/ContentProperties.cxx
@@ -189,7 +189,7 @@ const PropertyValue * ContentProperties::get(
++it;
}
- return 0;
+ return nullptr;
}
else
return &(*it).second;
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.hxx b/ucb/source/ucp/webdav/DAVResourceAccess.hxx
index 72c55149d43d..52ff98106a0c 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.hxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.hxx
@@ -53,7 +53,7 @@ class DAVResourceAccess
std::vector< SerfUri > m_aRedirectURIs;
public:
- DAVResourceAccess() : m_xSessionFactory( 0 ) {}
+ DAVResourceAccess() : m_xSessionFactory( nullptr ) {}
DAVResourceAccess( const css::uno::Reference< css::uno::XComponentContext > & rContext,
rtl::Reference< DAVSessionFactory > const & rSessionFactory,
const OUString & rURL );
diff --git a/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
index 1bc20985f40f..0f9a4ea207ca 100644
--- a/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
@@ -44,7 +44,7 @@ serf_bucket_t * SerfCopyReqProcImpl::createSerfRequestBucket( serf_request_t * i
serf_bucket_t *req_bkt = serf_request_bucket_request_create( inSerfRequest,
"COPY",
getPathStr(),
- 0,
+ nullptr,
serf_request_get_alloc( inSerfRequest ) );
// set request header fields
diff --git a/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
index 928740879b8c..141bb0b47f8f 100644
--- a/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
@@ -40,7 +40,7 @@ serf_bucket_t * SerfDeleteReqProcImpl::createSerfRequestBucket( serf_request_t *
serf_bucket_t *req_bkt = serf_request_bucket_request_create( inSerfRequest,
"DELETE",
getPathStr(),
- 0,
+ nullptr,
serf_request_get_alloc( inSerfRequest ) );
// set request header fields
diff --git a/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx
index 470e730615ba..07d12c57a8e6 100644
--- a/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx
@@ -30,8 +30,8 @@ SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath,
: SerfRequestProcessorImpl( inPath, inRequestHeaders )
, xInputStream( xioInStrm )
, xOutputStream()
- , mpHeaderNames( 0 )
- , mpResource( 0 )
+ , mpHeaderNames( nullptr )
+ , mpResource( nullptr )
{
}
@@ -54,8 +54,8 @@ SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath,
: SerfRequestProcessorImpl( inPath, inRequestHeaders )
, xInputStream()
, xOutputStream( xioOutStrm )
- , mpHeaderNames( 0 )
- , mpResource( 0 )
+ , mpHeaderNames( nullptr )
+ , mpResource( nullptr )
{
}
@@ -82,7 +82,7 @@ serf_bucket_t * SerfGetReqProcImpl::createSerfRequestBucket( serf_request_t * in
serf_bucket_t *req_bkt = serf_request_bucket_request_create( inSerfRequest,
"GET",
getPathStr(),
- 0,
+ nullptr,
serf_request_get_alloc( inSerfRequest ) );
// set request header fields
@@ -124,10 +124,10 @@ namespace
void SerfGetReqProcImpl::handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket )
{
// read response header, if requested
- if ( mpHeaderNames != 0 && mpResource != 0 )
+ if ( mpHeaderNames != nullptr && mpResource != nullptr )
{
serf_bucket_t* SerfHeaderBucket = serf_bucket_response_get_headers( inSerfResponseBucket );
- if ( SerfHeaderBucket != 0 )
+ if ( SerfHeaderBucket != nullptr )
{
serf_bucket_headers_do( SerfHeaderBucket,
Serf_ProcessResponseHeader,
diff --git a/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx
index 9420a3968ed0..984c78cc2b22 100644
--- a/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx
@@ -44,7 +44,8 @@ serf_bucket_t * SerfHeadReqProcImpl::createSerfRequestBucket( serf_request_t * i
serf_bucket_t *req_bkt = serf_request_bucket_request_create( inSerfRequest,
"HEAD",
getPathStr(),
- 0,
+
+ nullptr,
serf_request_get_alloc( inSerfRequest ) );
// set request header fields
@@ -78,10 +79,10 @@ namespace
void SerfHeadReqProcImpl::handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket )
{
// read response header, if requested
- if ( mpHeaderNames != 0 && mpResource != 0 )
+ if ( mpHeaderNames != nullptr && mpResource != nullptr )
{
serf_bucket_t* SerfHeaderBucket = serf_bucket_response_get_headers( inSerfResponseBucket );
- if ( SerfHeaderBucket != 0 )
+ if ( SerfHeaderBucket != nullptr )
{
serf_bucket_headers_do( SerfHeaderBucket,
Serf_ProcessResponseHeader,
diff --git a/ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx
index ff766effa108..d3b6d431d410 100644
--- a/ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx
@@ -78,7 +78,7 @@ serf_bucket_t * SerfLockReqProcImpl::createSerfRequestBucket( serf_request_t * i
aBody.append("</lockinfo>\n");
const OString aBodyText(aBody.makeStringAndClear());
- serf_bucket_t* body_bkt = 0;
+ serf_bucket_t* body_bkt = nullptr;
if (!m_plastChanceToSendRefreshRequest)
body_bkt = serf_bucket_simple_copy_create( aBodyText.getStr(),
@@ -101,7 +101,7 @@ serf_bucket_t * SerfLockReqProcImpl::createSerfRequestBucket( serf_request_t * i
setRequestHeaders( hdrs_bkt );
// request specific header fields
- const char * depth = 0;
+ const char * depth = nullptr;
switch( m_aLock.Depth )
{
case css::ucb::LockDepth_ZERO:
diff --git a/ucb/source/ucp/webdav/SerfLockReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfLockReqProcImpl.hxx
index 2e798fde85c1..1c8b5ff552ca 100644
--- a/ucb/source/ucp/webdav/SerfLockReqProcImpl.hxx
+++ b/ucb/source/ucp/webdav/SerfLockReqProcImpl.hxx
@@ -38,7 +38,7 @@ public:
const DAVRequestHeaders& inRequestHeaders,
SerfSession& rSession,
const css::ucb::Lock& rLock,
- sal_Int32* plastChanceToSendRefreshRequest = 0 );
+ sal_Int32* plastChanceToSendRefreshRequest = nullptr );
virtual ~SerfLockReqProcImpl() override;
diff --git a/ucb/source/ucp/webdav/SerfLockStore.cxx b/ucb/source/ucp/webdav/SerfLockStore.cxx
index e774d09a8622..e67e47b3f1a1 100644
--- a/ucb/source/ucp/webdav/SerfLockStore.cxx
+++ b/ucb/source/ucp/webdav/SerfLockStore.cxx
@@ -76,7 +76,7 @@ void TickerThread::run()
SerfLockStore::SerfLockStore()
- : m_pTickerThread( 0 )
+ : m_pTickerThread( nullptr )
, m_bFinishing( false )
{
}
@@ -126,7 +126,7 @@ void SerfLockStore::stopTicker()
m_pTickerThread->finish();
m_pTickerThread->join();
delete m_pTickerThread;
- m_pTickerThread = 0;
+ m_pTickerThread = nullptr;
}
}
diff --git a/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
index 07c67253ee0b..4641b3f3521c 100644
--- a/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
@@ -40,7 +40,7 @@ serf_bucket_t * SerfMkColReqProcImpl::createSerfRequestBucket( serf_request_t *
serf_bucket_t *req_bkt = serf_request_bucket_request_create( inSerfRequest,
"MKCOL",
getPathStr(),
- 0,
+ nullptr,
serf_request_get_alloc( inSerfRequest ) );
// set request header fields
diff --git a/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
index b0cb2ccf8918..fc775abd3e23 100644
--- a/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
@@ -44,7 +44,7 @@ serf_bucket_t * SerfMoveReqProcImpl::createSerfRequestBucket( serf_request_t * i
serf_bucket_t *req_bkt = serf_request_bucket_request_create( inSerfRequest,
"MOVE",
getPathStr(),
- 0,
+ nullptr,
serf_request_get_alloc( inSerfRequest ) );
// set request header fields
diff --git a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
index 08c757627a62..3d19f9384e97 100644
--- a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
@@ -69,8 +69,8 @@ serf_bucket_t * SerfPostReqProcImpl::createSerfRequestBucket( serf_request_t * i
serf_bucket_alloc_t* pSerfBucketAlloc = serf_request_get_alloc( inSerfRequest );
// create body bucket
- serf_bucket_t* body_bkt = 0;
- if ( mpPostData != 0 && mnPostDataLen > 0 )
+ serf_bucket_t* body_bkt = nullptr;
+ if ( mpPostData != nullptr && mnPostDataLen > 0 )
{
body_bkt = SERF_BUCKET_SIMPLE_STRING_LEN( mpPostData, mnPostDataLen, pSerfBucketAlloc );
}
@@ -90,11 +90,11 @@ serf_bucket_t * SerfPostReqProcImpl::createSerfRequestBucket( serf_request_t * i
handleChunkedEncoding(req_bkt, mnPostDataLen);
// request specific header fields
- if ( mpContentType != 0 )
+ if ( mpContentType != nullptr )
{
serf_bucket_headers_set( hdrs_bkt, "Content-Type", mpContentType );
}
- if ( mpReferer != 0 )
+ if ( mpReferer != nullptr )
{
serf_bucket_headers_set( hdrs_bkt, "Referer", mpReferer );
}
diff --git a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
index 8117b1b81221..bcca8dd0d14c 100644
--- a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
@@ -36,10 +36,10 @@ SerfPropFindReqProcImpl::SerfPropFindReqProcImpl( const char* inPath,
const std::vector< OUString > & inPropNames,
std::vector< DAVResource > & ioResources )
: SerfRequestProcessorImpl( inPath, inRequestHeaders )
- , mDepthStr( 0 )
+ , mDepthStr( nullptr )
, mpPropNames( &inPropNames )
, mpResources( &ioResources )
- , mpResInfo( 0 )
+ , mpResInfo( nullptr )
, mbOnlyPropertyNames( false )
, xInputStream( new SerfInputStream() )
{
@@ -51,9 +51,9 @@ SerfPropFindReqProcImpl::SerfPropFindReqProcImpl( const char* inPath,
const Depth inDepth,
std::vector< DAVResourceInfo > & ioResInfo )
: SerfRequestProcessorImpl( inPath, inRequestHeaders )
- , mDepthStr( 0 )
- , mpPropNames( 0 )
- , mpResources( 0 )
+ , mDepthStr( nullptr )
+ , mpPropNames( nullptr )
+ , mpResources( nullptr )
, mpResInfo( &ioResInfo )
, mbOnlyPropertyNames( true )
, xInputStream( new SerfInputStream() )
@@ -89,7 +89,7 @@ serf_bucket_t * SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t
serf_bucket_alloc_t* pSerfBucketAlloc = serf_request_get_alloc( inSerfRequest );
// body bucket - certain properties OR all properties OR only property names
- serf_bucket_t* body_bkt = 0;
+ serf_bucket_t* body_bkt = nullptr;
OString aBodyText;
{
OStringBuffer aBuffer;
@@ -148,14 +148,14 @@ serf_bucket_t * SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t
// set request header fields
serf_bucket_t* hdrs_bkt = serf_bucket_request_get_headers( req_bkt );
- if (hdrs_bkt != NULL)
+ if (hdrs_bkt != nullptr)
{
// general header fields provided by caller
setRequestHeaders( hdrs_bkt );
// request specific header fields
serf_bucket_headers_set( hdrs_bkt, "Depth", mDepthStr );
- if (hdrs_bkt!=NULL && body_bkt != 0 && aBodyText.getLength() > 0 )
+ if (hdrs_bkt!=nullptr && body_bkt != nullptr && aBodyText.getLength() > 0 )
{
serf_bucket_headers_set( hdrs_bkt, "Content-Type", "application/xml" );
}
diff --git a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx
index b87794a099dc..77c6ba9538ab 100644
--- a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx
@@ -47,7 +47,7 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_
serf_bucket_alloc_t* pSerfBucketAlloc = serf_request_get_alloc( inSerfRequest );
// body bucket
- serf_bucket_t* body_bkt = 0;
+ serf_bucket_t* body_bkt = nullptr;
OString aBodyText;
{
// create and fill body bucket with properties to be set or removed
@@ -60,7 +60,7 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_
{ RTL_CONSTASCII_STRINGPARAM( "set" ) },
{ RTL_CONSTASCII_STRINGPARAM( "remove" ) }
};
- const int nPropCount = ( mpProperties != 0 )
+ const int nPropCount = ( mpProperties != nullptr )
? mpProperties->size()
: 0;
if ( nPropCount > 0 )
@@ -154,13 +154,13 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_
// set request header fields
serf_bucket_t* hdrs_bkt = serf_bucket_request_get_headers( req_bkt );
- if (hdrs_bkt != NULL)
+ if (hdrs_bkt != nullptr)
{
// general header fields provided by caller
setRequestHeaders( hdrs_bkt );
// request specific header fields
- if ( body_bkt != 0 && aBodyText.getLength() > 0 )
+ if ( body_bkt != nullptr && aBodyText.getLength() > 0 )
{
serf_bucket_headers_set( hdrs_bkt, "Content-Type", "application/xml" );
}
diff --git a/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
index 20a99848c6ae..a08d260f01bd 100644
--- a/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
@@ -47,8 +47,8 @@ serf_bucket_t * SerfPutReqProcImpl::createSerfRequestBucket( serf_request_t * in
serf_bucket_alloc_t* pSerfBucketAlloc = serf_request_get_alloc( inSerfRequest );
// create body bucket
- serf_bucket_t* body_bkt = 0;
- if ( mpData != 0 && mnDataLen > 0 )
+ serf_bucket_t* body_bkt = nullptr;
+ if ( mpData != nullptr && mnDataLen > 0 )
{
body_bkt = SERF_BUCKET_SIMPLE_STRING_LEN( mpData, mnDataLen, pSerfBucketAlloc );
}
diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
index ff6b2e63af2b..12ee0760b8d1 100644
--- a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
+++ b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
@@ -44,12 +44,12 @@ SerfRequestProcessor::SerfRequestProcessor( SerfSession& rSerfSession,
const OUString & inPath,
const bool bUseChunkedEncoding )
: mrSerfSession( rSerfSession )
- , mPathStr( 0 )
+ , mPathStr( nullptr )
, mbUseChunkedEncoding( bUseChunkedEncoding )
- , mDestPathStr( 0 )
- , mContentType( 0 )
- , mReferer( 0 )
- , mpProcImpl( 0 )
+ , mDestPathStr( nullptr )
+ , mContentType( nullptr )
+ , mReferer( nullptr )
+ , mpProcImpl( nullptr )
, mbProcessingDone( false )
, mpDAVException()
, mnHTTPStatusCode( SC_NONE )
@@ -74,7 +74,7 @@ SerfRequestProcessor::~SerfRequestProcessor()
void SerfRequestProcessor::prepareProcessor()
{
delete mpDAVException;
- mpDAVException = 0;
+ mpDAVException = nullptr;
mnHTTPStatusCode = SC_NONE;
mHTTPStatusCodeText.clear();
mRedirectLocation.clear();
diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.hxx b/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
index 301b9f5952ed..01ba79095c92 100644
--- a/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
+++ b/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
@@ -126,7 +126,7 @@ public:
apr_status_t& outSerfStatus );
//LOCK
- bool processLock( const css::ucb::Lock & rLock, sal_Int32 *plastChanceToSendRefreshRequest = 0 );
+ bool processLock( const css::ucb::Lock & rLock, sal_Int32 *plastChanceToSendRefreshRequest = nullptr );
//UNLOCK
bool processUnlock();
diff --git a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx
index 30a62b8fb666..5d638a75b7d7 100644
--- a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx
@@ -62,7 +62,7 @@ void SerfRequestProcessorImpl::handleChunkedEncoding (
serf_bucket_t* pRequestBucket,
apr_int64_t nLength) const
{
- if (pRequestBucket != NULL)
+ if (pRequestBucket != nullptr)
{
if (useChunkedEncoding())
{
diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx
index 29262d650d1b..6b93ae513e6f 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -64,8 +64,8 @@ SerfSession::SerfSession(
, m_aUri( inUri )
, m_aProxyName()
, m_nProxyPort( 0 )
- , m_pSerfConnection( 0 )
- , m_pSerfContext( 0 )
+ , m_pSerfConnection( nullptr )
+ , m_pSerfContext( nullptr )
, m_bIsHeadRequestInProgress( false )
, m_bUseChunkedEncoding( false )
, m_bNoOfTransferEncodingSwitches( 0 )
@@ -74,7 +74,7 @@ SerfSession::SerfSession(
{
m_pSerfContext = serf_context_create( getAprPool() );
- m_pSerfBucket_Alloc = serf_bucket_allocator_create( getAprPool(), NULL, NULL );
+ m_pSerfBucket_Alloc = serf_bucket_allocator_create( getAprPool(), nullptr, nullptr );
}
@@ -85,7 +85,7 @@ SerfSession::~SerfSession( )
if ( m_pSerfConnection )
{
serf_connection_close( m_pSerfConnection );
- m_pSerfConnection = 0;
+ m_pSerfConnection = nullptr;
}
}
@@ -106,7 +106,7 @@ void SerfSession::Init()
bool bCreateNewSession = false;
- if ( m_pSerfConnection == 0 )
+ if ( m_pSerfConnection == nullptr )
{
const ucbhelper::InternetProxyServer & rProxyCfg = getProxySettings();
@@ -128,7 +128,7 @@ void SerfSession::Init()
// new session needed, destroy old first
serf_connection_close( m_pSerfConnection );
- m_pSerfConnection = 0;
+ m_pSerfConnection = nullptr;
bCreateNewSession = true;
}
}
@@ -140,10 +140,10 @@ void SerfSession::Init()
m_pSerfContext,
m_aUri.getAprUri(),
Serf_ConnectSetup, this,
- 0 /* close connection callback */, 0 /* close connection baton */,
+ nullptr /* close connection callback */, nullptr /* close connection baton */,
getAprPool() );
- if ( m_pSerfConnection == 0 ||status != APR_SUCCESS )
+ if ( m_pSerfConnection == nullptr ||status != APR_SUCCESS )
{
throw DAVException( DAVException::DAV_SESSION_CREATE,
SerfUri::makeConnectionEndPointString( m_aUri.GetHost(), m_aUri.GetPort() ) );
@@ -154,7 +154,7 @@ void SerfSession::Init()
if ( m_aProxyName.getLength() )
{
- apr_sockaddr_t *proxy_address = NULL;
+ apr_sockaddr_t *proxy_address = nullptr;
status = apr_sockaddr_info_get( &proxy_address,
OUStringToOString( m_aProxyName, RTL_TEXTENCODING_UTF8 ).getStr(),
APR_UNSPEC,
@@ -254,14 +254,14 @@ apr_status_t SerfSession::setupSerfConnection( apr_socket_t * inAprSocket,
if ( isSSLNeeded() )
{
tmpInputBkt = serf_bucket_ssl_decrypt_create( tmpInputBkt,
- 0,
+ nullptr,
getSerfBktAlloc() );
/** Set the callback that is called to authenticate the
certificate (chain).
*/
serf_ssl_server_cert_chain_callback_set(
serf_bucket_ssl_decrypt_context_get(tmpInputBkt),
- NULL,
+ nullptr,
Serf_CertificateChainValidation,
this);
serf_ssl_set_hostname( serf_bucket_ssl_decrypt_context_get( tmpInputBkt ),
@@ -344,9 +344,9 @@ apr_status_t SerfSession::verifySerfCertificateChain (
int nCertificateChainLength)
{
// Check arguments.
- if (pCertificateChainBase64Encoded == NULL || nCertificateChainLength<=0)
+ if (pCertificateChainBase64Encoded == nullptr || nCertificateChainLength<=0)
{
- assert(pCertificateChainBase64Encoded != NULL);
+ assert(pCertificateChainBase64Encoded != nullptr);
assert(nCertificateChainLength>0);
return SERF_SSL_CERT_UNKNOWN_FAILURE;
}
@@ -611,7 +611,7 @@ void SerfSession::PROPFIND( const OUString & inPath,
status );
if ( status == APR_SUCCESS &&
- aReqProc->mpDAVException == 0 &&
+ aReqProc->mpDAVException == nullptr &&
ioResources.empty() )
{
m_aEnv = DAVRequestEnvironment();
@@ -640,7 +640,7 @@ void SerfSession::PROPFIND( const OUString & inPath,
status );
if ( status == APR_SUCCESS &&
- aReqProc->mpDAVException == 0 &&
+ aReqProc->mpDAVException == nullptr &&
ioResInfo.empty() )
{
m_aEnv = DAVRequestEnvironment();