[Libreoffice-commits] core.git: 2 commits - ucb/source
Tor Lillqvist
tml at iki.fi
Mon Mar 25 23:44:23 PDT 2013
ucb/source/ucp/webdav-neon/DAVProperties.cxx | 6
ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx | 7 -
ucb/source/ucp/webdav-neon/NeonInputStream.cxx | 36 -----
ucb/source/ucp/webdav-neon/NeonInputStream.hxx | 3
ucb/source/ucp/webdav-neon/NeonLockStore.cxx | 11 -
ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx | 18 --
ucb/source/ucp/webdav-neon/NeonSession.cxx | 137 ---------------------
ucb/source/ucp/webdav-neon/NeonSession.hxx | 4
ucb/source/ucp/webdav-neon/NeonUri.cxx | 22 ---
ucb/source/ucp/webdav-neon/NeonUri.hxx | 3
10 files changed, 6 insertions(+), 241 deletions(-)
New commits:
commit baf19a23095fc854820954c9786d41ba2fc0e3f6
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Mar 26 08:43:54 2013 +0200
Bin ASCII art and pointless comments
Change-Id: I9c510a0edb2a04d1378d488cc724e8f9982b5ba3
diff --git a/ucb/source/ucp/webdav-neon/DAVProperties.cxx b/ucb/source/ucp/webdav-neon/DAVProperties.cxx
index 576f87b..29e972f 100644
--- a/ucb/source/ucp/webdav-neon/DAVProperties.cxx
+++ b/ucb/source/ucp/webdav-neon/DAVProperties.cxx
@@ -46,8 +46,6 @@ const ::rtl::OUString DAVProperties::SUPPORTEDLOCK("DAV:supportedlock");
const ::rtl::OUString DAVProperties::EXECUTABLE("http://apache.org/dav/props/executable");
-// -------------------------------------------------------------------
-// static
void DAVProperties::createNeonPropName( const rtl::OUString & rFullName,
NeonPropName & rName )
{
@@ -106,8 +104,6 @@ void DAVProperties::createNeonPropName( const rtl::OUString & rFullName,
}
}
-// -------------------------------------------------------------------
-// static
void DAVProperties::createUCBPropName( const char * nspace,
const char * name,
rtl::OUString & rFullName )
@@ -168,8 +164,6 @@ void DAVProperties::createUCBPropName( const char * nspace,
}
}
-// -------------------------------------------------------------------
-// static
bool DAVProperties::isUCBDeadProperty( const NeonPropName & rName )
{
return ( rName.nspace &&
diff --git a/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx b/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx
index 2db9be5..8763a9b 100644
--- a/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx
@@ -87,10 +87,6 @@ void process_headers( ne_request * req,
} // namespace
-// -------------------------------------------------------------------
-// Constructor
-// -------------------------------------------------------------------
-
extern osl::Mutex aGlobalNeonMutex;
NeonHeadRequest::NeonHeadRequest( HttpSession * inSession,
@@ -124,9 +120,6 @@ NeonHeadRequest::NeonHeadRequest( HttpSession * inSession,
ne_request_destroy( req );
}
-// -------------------------------------------------------------------
-// Destructor
-// -------------------------------------------------------------------
NeonHeadRequest::~NeonHeadRequest()
{
}
diff --git a/ucb/source/ucp/webdav-neon/NeonInputStream.cxx b/ucb/source/ucp/webdav-neon/NeonInputStream.cxx
index 882fa25..0a995ec 100644
--- a/ucb/source/ucp/webdav-neon/NeonInputStream.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonInputStream.cxx
@@ -35,26 +35,17 @@ using namespace com::sun::star::io;
using namespace com::sun::star::uno;
using namespace webdav_ucp;
-// -------------------------------------------------------------------
-// Constructor
-// -------------------------------------------------------------------
NeonInputStream::NeonInputStream( void )
: mLen( 0 ),
mPos( 0 )
{
}
-// -------------------------------------------------------------------
-// Destructor
-// -------------------------------------------------------------------
NeonInputStream::~NeonInputStream( void )
{
}
-// -------------------------------------------------------------------
-// AddToStream
// Allows the caller to add some data to the "end" of the stream
-// -------------------------------------------------------------------
void NeonInputStream::AddToStream( const char * inBuf, sal_Int32 inLen )
{
mInputBuffer.realloc( sal::static_int_cast<sal_Int32>(mLen) + inLen );
@@ -62,9 +53,6 @@ void NeonInputStream::AddToStream( const char * inBuf, sal_Int32 inLen )
mLen += inLen;
}
-// -------------------------------------------------------------------
-// queryInterface
-// -------------------------------------------------------------------
Any NeonInputStream::queryInterface( const Type &type )
throw( RuntimeException )
{
@@ -74,10 +62,7 @@ Any NeonInputStream::queryInterface( const Type &type )
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( type );
}
-// -------------------------------------------------------------------
-// readBytes
// "Reads" the specified number of bytes from the stream
-// -------------------------------------------------------------------
sal_Int32 SAL_CALL NeonInputStream::readBytes(
::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
throw( ::com::sun::star::io::NotConnectedException,
@@ -104,9 +89,6 @@ sal_Int32 SAL_CALL NeonInputStream::readBytes(
return theBytes2Read;
}
-// -------------------------------------------------------------------
-// readSomeBytes
-// -------------------------------------------------------------------
sal_Int32 SAL_CALL NeonInputStream::readSomeBytes(
::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
throw( ::com::sun::star::io::NotConnectedException,
@@ -118,10 +100,7 @@ sal_Int32 SAL_CALL NeonInputStream::readSomeBytes(
return readBytes( aData, nMaxBytesToRead );
}
-// -------------------------------------------------------------------
-// skipBytes
// Moves the current stream position forward
-// -------------------------------------------------------------------
void SAL_CALL NeonInputStream::skipBytes( sal_Int32 nBytesToSkip )
throw( ::com::sun::star::io::NotConnectedException,
::com::sun::star::io::BufferSizeExceededException,
@@ -133,10 +112,7 @@ void SAL_CALL NeonInputStream::skipBytes( sal_Int32 nBytesToSkip )
mPos = mLen;
}
-// -------------------------------------------------------------------
-// available
// Returns the number of unread bytes currently remaining on the stream
-// -------------------------------------------------------------------
sal_Int32 SAL_CALL NeonInputStream::available( )
throw( ::com::sun::star::io::NotConnectedException,
::com::sun::star::io::IOException,
@@ -145,9 +121,6 @@ sal_Int32 SAL_CALL NeonInputStream::available( )
return sal::static_int_cast<sal_Int32>(mLen - mPos);
}
-// -------------------------------------------------------------------
-// closeInput
-// -------------------------------------------------------------------
void SAL_CALL NeonInputStream::closeInput( void )
throw( ::com::sun::star::io::NotConnectedException,
::com::sun::star::io::IOException,
@@ -155,9 +128,6 @@ void SAL_CALL NeonInputStream::closeInput( void )
{
}
-// -------------------------------------------------------------------
-// seek
-// -------------------------------------------------------------------
void SAL_CALL NeonInputStream::seek( sal_Int64 location )
throw( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::io::IOException,
@@ -172,9 +142,6 @@ void SAL_CALL NeonInputStream::seek( sal_Int64 location )
throw ::com::sun::star::lang::IllegalArgumentException();
}
-// -------------------------------------------------------------------
-// getPosition
-// -------------------------------------------------------------------
sal_Int64 SAL_CALL NeonInputStream::getPosition()
throw( ::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException )
@@ -182,9 +149,6 @@ sal_Int64 SAL_CALL NeonInputStream::getPosition()
return mPos;
}
-// -------------------------------------------------------------------
-// getLength
-// -------------------------------------------------------------------
sal_Int64 SAL_CALL NeonInputStream::getLength()
throw( ::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException )
diff --git a/ucb/source/ucp/webdav-neon/NeonInputStream.hxx b/ucb/source/ucp/webdav-neon/NeonInputStream.hxx
index 597b112..83ce42e 100644
--- a/ucb/source/ucp/webdav-neon/NeonInputStream.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonInputStream.hxx
@@ -38,11 +38,8 @@
namespace webdav_ucp
{
-// -------------------------------------------------------------------
-// NeonInputStream
// A simple XInputStream implementation provided specifically for use
// by the DAVSession::GET method.
-// -------------------------------------------------------------------
class NeonInputStream : public ::com::sun::star::io::XInputStream,
public ::com::sun::star::io::XSeekable,
public ::cppu::OWeakObject
diff --git a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx
index 77e6258..951601f 100644
--- a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx
@@ -60,7 +60,6 @@ private:
} // namespace webdav_ucp
-// -------------------------------------------------------------------
void TickerThread::execute()
{
OSL_TRACE( "TickerThread: start." );
@@ -86,14 +85,12 @@ void TickerThread::execute()
OSL_TRACE( "TickerThread: stop." );
}
-// -------------------------------------------------------------------
NeonLockStore::NeonLockStore()
: m_pNeonLockStore( ne_lockstore_create() )
{
OSL_ENSURE( m_pNeonLockStore, "Unable to create neon lock store!" );
}
-// -------------------------------------------------------------------
NeonLockStore::~NeonLockStore()
{
stopTicker();
@@ -118,7 +115,6 @@ NeonLockStore::~NeonLockStore()
ne_lockstore_destroy( m_pNeonLockStore );
}
-// -------------------------------------------------------------------
void NeonLockStore::startTicker()
{
osl::MutexGuard aGuard( m_aMutex );
@@ -130,7 +126,6 @@ void NeonLockStore::startTicker()
}
}
-// -------------------------------------------------------------------
void NeonLockStore::stopTicker()
{
osl::MutexGuard aGuard( m_aMutex );
@@ -143,7 +138,6 @@ void NeonLockStore::stopTicker()
}
}
-// -------------------------------------------------------------------
void NeonLockStore::registerSession( HttpSession * pHttpSession )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -151,7 +145,6 @@ void NeonLockStore::registerSession( HttpSession * pHttpSession )
ne_lockstore_register( m_pNeonLockStore, pHttpSession );
}
-// -------------------------------------------------------------------
NeonLock * NeonLockStore::findByUri( rtl::OUString const & rUri )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -162,7 +155,6 @@ NeonLock * NeonLockStore::findByUri( rtl::OUString const & rUri )
return ne_lockstore_findbyuri( m_pNeonLockStore, &aUri );
}
-// -------------------------------------------------------------------
void NeonLockStore::addLock( NeonLock * pLock,
rtl::Reference< NeonSession > const & xSession,
sal_Int32 nLastChanceToSendRefreshRequest )
@@ -176,7 +168,6 @@ void NeonLockStore::addLock( NeonLock * pLock,
startTicker();
}
-// -------------------------------------------------------------------
void NeonLockStore::updateLock( NeonLock * pLock,
sal_Int32 nLastChanceToSendRefreshRequest )
{
@@ -193,7 +184,6 @@ void NeonLockStore::updateLock( NeonLock * pLock,
}
}
-// -------------------------------------------------------------------
void NeonLockStore::removeLock( NeonLock * pLock )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -205,7 +195,6 @@ void NeonLockStore::removeLock( NeonLock * pLock )
stopTicker();
}
-// -------------------------------------------------------------------
void NeonLockStore::refreshLocks()
{
osl::MutexGuard aGuard( m_aMutex );
diff --git a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx
index f41389f..6f05906 100644
--- a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx
@@ -47,7 +47,6 @@ using ::rtl::OUString;
using ::rtl::OString;
using ::rtl::OStringToOUString;
-// -------------------------------------------------------------------
namespace
{
// strip "DAV:" namespace from XML snippets to avoid
@@ -81,7 +80,6 @@ namespace
}
}
-// -------------------------------------------------------------------
extern "C" int NPFR_propfind_iter( void* userdata,
const NeonPropName* pname,
const char* value,
@@ -190,7 +188,6 @@ extern "C" int NPFR_propfind_iter( void* userdata,
return 0; // Go on.
}
-// -------------------------------------------------------------------
extern "C" void NPFR_propfind_results( void* userdata,
const ne_uri* uri,
const NeonPropFindResultSet* set )
@@ -207,7 +204,7 @@ extern "C" void NPFR_propfind_results( void* userdata,
= static_cast< vector< DAVResource > * >( userdata );
theResources->push_back( theResource );
}
-// -------------------------------------------------------------------
+
extern "C" int NPFR_propnames_iter( void* userdata,
const NeonPropName* pname,
const char* /*value*/,
@@ -223,7 +220,6 @@ extern "C" int NPFR_propnames_iter( void* userdata,
return 0;
}
-// -------------------------------------------------------------------
extern "C" void NPFR_propnames_results( void* userdata,
const ne_uri* uri,
const NeonPropFindResultSet* results )
@@ -244,10 +240,6 @@ extern "C" void NPFR_propnames_results( void* userdata,
extern osl::Mutex aGlobalNeonMutex;
-// -------------------------------------------------------------------
-// Constructor
-// -------------------------------------------------------------------
-
NeonPropFindRequest::NeonPropFindRequest( HttpSession* inSession,
const char* inPath,
const Depth inDepth,
@@ -303,11 +295,6 @@ NeonPropFindRequest::NeonPropFindRequest( HttpSession* inSession,
nError = NE_ERROR;
}
-// -------------------------------------------------------------------
-// Constructor
-// - obtains property names
-// -------------------------------------------------------------------
-
NeonPropFindRequest::NeonPropFindRequest(
HttpSession* inSession,
const char* inPath,
@@ -329,9 +316,6 @@ NeonPropFindRequest::NeonPropFindRequest(
nError = NE_ERROR;
}
-// -------------------------------------------------------------------
-// Destructor
-// -------------------------------------------------------------------
NeonPropFindRequest::~NeonPropFindRequest( )
{
}
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index cad3157..5dcafe6 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -79,10 +79,6 @@ using namespace webdav_ucp;
# define EOL "\r\n"
#endif
-// -------------------------------------------------------------------
-// RequestData
-// -------------------------------------------------------------------
-
struct RequestData
{
// POST
@@ -95,10 +91,6 @@ struct RequestData
: aContentType( rContentType ), aReferer( rReferer ) {}
};
-// -------------------------------------------------------------------
-// RequestDataMap
-// -------------------------------------------------------------------
-
struct equalPtr
{
bool operator()( const ne_request* p1, const ne_request* p2 ) const
@@ -124,9 +116,6 @@ typedef boost::unordered_map
>
RequestDataMap;
-// -------------------------------------------------------------------
-// Helper function
-// -------------------------------------------------------------------
static sal_uInt16 makeStatusCode( const rtl::OUString & rStatusText )
{
// Extract status code from session error string. Unfortunately
@@ -149,7 +138,6 @@ static sal_uInt16 makeStatusCode( const rtl::OUString & rStatusText )
return sal_uInt16( rStatusText.copy( 0, nPos ).toInt32() );
}
-// -------------------------------------------------------------------
static bool noKeepAlive( const uno::Sequence< beans::NamedValue >& rFlags )
{
if ( !rFlags.hasElements() )
@@ -169,7 +157,6 @@ static bool noKeepAlive( const uno::Sequence< beans::NamedValue >& rFlags )
return false;
}
-// -------------------------------------------------------------------
struct NeonRequestContext
{
uno::Reference< io::XOutputStream > xOutputStream;
@@ -198,19 +185,7 @@ struct NeonRequestContext
pHeaderNames( &inHeaderNames ), pResource( &ioResource ) {}
};
-//--------------------------------------------------------------------
-//--------------------------------------------------------------------
-//
-// Callback functions
-//
-//--------------------------------------------------------------------
-//--------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-// ResponseBlockReader
// A simple Neon response_block_reader for use with an XInputStream
-// -------------------------------------------------------------------
-
extern "C" int NeonSession_ResponseBlockReader(void * inUserData,
const char * inBuf,
size_t inLen )
@@ -230,11 +205,7 @@ extern "C" int NeonSession_ResponseBlockReader(void * inUserData,
return 0;
}
-// -------------------------------------------------------------------
-// ResponseBlockWriter
// A simple Neon response_block_reader for use with an XOutputStream
-// -------------------------------------------------------------------
-
extern "C" int NeonSession_ResponseBlockWriter( void * inUserData,
const char * inBuf,
size_t inLen )
@@ -256,7 +227,6 @@ extern "C" int NeonSession_ResponseBlockWriter( void * inUserData,
return 0;
}
-// -------------------------------------------------------------------
extern "C" int NeonSession_NeonAuth( void * inUserData,
#ifdef NE_FEATURE_SSPI
const char * inAuthProtocol,
@@ -369,11 +339,7 @@ extern "C" int NeonSession_NeonAuth( void * inUserData,
return theRetVal;
}
-// -------------------------------------------------------------------
-
namespace {
- // -------------------------------------------------------------------
- // Helper function
::rtl::OUString GetHostnamePart( const ::rtl::OUString& _rRawString )
{
::rtl::OUString sPart;
@@ -390,7 +356,6 @@ namespace {
}
} // namespace
-// -------------------------------------------------------------------
extern "C" int NeonSession_CertificationNotify( void *userdata,
int failures,
const ne_ssl_certificate *cert )
@@ -540,7 +505,6 @@ extern "C" int NeonSession_CertificationNotify( void *userdata,
return 1;
}
-// -------------------------------------------------------------------
extern "C" void NeonSession_PreSendRequest( ne_request * req,
void * userdata,
ne_buffer * headers )
@@ -612,8 +576,7 @@ extern "C" void NeonSession_PreSendRequest( ne_request * req,
}
}
-// -------------------------------------------------------------------
-// static members!
+// static members
bool NeonSession::m_bGlobalsInited = false;
//See https://bugzilla.redhat.com/show_bug.cgi?id=544619#c4
//neon is threadsafe, but uses gnutls which is only thread-safe
@@ -623,9 +586,6 @@ bool NeonSession::m_bGlobalsInited = false;
osl::Mutex aGlobalNeonMutex;
NeonLockStore NeonSession::m_aNeonLockStore;
-// -------------------------------------------------------------------
-// Constructor
-// -------------------------------------------------------------------
NeonSession::NeonSession(
const rtl::Reference< DAVSessionFactory > & rSessionFactory,
const rtl::OUString& inUri,
@@ -644,9 +604,6 @@ NeonSession::NeonSession(
m_nPort = theUri.GetPort();
}
-// -------------------------------------------------------------------
-// Destructor
-// -------------------------------------------------------------------
NeonSession::~NeonSession( )
{
if ( m_pHttpSession )
@@ -660,7 +617,6 @@ NeonSession::~NeonSession( )
delete static_cast< RequestDataMap * >( m_pRequestData );
}
-// -------------------------------------------------------------------
void NeonSession::Init( const DAVRequestEnvironment & rEnv )
throw ( DAVException )
{
@@ -669,7 +625,6 @@ void NeonSession::Init( const DAVRequestEnvironment & rEnv )
Init();
}
-// -------------------------------------------------------------------
void NeonSession::Init()
throw ( DAVException )
{
@@ -844,8 +799,6 @@ void NeonSession::Init()
}
}
-// -------------------------------------------------------------------
-// virtual
sal_Bool NeonSession::CanUse( const rtl::OUString & inUri,
const uno::Sequence< beans::NamedValue >& rFlags )
{
@@ -865,17 +818,12 @@ sal_Bool NeonSession::CanUse( const rtl::OUString & inUri,
return sal_False;
}
-// -------------------------------------------------------------------
-// virtual
sal_Bool NeonSession::UsesProxy()
{
Init();
return !m_aProxyName.isEmpty() ;
}
-// -------------------------------------------------------------------
-// OPTIONS
-// -------------------------------------------------------------------
void NeonSession::OPTIONS( const rtl::OUString & inPath,
DAVCapabilities & outCapabilities,
const DAVRequestEnvironment & rEnv )
@@ -900,9 +848,6 @@ void NeonSession::OPTIONS( const rtl::OUString & inPath,
outCapabilities.executable = !!servercaps.dav_executable;
}
-// -------------------------------------------------------------------
-// PROPFIND - allprop & named
-// -------------------------------------------------------------------
void NeonSession::PROPFIND( const rtl::OUString & inPath,
const Depth inDepth,
const std::vector< rtl::OUString > & inPropNames,
@@ -926,9 +871,6 @@ void NeonSession::PROPFIND( const rtl::OUString & inPath,
HandleError( theRetVal, inPath, rEnv );
}
-// -------------------------------------------------------------------
-// PROPFIND - propnames
-// -------------------------------------------------------------------
void NeonSession::PROPFIND( const rtl::OUString & inPath,
const Depth inDepth,
std::vector< DAVResourceInfo > & ioResInfo,
@@ -950,9 +892,6 @@ void NeonSession::PROPFIND( const rtl::OUString & inPath,
HandleError( theRetVal, inPath, rEnv );
}
-// -------------------------------------------------------------------
-// PROPPATCH
-// -------------------------------------------------------------------
void NeonSession::PROPPATCH( const rtl::OUString & inPath,
const std::vector< ProppatchValue > & inValues,
const DAVRequestEnvironment & rEnv )
@@ -1081,9 +1020,6 @@ void NeonSession::PROPPATCH( const rtl::OUString & inPath,
HandleError( theRetVal, inPath, rEnv );
}
-// -------------------------------------------------------------------
-// HEAD
-// -------------------------------------------------------------------
void NeonSession::HEAD( const ::rtl::OUString & inPath,
const std::vector< ::rtl::OUString > & inHeaderNames,
DAVResource & ioResource,
@@ -1104,9 +1040,6 @@ void NeonSession::HEAD( const ::rtl::OUString & inPath,
HandleError( theRetVal, inPath, rEnv );
}
-// -------------------------------------------------------------------
-// GET
-// -------------------------------------------------------------------
uno::Reference< io::XInputStream >
NeonSession::GET( const rtl::OUString & inPath,
const DAVRequestEnvironment & rEnv )
@@ -1130,9 +1063,6 @@ NeonSession::GET( const rtl::OUString & inPath,
return uno::Reference< io::XInputStream >( xInputStream.get() );
}
-// -------------------------------------------------------------------
-// GET
-// -------------------------------------------------------------------
void NeonSession::GET( const rtl::OUString & inPath,
uno::Reference< io::XOutputStream > & ioOutputStream,
const DAVRequestEnvironment & rEnv )
@@ -1153,9 +1083,6 @@ void NeonSession::GET( const rtl::OUString & inPath,
HandleError( theRetVal, inPath, rEnv );
}
-// -------------------------------------------------------------------
-// GET
-// -------------------------------------------------------------------
uno::Reference< io::XInputStream >
NeonSession::GET( const rtl::OUString & inPath,
const std::vector< ::rtl::OUString > & inHeaderNames,
@@ -1184,9 +1111,6 @@ NeonSession::GET( const rtl::OUString & inPath,
return uno::Reference< io::XInputStream >( xInputStream.get() );
}
-// -------------------------------------------------------------------
-// GET
-// -------------------------------------------------------------------
void NeonSession::GET( const rtl::OUString & inPath,
uno::Reference< io::XOutputStream > & ioOutputStream,
const std::vector< ::rtl::OUString > & inHeaderNames,
@@ -1212,9 +1136,6 @@ void NeonSession::GET( const rtl::OUString & inPath,
HandleError( theRetVal, inPath, rEnv );
}
-// -------------------------------------------------------------------
-// PUT
-// -------------------------------------------------------------------
void NeonSession::PUT( const rtl::OUString & inPath,
const uno::Reference< io::XInputStream > & inInputStream,
const DAVRequestEnvironment & rEnv )
@@ -1238,9 +1159,6 @@ void NeonSession::PUT( const rtl::OUString & inPath,
HandleError( theRetVal, inPath, rEnv );
}
-// -------------------------------------------------------------------
-// POST
-// -------------------------------------------------------------------
uno::Reference< io::XInputStream >
NeonSession::POST( const rtl::OUString & inPath,
const rtl::OUString & rContentType,
@@ -1274,9 +1192,6 @@ NeonSession::POST( const rtl::OUString & inPath,
return uno::Reference< io::XInputStream >( xInputStream.get() );
}
-// -------------------------------------------------------------------
-// POST
-// -------------------------------------------------------------------
void NeonSession::POST( const rtl::OUString & inPath,
const rtl::OUString & rContentType,
const rtl::OUString & rReferer,
@@ -1307,9 +1222,6 @@ void NeonSession::POST( const rtl::OUString & inPath,
HandleError( theRetVal, inPath, rEnv );
}
-// -------------------------------------------------------------------
-// MKCOL
-// -------------------------------------------------------------------
void NeonSession::MKCOL( const rtl::OUString & inPath,
const DAVRequestEnvironment & rEnv )
throw ( DAVException )
@@ -1325,9 +1237,6 @@ void NeonSession::MKCOL( const rtl::OUString & inPath,
HandleError( theRetVal, inPath, rEnv );
}
-// -------------------------------------------------------------------
-// COPY
-// -------------------------------------------------------------------
void NeonSession::COPY( const rtl::OUString & inSourceURL,
const rtl::OUString & inDestinationURL,
const DAVRequestEnvironment & rEnv,
@@ -1354,9 +1263,6 @@ void NeonSession::COPY( const rtl::OUString & inSourceURL,
HandleError( theRetVal, inSourceURL, rEnv );
}
-// -------------------------------------------------------------------
-// MOVE
-// -------------------------------------------------------------------
void NeonSession::MOVE( const rtl::OUString & inSourceURL,
const rtl::OUString & inDestinationURL,
const DAVRequestEnvironment & rEnv,
@@ -1381,9 +1287,6 @@ void NeonSession::MOVE( const rtl::OUString & inSourceURL,
HandleError( theRetVal, inSourceURL, rEnv );
}
-// -------------------------------------------------------------------
-// DESTROY
-// -------------------------------------------------------------------
void NeonSession::DESTROY( const rtl::OUString & inPath,
const DAVRequestEnvironment & rEnv )
throw ( DAVException )
@@ -1399,7 +1302,6 @@ void NeonSession::DESTROY( const rtl::OUString & inPath,
HandleError( theRetVal, inPath, rEnv );
}
-// -------------------------------------------------------------------
namespace
{
sal_Int32 lastChanceToSendRefreshRequest( TimeValue const & rStart,
@@ -1429,9 +1331,7 @@ namespace
} // namespace
-// -------------------------------------------------------------------
-// LOCK (set new lock)
-// -------------------------------------------------------------------
+// Set new lock
void NeonSession::LOCK( const ::rtl::OUString & inPath,
ucb::Lock & rLock,
const DAVRequestEnvironment & rEnv )
@@ -1524,9 +1424,7 @@ void NeonSession::LOCK( const ::rtl::OUString & inPath,
HandleError( theRetVal, inPath, rEnv );
}
-// -------------------------------------------------------------------
-// LOCK (refresh existing lock)
-// -------------------------------------------------------------------
+// Refresh existing lock
sal_Int64 NeonSession::LOCK( const ::rtl::OUString & inPath,
sal_Int64 nTimeout,
const DAVRequestEnvironment & rEnv )
@@ -1562,9 +1460,7 @@ sal_Int64 NeonSession::LOCK( const ::rtl::OUString & inPath,
return theLock->timeout;
}
-// -------------------------------------------------------------------
-// LOCK (refresh existing lock)
-// -------------------------------------------------------------------
+// Refresh existing lock
bool NeonSession::LOCK( NeonLock * pLock,
sal_Int32 & rlastChanceToSendRefreshRequest )
{
@@ -1596,9 +1492,6 @@ bool NeonSession::LOCK( NeonLock * pLock,
}
}
-// -------------------------------------------------------------------
-// UNLOCK
-// -------------------------------------------------------------------
void NeonSession::UNLOCK( const ::rtl::OUString & inPath,
const DAVRequestEnvironment & rEnv )
throw ( DAVException )
@@ -1630,9 +1523,6 @@ void NeonSession::UNLOCK( const ::rtl::OUString & inPath,
HandleError( theRetVal, inPath, rEnv );
}
-// -------------------------------------------------------------------
-// UNLOCK
-// -------------------------------------------------------------------
bool NeonSession::UNLOCK( NeonLock * pLock )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1655,14 +1545,12 @@ bool NeonSession::UNLOCK( NeonLock * pLock )
}
}
-// -------------------------------------------------------------------
void NeonSession::abort()
throw ( DAVException )
{
SAL_INFO("ucb.ucp.webdav", "neon commands cannot be aborted");
}
-// -------------------------------------------------------------------
const ucbhelper::InternetProxyServer & NeonSession::getProxySettings() const
{
if ( m_aScheme == "http" || m_aScheme == "https" )
@@ -1679,7 +1567,6 @@ const ucbhelper::InternetProxyServer & NeonSession::getProxySettings() const
}
}
-// -------------------------------------------------------------------
namespace {
bool containsLocktoken( const uno::Sequence< ucb::Lock > & rLocks,
@@ -1700,7 +1587,6 @@ bool containsLocktoken( const uno::Sequence< ucb::Lock > & rLocks,
} // namespace
-// -------------------------------------------------------------------
bool NeonSession::removeExpiredLocktoken( const rtl::OUString & inURL,
const DAVRequestEnvironment & rEnv )
{
@@ -1765,10 +1651,7 @@ bool NeonSession::removeExpiredLocktoken( const rtl::OUString & inURL,
return false;
}
-// -------------------------------------------------------------------
-// HandleError
-// Common Error Handler
-// -------------------------------------------------------------------
+// Common error handler
void NeonSession::HandleError( int nError,
const rtl::OUString & inPath,
const DAVRequestEnvironment & rEnv )
@@ -1867,7 +1750,6 @@ void NeonSession::HandleError( int nError,
}
}
-// -------------------------------------------------------------------
namespace {
void runResponseHeaderHandler( void * userdata,
@@ -1927,8 +1809,6 @@ void runResponseHeaderHandler( void * userdata,
} // namespace
-// -------------------------------------------------------------------
-// static
int NeonSession::GET( ne_session * sess,
const char * uri,
ne_block_reader reader,
@@ -1971,8 +1851,6 @@ int NeonSession::GET( ne_session * sess,
return ret;
}
-// -------------------------------------------------------------------
-// static
int NeonSession::PUT( ne_session * sess,
const char * uri,
const char * buffer,
@@ -1998,7 +1876,6 @@ int NeonSession::PUT( ne_session * sess,
return ret;
}
-// -------------------------------------------------------------------
int NeonSession::POST( ne_session * sess,
const char * uri,
const char * buffer,
@@ -2058,8 +1935,6 @@ int NeonSession::POST( ne_session * sess,
return ret;
}
-// -------------------------------------------------------------------
-// static
bool
NeonSession::getDataFromInputStream(
const uno::Reference< io::XInputStream > & xStream,
@@ -2148,7 +2023,6 @@ NeonSession::getDataFromInputStream(
return false;
}
-// ---------------------------------------------------------------------
sal_Bool
NeonSession::isDomainMatch( rtl::OUString certHostName )
{
@@ -2169,7 +2043,6 @@ NeonSession::isDomainMatch( rtl::OUString certHostName )
return sal_False;
}
-// ---------------------------------------------------------------------
rtl::OUString NeonSession::makeAbsoluteURL( rtl::OUString const & rURL ) const
{
try
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.hxx b/ucb/source/ucp/webdav-neon/NeonSession.hxx
index 15c88bb..7bad502 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.hxx
@@ -41,11 +41,7 @@ namespace ucbhelper { class ProxyDecider; }
namespace webdav_ucp
{
-// -------------------------------------------------------------------
-// NeonSession
// A DAVSession implementation using the neon/expat library
-// -------------------------------------------------------------------
-
class NeonSession : public DAVSession
{
private:
diff --git a/ucb/source/ucp/webdav-neon/NeonUri.cxx b/ucb/source/ucp/webdav-neon/NeonUri.cxx
index f02e0d4..ce49fdb 100644
--- a/ucb/source/ucp/webdav-neon/NeonUri.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonUri.cxx
@@ -79,10 +79,6 @@ const ne_uri g_sUriDefaultsFTP = { "ftp",
# pragma enable_warn
#endif
-// -------------------------------------------------------------------
-// Constructor
-// -------------------------------------------------------------------
-
NeonUri::NeonUri( const ne_uri * inUri )
throw ( DAVException )
{
@@ -164,9 +160,6 @@ void NeonUri::init( const rtl::OString & rUri, const ne_uri * pUri )
}
}
-// -------------------------------------------------------------------
-// Destructor
-// -------------------------------------------------------------------
NeonUri::~NeonUri( )
{
}
diff --git a/ucb/source/ucp/webdav-neon/NeonUri.hxx b/ucb/source/ucp/webdav-neon/NeonUri.hxx
index 06d5931..6bf446a 100644
--- a/ucb/source/ucp/webdav-neon/NeonUri.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonUri.hxx
@@ -39,10 +39,7 @@ namespace webdav_ucp
#define DEFAULT_HTTPS_PORT 443
#define DEFAULT_FTP_PORT 21
-// -------------------------------------------------------------------
-// NeonUri
// A URI implementation for use with the neon/expat library
-// -------------------------------------------------------------------
class NeonUri
{
private:
commit 443dd20baed10ddbe67f63114d4dec851cc807f7
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Mar 26 08:35:48 2013 +0200
WaE: unused function 'matchIgnoreAsciiCase'
Change-Id: I5a270b7375807d1eaad9e22acea4457a0ceb5c54
diff --git a/ucb/source/ucp/webdav-neon/NeonUri.cxx b/ucb/source/ucp/webdav-neon/NeonUri.cxx
index 5c5996c..f02e0d4 100644
--- a/ucb/source/ucp/webdav-neon/NeonUri.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonUri.cxx
@@ -83,21 +83,6 @@ const ne_uri g_sUriDefaultsFTP = { "ftp",
// Constructor
// -------------------------------------------------------------------
-namespace {
-
-//TODO! rtl::OString::matchIgnoreAsciiCaseAsciiL() missing
-inline bool matchIgnoreAsciiCase(rtl::OString const & rStr1,
- sal_Char const * pStr2,
- sal_Int32 nStr2Len) SAL_THROW(())
-{
- return
- rtl_str_shortenedCompareIgnoreAsciiCase_WithLength(
- rStr1.getStr(), rStr1.getLength(), pStr2, nStr2Len, nStr2Len)
- == 0;
-}
-
-}
-
NeonUri::NeonUri( const ne_uri * inUri )
throw ( DAVException )
{
More information about the Libreoffice-commits
mailing list