diff options
Diffstat (limited to 'ucb/source/ucp/webdav-neon')
-rw-r--r-- | ucb/source/ucp/webdav-neon/LinkSequence.cxx | 9 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/LockEntrySequence.cxx | 9 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/LockSequence.cxx | 9 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx | 12 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/NeonSession.cxx | 22 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx | 9 |
6 files changed, 49 insertions, 21 deletions
diff --git a/ucb/source/ucp/webdav-neon/LinkSequence.cxx b/ucb/source/ucp/webdav-neon/LinkSequence.cxx index 6cbf9f0df915..da0bd63aebd1 100644 --- a/ucb/source/ucp/webdav-neon/LinkSequence.cxx +++ b/ucb/source/ucp/webdav-neon/LinkSequence.cxx @@ -54,7 +54,9 @@ struct LinkSequenceParseContext #define STATE_SRC (STATE_TOP + 2) -extern "C" int LinkSequence_startelement_callback( +extern "C" { + +static int LinkSequence_startelement_callback( void *, int parent, const char * /*nspace*/, @@ -82,7 +84,7 @@ extern "C" int LinkSequence_startelement_callback( } -extern "C" int LinkSequence_chardata_callback( +static int LinkSequence_chardata_callback( void *userdata, int state, const char *buf, @@ -111,7 +113,7 @@ extern "C" int LinkSequence_chardata_callback( } -extern "C" int LinkSequence_endelement_callback( +static int LinkSequence_endelement_callback( void *userdata, int state, const char *, @@ -132,6 +134,7 @@ extern "C" int LinkSequence_endelement_callback( return 0; // zero to continue, non-zero to abort parsing } +} // static bool LinkSequence::createFromXML( const OString & rInData, diff --git a/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx b/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx index 263211347820..0023769bcc9a 100644 --- a/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx +++ b/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx @@ -56,7 +56,9 @@ struct LockEntrySequenceParseContext #define STATE_WRITE (STATE_TOP + 5) -extern "C" int LockEntrySequence_startelement_callback( +extern "C" { + +static int LockEntrySequence_startelement_callback( void *, int parent, const char * /*nspace*/, @@ -121,7 +123,7 @@ extern "C" int LockEntrySequence_startelement_callback( } -extern "C" int LockEntrySequence_chardata_callback( +static int LockEntrySequence_chardata_callback( void *, int, const char *, @@ -131,7 +133,7 @@ extern "C" int LockEntrySequence_chardata_callback( } -extern "C" int LockEntrySequence_endelement_callback( +static int LockEntrySequence_endelement_callback( void *userdata, int state, const char *, @@ -180,6 +182,7 @@ extern "C" int LockEntrySequence_endelement_callback( return 0; // zero to continue, non-zero to abort parsing } +} // static bool LockEntrySequence::createFromXML( const OString & rInData, diff --git a/ucb/source/ucp/webdav-neon/LockSequence.cxx b/ucb/source/ucp/webdav-neon/LockSequence.cxx index 210a52ceb88d..917945824d11 100644 --- a/ucb/source/ucp/webdav-neon/LockSequence.cxx +++ b/ucb/source/ucp/webdav-neon/LockSequence.cxx @@ -65,7 +65,9 @@ struct LockSequenceParseContext #define STATE_HREF (STATE_TOP + 10) -extern "C" int LockSequence_startelement_callback( +extern "C" { + +static int LockSequence_startelement_callback( void *, int parent, const char * /*nspace*/, @@ -122,7 +124,7 @@ extern "C" int LockSequence_startelement_callback( } -extern "C" int LockSequence_chardata_callback( +static int LockSequence_chardata_callback( void *userdata, int state, const char *buf, @@ -231,7 +233,7 @@ extern "C" int LockSequence_chardata_callback( } -extern "C" int LockSequence_endelement_callback( +static int LockSequence_endelement_callback( void *userdata, int state, const char *, @@ -295,6 +297,7 @@ extern "C" int LockSequence_endelement_callback( return 0; // zero to continue, non-zero to abort parsing } +} // static bool LockSequence::createFromXML( const OString & rInData, diff --git a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx index 3e25121d28fa..531ab229f976 100644 --- a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx +++ b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx @@ -80,7 +80,9 @@ namespace } } -extern "C" int NPFR_propfind_iter( void* userdata, +extern "C" { + +static int NPFR_propfind_iter( void* userdata, const NeonPropName* pname, const char* value, const HttpStatus* status ) @@ -188,7 +190,7 @@ extern "C" int NPFR_propfind_iter( void* userdata, return 0; // Go on. } -extern "C" void NPFR_propfind_results( void* userdata, +static void NPFR_propfind_results( void* userdata, const ne_uri* uri, const NeonPropFindResultSet* set ) { @@ -205,7 +207,7 @@ extern "C" void NPFR_propfind_results( void* userdata, theResources->push_back( theResource ); } -extern "C" int NPFR_propnames_iter( void* userdata, +static int NPFR_propnames_iter( void* userdata, const NeonPropName* pname, const char* /*value*/, const HttpStatus* /*status*/ ) @@ -220,7 +222,7 @@ extern "C" int NPFR_propnames_iter( void* userdata, return 0; } -extern "C" void NPFR_propnames_results( void* userdata, +static void NPFR_propnames_results( void* userdata, const ne_uri* /*uri*/, const NeonPropFindResultSet* results ) { @@ -237,6 +239,8 @@ extern "C" void NPFR_propnames_results( void* userdata, theResources->push_back( theResource ); } +} + NeonPropFindRequest::NeonPropFindRequest( HttpSession* inSession, const char* inPath, const Depth inDepth, diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx index e17c1f03cfcc..81fa6adca3ad 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.cxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx @@ -199,7 +199,9 @@ struct NeonRequestContext }; // A simple Neon response_block_reader for use with an XInputStream -extern "C" int NeonSession_ResponseBlockReader(void * inUserData, +extern "C" { + +static int NeonSession_ResponseBlockReader(void * inUserData, const char * inBuf, size_t inLen ) { @@ -213,7 +215,7 @@ extern "C" int NeonSession_ResponseBlockReader(void * inUserData, } // A simple Neon response_block_reader for use with an XOutputStream -extern "C" int NeonSession_ResponseBlockWriter( void * inUserData, +static int NeonSession_ResponseBlockWriter( void * inUserData, const char * inBuf, size_t inLen ) { @@ -226,7 +228,7 @@ extern "C" int NeonSession_ResponseBlockWriter( void * inUserData, return 0; } -extern "C" int NeonSession_NeonAuth( void * inUserData, +static int NeonSession_NeonAuth( void * inUserData, #if defined NE_FEATURE_SSPI && ! defined SYSTEM_NEON const char * inAuthProtocol, #endif @@ -256,6 +258,8 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, return theSession->NeonAuth(pAuthProtocol, inRealm, attempt, inoutUserName, inoutPassWord); } +} + int NeonSession::NeonAuth(const char* inAuthProtocol, const char* inRealm, int attempt, char* inoutUserName, char * inoutPassWord) { @@ -376,7 +380,9 @@ namespace { } } // namespace -extern "C" int NeonSession_CertificationNotify( void *userdata, +extern "C" { + +static int NeonSession_CertificationNotify( void *userdata, int, const ne_ssl_certificate *cert ) { @@ -384,6 +390,8 @@ extern "C" int NeonSession_CertificationNotify( void *userdata, return pSession->CertificationNotify(cert); } +} + int NeonSession::CertificationNotify(const ne_ssl_certificate *cert) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); @@ -528,7 +536,9 @@ int NeonSession::CertificationNotify(const ne_ssl_certificate *cert) return 1; } -extern "C" void NeonSession_PreSendRequest( ne_request * req, +extern "C" { + +static void NeonSession_PreSendRequest( ne_request * req, void * userdata, ne_buffer * headers ) { @@ -539,6 +549,8 @@ extern "C" void NeonSession_PreSendRequest( ne_request * req, pSession->PreSendRequest(req, headers); } +} + void NeonSession::PreSendRequest(ne_request* req, ne_buffer* headers) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); diff --git a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx index 3ef49ddf0f94..173c3f9c4c20 100644 --- a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx +++ b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx @@ -68,7 +68,9 @@ static const char aXMLEnd[] = "</value></ucbprop>"; #define STATE_VALUE (STATE_TOP + 2) -extern "C" int UCBDeadPropertyValue_startelement_callback( +extern "C" { + +static int UCBDeadPropertyValue_startelement_callback( void *, int parent, const char * /*nspace*/, @@ -96,7 +98,7 @@ extern "C" int UCBDeadPropertyValue_startelement_callback( } -extern "C" int UCBDeadPropertyValue_chardata_callback( +static int UCBDeadPropertyValue_chardata_callback( void *userdata, int state, const char *buf, @@ -125,7 +127,7 @@ extern "C" int UCBDeadPropertyValue_chardata_callback( } -extern "C" int UCBDeadPropertyValue_endelement_callback( +static int UCBDeadPropertyValue_endelement_callback( void *userdata, int state, const char *, @@ -154,6 +156,7 @@ extern "C" int UCBDeadPropertyValue_endelement_callback( return 0; // zero to continue, non-zero to abort parsing } +} static OUString encodeValue( const OUString & rValue ) { |