Kaydet (Commit) 5dbcc32f authored tarafından Kai Sommerfeld's avatar Kai Sommerfeld

#96458# - Now compiles without errors/warnings on Solaris.

üst ef75a992
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: LinkSequence.cxx,v $ * $RCSfile: LinkSequence.cxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: kso $ $Date: 2002-08-15 10:05:25 $ * last change: $Author: kso $ $Date: 2002-08-22 11:37:30 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -91,6 +91,40 @@ struct LinkSequenceParseContext ...@@ -91,6 +91,40 @@ struct LinkSequenceParseContext
~LinkSequenceParseContext() { delete pLink; } ~LinkSequenceParseContext() { delete pLink; }
}; };
//////////////////////////////////////////////////////////////////////////
extern "C" static int validate_callback(
void * userdata, ne_xml_elmid parent, ne_xml_elmid child )
{
// @@@
return NE_XML_VALID;
}
//////////////////////////////////////////////////////////////////////////
extern "C" static int endelement_callback( void * userdata,
const struct ne_xml_elm * s,
const char * cdata )
{
LinkSequenceParseContext * pCtx
= static_cast< LinkSequenceParseContext * >( userdata );
if ( !pCtx->pLink )
pCtx->pLink = new ucb::Link;
switch ( s->id )
{
case DAV_ELM_src:
pCtx->pLink->Source = rtl::OUString::createFromAscii( cdata );
break;
case DAV_ELM_dst:
pCtx->pLink->Destination = rtl::OUString::createFromAscii( cdata );
break;
default:
break;
}
return 0;
}
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// static // static
bool LinkSequence::createFromXML( const rtl::OString & rInData, bool LinkSequence::createFromXML( const rtl::OString & rInData,
...@@ -174,39 +208,3 @@ bool LinkSequence::toXML( const uno::Sequence< ucb::Link > & rInData, ...@@ -174,39 +208,3 @@ bool LinkSequence::toXML( const uno::Sequence< ucb::Link > & rInData,
} }
return false; return false;
} }
//////////////////////////////////////////////////////////////////////////
// static
int LinkSequence::validate_callback(
void * userdata, ne_xml_elmid parent, ne_xml_elmid child )
{
// @@@
return NE_XML_VALID;
}
//////////////////////////////////////////////////////////////////////////
// static
int LinkSequence::endelement_callback( void * userdata,
const struct ne_xml_elm * s,
const char * cdata )
{
LinkSequenceParseContext * pCtx
= static_cast< LinkSequenceParseContext * >( userdata );
if ( !pCtx->pLink )
pCtx->pLink = new ucb::Link;
switch ( s->id )
{
case DAV_ELM_src:
pCtx->pLink->Source = rtl::OUString::createFromAscii( cdata );
break;
case DAV_ELM_dst:
pCtx->pLink->Destination = rtl::OUString::createFromAscii( cdata );
break;
default:
break;
}
return 0;
}
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: LinkSequence.hxx,v $ * $RCSfile: LinkSequence.hxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: kso $ $Date: 2002-08-15 10:05:25 $ * last change: $Author: kso $ $Date: 2002-08-22 11:37:30 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -95,13 +95,6 @@ public: ...@@ -95,13 +95,6 @@ public:
static bool toXML( const com::sun::star::uno::Sequence< static bool toXML( const com::sun::star::uno::Sequence<
com::sun::star::ucb::Link > & rInData, com::sun::star::ucb::Link > & rInData,
rtl::OUString & rOutData ); rtl::OUString & rOutData );
static int validate_callback( void * userdata,
ne_xml_elmid parent,
ne_xml_elmid child );
static int endelement_callback( void * userdata,
const struct ne_xml_elm * s,
const char * cdata );
}; };
} }
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: LockEntrySequence.cxx,v $ * $RCSfile: LockEntrySequence.cxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: kso $ $Date: 2002-08-15 10:05:25 $ * last change: $Author: kso $ $Date: 2002-08-22 11:37:30 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -97,6 +97,45 @@ struct LockEntrySequenceParseContext ...@@ -97,6 +97,45 @@ struct LockEntrySequenceParseContext
~LockEntrySequenceParseContext() { delete pEntry; } ~LockEntrySequenceParseContext() { delete pEntry; }
}; };
//////////////////////////////////////////////////////////////////////////
extern "C" static int validate_callback( void * userdata,
ne_xml_elmid parent,
ne_xml_elmid child )
{
// @@@
return NE_XML_VALID;
}
//////////////////////////////////////////////////////////////////////////
extern "C" static int endelement_callback( void * userdata,
const struct ne_xml_elm * s,
const char * cdata )
{
LockEntrySequenceParseContext * pCtx
= static_cast< LockEntrySequenceParseContext * >( userdata );
if ( !pCtx->pEntry )
pCtx->pEntry = new ucb::LockEntry;
switch ( s->id )
{
case DAV_ELM_exclusive:
pCtx->pEntry->Scope = ucb::LockScope_EXCLUSIVE;
break;
case DAV_ELM_shared:
pCtx->pEntry->Scope = ucb::LockScope_SHARED;
break;
case DAV_ELM_write:
pCtx->pEntry->Type = ucb::LockType_WRITE;
break;
default:
break;
}
return 0;
}
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// static // static
bool LockEntrySequence::createFromXML( const rtl::OString & rInData, bool LockEntrySequence::createFromXML( const rtl::OString & rInData,
...@@ -154,45 +193,3 @@ bool LockEntrySequence::createFromXML( const rtl::OString & rInData, ...@@ -154,45 +193,3 @@ bool LockEntrySequence::createFromXML( const rtl::OString & rInData,
rOutData.realloc( nCount ); rOutData.realloc( nCount );
return success; return success;
} }
//////////////////////////////////////////////////////////////////////////
// static
int LockEntrySequence::validate_callback( void * userdata,
ne_xml_elmid parent,
ne_xml_elmid child )
{
// @@@
return NE_XML_VALID;
}
//////////////////////////////////////////////////////////////////////////
// static
int LockEntrySequence::endelement_callback( void * userdata,
const struct ne_xml_elm * s,
const char * cdata )
{
LockEntrySequenceParseContext * pCtx
= static_cast< LockEntrySequenceParseContext * >( userdata );
if ( !pCtx->pEntry )
pCtx->pEntry = new ucb::LockEntry;
switch ( s->id )
{
case DAV_ELM_exclusive:
pCtx->pEntry->Scope = ucb::LockScope_EXCLUSIVE;
break;
case DAV_ELM_shared:
pCtx->pEntry->Scope = ucb::LockScope_SHARED;
break;
case DAV_ELM_write:
pCtx->pEntry->Type = ucb::LockType_WRITE;
break;
default:
break;
}
return 0;
}
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: LockEntrySequence.hxx,v $ * $RCSfile: LockEntrySequence.hxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: kso $ $Date: 2002-08-15 10:05:25 $ * last change: $Author: kso $ $Date: 2002-08-22 11:37:30 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -92,13 +92,6 @@ public: ...@@ -92,13 +92,6 @@ public:
static bool createFromXML( const rtl::OString & rInData, static bool createFromXML( const rtl::OString & rInData,
com::sun::star::uno::Sequence< com::sun::star::uno::Sequence<
com::sun::star::ucb::LockEntry > & rOutData ); com::sun::star::ucb::LockEntry > & rOutData );
static int validate_callback( void * userdata,
ne_xml_elmid parent,
ne_xml_elmid child );
static int endelement_callback( void * userdata,
const struct ne_xml_elm * s,
const char * cdata );
}; };
} }
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: LockSequence.cxx,v $ * $RCSfile: LockSequence.cxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: kso $ $Date: 2002-08-15 10:05:26 $ * last change: $Author: kso $ $Date: 2002-08-22 11:37:31 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -108,67 +108,9 @@ struct LockSequenceParseContext ...@@ -108,67 +108,9 @@ struct LockSequenceParseContext
}; };
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// static extern "C" static int validate_callback( void * userdata,
bool LockSequence::createFromXML( const rtl::OString & rInData, ne_xml_elmid parent,
uno::Sequence< ucb::Lock > & rOutData ) ne_xml_elmid child )
{
const sal_Int32 TOKEN_LENGTH = 13; // </activelock>
bool success = true;
// rInData may contain multiple <activelock>...</activelock> tags.
sal_Int32 nCount = 0;
sal_Int32 nStart = 0;
sal_Int32 nEnd = rInData.indexOf( "</activelock>" );
while ( nEnd > -1 )
{
ne_xml_parser * parser = ne_xml_create();
if ( !parser )
{
success = false;
break;
}
LockSequenceParseContext aCtx;
ne_xml_push_handler( parser,
elements,
validate_callback,
0, // startelement_callback
endelement_callback,
&aCtx );
ne_xml_parse( parser,
rInData.getStr() + nStart,
nEnd - nStart + TOKEN_LENGTH );
success = !!ne_xml_valid( parser );
ne_xml_destroy( parser );
if ( !success )
break;
if ( aCtx.pLock )
{
nCount++;
if ( nCount > rOutData.getLength() )
rOutData.realloc( rOutData.getLength() + 1 );
rOutData[ nCount - 1 ] = *aCtx.pLock;
}
nStart = nEnd + TOKEN_LENGTH + 1;
nEnd = rInData.indexOf( "</activelock>", nStart );
}
// rOutData.realloc( nCount );
return success;
}
//////////////////////////////////////////////////////////////////////////
// static
int LockSequence::validate_callback( void * userdata,
ne_xml_elmid parent,
ne_xml_elmid child )
{ {
// @@@ // @@@
return NE_XML_VALID; return NE_XML_VALID;
...@@ -176,9 +118,9 @@ int LockSequence::validate_callback( void * userdata, ...@@ -176,9 +118,9 @@ int LockSequence::validate_callback( void * userdata,
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// static // static
int LockSequence::endelement_callback( void * userdata, extern "C" static int endelement_callback( void * userdata,
const struct ne_xml_elm * s, const struct ne_xml_elm * s,
const char * cdata ) const char * cdata )
{ {
LockSequenceParseContext * pCtx LockSequenceParseContext * pCtx
= static_cast< LockSequenceParseContext * >( userdata ); = static_cast< LockSequenceParseContext * >( userdata );
...@@ -267,3 +209,60 @@ int LockSequence::endelement_callback( void * userdata, ...@@ -267,3 +209,60 @@ int LockSequence::endelement_callback( void * userdata,
} }
return 0; return 0;
} }
//////////////////////////////////////////////////////////////////////////
// static
bool LockSequence::createFromXML( const rtl::OString & rInData,
uno::Sequence< ucb::Lock > & rOutData )
{
const sal_Int32 TOKEN_LENGTH = 13; // </activelock>
bool success = true;
// rInData may contain multiple <activelock>...</activelock> tags.
sal_Int32 nCount = 0;
sal_Int32 nStart = 0;
sal_Int32 nEnd = rInData.indexOf( "</activelock>" );
while ( nEnd > -1 )
{
ne_xml_parser * parser = ne_xml_create();
if ( !parser )
{
success = false;
break;
}
LockSequenceParseContext aCtx;
ne_xml_push_handler( parser,
elements,
validate_callback,
0, // startelement_callback
endelement_callback,
&aCtx );
ne_xml_parse( parser,
rInData.getStr() + nStart,
nEnd - nStart + TOKEN_LENGTH );
success = !!ne_xml_valid( parser );
ne_xml_destroy( parser );
if ( !success )
break;
if ( aCtx.pLock )
{
nCount++;
if ( nCount > rOutData.getLength() )
rOutData.realloc( rOutData.getLength() + 1 );
rOutData[ nCount - 1 ] = *aCtx.pLock;
}
nStart = nEnd + TOKEN_LENGTH + 1;
nEnd = rInData.indexOf( "</activelock>", nStart );
}
// rOutData.realloc( nCount );
return success;
}
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: LockSequence.hxx,v $ * $RCSfile: LockSequence.hxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: kso $ $Date: 2002-08-15 10:05:26 $ * last change: $Author: kso $ $Date: 2002-08-22 11:37:31 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -92,13 +92,6 @@ public: ...@@ -92,13 +92,6 @@ public:
static bool createFromXML( const rtl::OString & rInData, static bool createFromXML( const rtl::OString & rInData,
com::sun::star::uno::Sequence< com::sun::star::uno::Sequence<
com::sun::star::ucb::Lock > & rOutData ); com::sun::star::ucb::Lock > & rOutData );
static int validate_callback( void * userdata,
ne_xml_elmid parent,
ne_xml_elmid child );
static int endelement_callback( void * userdata,
const struct ne_xml_elm * s,
const char * cdata );
}; };
} }
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: NeonPropFindRequest.hxx,v $ * $RCSfile: NeonPropFindRequest.hxx,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: kso $ $Date: 2001-05-16 15:29:59 $ * last change: $Author: kso $ $Date: 2002-08-22 11:37:31 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -99,26 +99,6 @@ public: ...@@ -99,26 +99,6 @@ public:
int & nError ); int & nError );
~NeonPropFindRequest(); ~NeonPropFindRequest();
private:
// Neon callback functions
static void propfind_results( void* userdata,
const char* href,
const NeonPropFindResultSet* set );
static int propfind_iter( void* userdata,
const NeonPropName* pname,
const char* value,
const HttpStatus* status );
static void propnames_results( void* userdata,
const char* href,
const NeonPropFindResultSet* results );
static int propnames_iter( void* userdata,
const NeonPropName* pname,
const char* value,
const HttpStatus* status );
}; };
}; // namespace webdav_ucp }; // namespace webdav_ucp
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: NeonSession.hxx,v $ * $RCSfile: NeonSession.hxx,v $
* *
* $Revision: 1.11 $ * $Revision: 1.12 $
* *
* last change: $Author: kso $ $Date: 2002-08-15 10:05:29 $ * last change: $Author: kso $ $Date: 2002-08-22 11:37:32 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -131,6 +131,17 @@ class NeonSession : public DAVSession ...@@ -131,6 +131,17 @@ class NeonSession : public DAVSession
com::sun::star::ucb::XCommandEnvironment >& inEnv ) com::sun::star::ucb::XCommandEnvironment >& inEnv )
throw ( DAVException ); throw ( DAVException );
DAVAuthListener * getServerAuthListener() const
{ return m_pListener; }
const com::sun::star::uno::Reference<
com::sun::star::ucb::XCommandEnvironment > &
getCommandEnvironment() const { return m_xEnv; }
const rtl::OUString & getHostName() const { return m_aHostName; }
const void * getRequestData() const { return m_pRequestData; }
// allprop & named // allprop & named
virtual void PROPFIND( const ::rtl::OUString & inPath, virtual void PROPFIND( const ::rtl::OUString & inPath,
const Depth inDepth, const Depth inDepth,
...@@ -250,42 +261,12 @@ class NeonSession : public DAVSession ...@@ -250,42 +261,12 @@ class NeonSession : public DAVSession
const ::rtl::OUString & inUserInfo ) const ::rtl::OUString & inUserInfo )
throw( DAVException ); throw( DAVException );
// A simple Neon response_block_reader for use with an XInputStream
static void ResponseBlockReader( void * inUserData,
const char * inBuf,
size_t inLen );
// A simple Neon response_block_reader for use with an XOutputStream
static void ResponseBlockWriter( void * inUserData,
const char * inBuf,
size_t inLen );
// Note: Uncomment the following if locking support is required // Note: Uncomment the following if locking support is required
// void Lockit( const Lock & inLock, bool inLockit ) // void Lockit( const Lock & inLock, bool inLockit )
// throw ( DAVException ); // throw ( DAVException );
// Authentication callback.
static int NeonAuth( void * inUserData,
const char * inRealm,
int attempt,
char * inoutUserName,
char * inoutPassWord );
// Progress / Status callbacks.
static void NeonSession::ProgressNotify( void * userdata,
off_t progress,
off_t total );
static void NeonSession::StatusNotify( void * userdata,
ne_conn_status status,
const char *info );
// pre-send-request callback
static void PreSendRequest( ne_request * req,
void * userdata,
ne_buffer * headers );
// low level GET implementation, used by both public GET implementations // low level GET implementation, used by public GET implementations
static int GET( ne_session * sess, static int GET( ne_session * sess,
const char * uri, const char * uri,
ne_block_reader reader, ne_block_reader reader,
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: UCBDeadPropertyValue.cxx,v $ * $RCSfile: UCBDeadPropertyValue.cxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: kso $ $Date: 2002-08-15 10:05:30 $ * last change: $Author: kso $ $Date: 2002-08-22 11:37:32 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -127,6 +127,62 @@ struct UCBDeadPropertyValueParseContext ...@@ -127,6 +127,62 @@ struct UCBDeadPropertyValueParseContext
~UCBDeadPropertyValueParseContext() { delete pType; delete pValue; } ~UCBDeadPropertyValueParseContext() { delete pType; delete pValue; }
}; };
//////////////////////////////////////////////////////////////////////////
extern "C" static int validate_callback( void * userdata,
ne_xml_elmid parent,
ne_xml_elmid child )
{
switch ( parent )
{
case 0:
if ( child == DAV_ELM_ucbprop )
return NE_XML_VALID;
break;
case DAV_ELM_ucbprop:
return NE_XML_VALID;
default:
break;
}
return NE_XML_DECLINE;
}
//////////////////////////////////////////////////////////////////////////
// static
extern "C" static int endelement_callback( void * userdata,
const struct ne_xml_elm * s,
const char * cdata )
{
UCBDeadPropertyValueParseContext * pCtx
= static_cast< UCBDeadPropertyValueParseContext * >( userdata );
switch ( s->id )
{
case DAV_ELM_type:
OSL_ENSURE( !pCtx->pType,
"UCBDeadPropertyValue::endelement_callback - "
"Type already set!" );
pCtx->pType = new rtl::OUString(
rtl::OUString::createFromAscii( cdata ) );
break;
case DAV_ELM_value:
OSL_ENSURE( !pCtx->pValue,
"UCBDeadPropertyValue::endelement_callback - "
"Value already set!" );
pCtx->pValue = new rtl::OUString(
rtl::OUString::createFromAscii( cdata ) );
break;
default:
break;
}
return 0;
}
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
static rtl::OUString encodeValue( const rtl::OUString & rValue ) static rtl::OUString encodeValue( const rtl::OUString & rValue )
{ {
...@@ -498,60 +554,3 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, ...@@ -498,60 +554,3 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
return true; return true;
} }
//////////////////////////////////////////////////////////////////////////
// static
int UCBDeadPropertyValue::validate_callback( void * userdata,
ne_xml_elmid parent,
ne_xml_elmid child )
{
switch ( parent )
{
case 0:
if ( child == DAV_ELM_ucbprop )
return NE_XML_VALID;
break;
case DAV_ELM_ucbprop:
return NE_XML_VALID;
default:
break;
}
return NE_XML_DECLINE;
}
//////////////////////////////////////////////////////////////////////////
// static
int UCBDeadPropertyValue::endelement_callback( void * userdata,
const struct ne_xml_elm * s,
const char * cdata )
{
UCBDeadPropertyValueParseContext * pCtx
= static_cast< UCBDeadPropertyValueParseContext * >( userdata );
switch ( s->id )
{
case DAV_ELM_type:
OSL_ENSURE( !pCtx->pType,
"UCBDeadPropertyValue::endelement_callback - "
"Type already set!" );
pCtx->pType = new rtl::OUString(
rtl::OUString::createFromAscii( cdata ) );
break;
case DAV_ELM_value:
OSL_ENSURE( !pCtx->pValue,
"UCBDeadPropertyValue::endelement_callback - "
"Value already set!" );
pCtx->pValue = new rtl::OUString(
rtl::OUString::createFromAscii( cdata ) );
break;
default:
break;
}
return 0;
}
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: UCBDeadPropertyValue.hxx,v $ * $RCSfile: UCBDeadPropertyValue.hxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: kso $ $Date: 2002-08-15 10:05:30 $ * last change: $Author: kso $ $Date: 2002-08-22 11:37:32 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -106,13 +106,6 @@ public: ...@@ -106,13 +106,6 @@ public:
com::sun::star::uno::Any & rOutData ); com::sun::star::uno::Any & rOutData );
static bool toXML( const com::sun::star::uno::Any & rInData, static bool toXML( const com::sun::star::uno::Any & rInData,
rtl::OUString & rOutData ); rtl::OUString & rOutData );
static int validate_callback( void * userdata,
ne_xml_elmid parent,
ne_xml_elmid child );
static int endelement_callback( void * userdata,
const struct ne_xml_elm * s,
const char * cdata );
}; };
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment