#96458# - Now the stuff even compiles on Linux.

6 files changed, 104 insertions, 101 deletions

diff --git a/ucb/source/ucp/webdav/LinkSequence.cxx b/ucb/source/ucp/webdav/LinkSequence.cxx
index 5d4107b7141d..ebf5ff529bd1 100644
--- a/ucb/source/ucp/webdav/LinkSequence.cxx
+++ b/ucb/source/ucp/webdav/LinkSequence.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: LinkSequence.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: kso $ $Date: 2002-08-22 11:37:30 $
+ *  last change: $Author: kso $ $Date: 2002-08-22 14:44:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -92,17 +92,18 @@ struct LinkSequenceParseContext
 };
 
 //////////////////////////////////////////////////////////////////////////
-extern "C" static int validate_callback(
-            void * userdata, ne_xml_elmid parent, ne_xml_elmid child )
+extern "C" int LinkSequence_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 )
+extern "C" int LinkSequence_endelement_callback( void * userdata,
+                                                 const struct ne_xml_elm * s,
+                                                 const char * cdata )
 {
     LinkSequenceParseContext * pCtx
                     = static_cast< LinkSequenceParseContext * >( userdata );
@@ -149,9 +150,9 @@ bool LinkSequence::createFromXML( const rtl::OString & rInData,
         LinkSequenceParseContext aCtx;
         ne_xml_push_handler( parser,
                              elements,
-                             validate_callback,
+                             LinkSequence_validate_callback,
                              0, // startelement_callback
-                             endelement_callback,
+                             LinkSequence_endelement_callback,
                              &aCtx );
 
         ne_xml_parse( parser,
diff --git a/ucb/source/ucp/webdav/LockEntrySequence.cxx b/ucb/source/ucp/webdav/LockEntrySequence.cxx
index e3187299c2b8..2694981b750b 100644
--- a/ucb/source/ucp/webdav/LockEntrySequence.cxx
+++ b/ucb/source/ucp/webdav/LockEntrySequence.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: LockEntrySequence.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: kso $ $Date: 2002-08-22 11:37:30 $
+ *  last change: $Author: kso $ $Date: 2002-08-22 14:44:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -98,18 +98,18 @@ struct LockEntrySequenceParseContext
 };
 
 //////////////////////////////////////////////////////////////////////////
-extern "C" static int validate_callback( void * userdata,
-                                         ne_xml_elmid parent,
-                                         ne_xml_elmid child )
+extern "C" int LinkEntrySequence_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 )
+extern "C" int LinkEntrySequence_endelement_callback( void * userdata,
+                                                      const struct ne_xml_elm * s,
+                                                      const char * cdata )
 {
     LockEntrySequenceParseContext * pCtx
                 = static_cast< LockEntrySequenceParseContext * >( userdata );
@@ -161,9 +161,9 @@ bool LockEntrySequence::createFromXML( const rtl::OString & rInData,
         LockEntrySequenceParseContext aCtx;
         ne_xml_push_handler( parser,
                                   elements,
-                                  validate_callback,
+                                  LinkEntrySequence_validate_callback,
                                   0, // startelement_callback
-                                  endelement_callback,
+                                  LinkEntrySequence_endelement_callback,
                                   &aCtx );
 
         ne_xml_parse( parser,
diff --git a/ucb/source/ucp/webdav/LockSequence.cxx b/ucb/source/ucp/webdav/LockSequence.cxx
index 0e037cd1c113..8f9a74c2fd10 100644
--- a/ucb/source/ucp/webdav/LockSequence.cxx
+++ b/ucb/source/ucp/webdav/LockSequence.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: LockSequence.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: kso $ $Date: 2002-08-22 11:37:31 $
+ *  last change: $Author: kso $ $Date: 2002-08-22 14:44:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -108,9 +108,9 @@ struct LockSequenceParseContext
 };
 
 //////////////////////////////////////////////////////////////////////////
-extern "C" static int validate_callback( void * userdata,
-                                         ne_xml_elmid parent,
-                                         ne_xml_elmid child )
+extern "C" int LockSequence_validate_callback( void * userdata,
+                                               ne_xml_elmid parent,
+                                               ne_xml_elmid child )
 {
     // @@@
     return NE_XML_VALID;
@@ -118,9 +118,9 @@ extern "C" static int validate_callback( void * userdata,
 
 //////////////////////////////////////////////////////////////////////////
 // static
-extern "C" static int endelement_callback( void * userdata,
-                                           const struct ne_xml_elm * s,
-                                           const char * cdata )
+extern "C" int LockSequence_endelement_callback( void * userdata,
+                                                 const struct ne_xml_elm * s,
+                                                 const char * cdata )
 {
     LockSequenceParseContext * pCtx
                     = static_cast< LockSequenceParseContext * >( userdata );
@@ -234,9 +234,9 @@ bool LockSequence::createFromXML( const rtl::OString & rInData,
         LockSequenceParseContext aCtx;
         ne_xml_push_handler( parser,
                                   elements,
-                                  validate_callback,
+                                  LockSequence_validate_callback,
                                   0, // startelement_callback
-                                  endelement_callback,
+                                  LockSequence_endelement_callback,
                                   &aCtx );
 
         ne_xml_parse( parser,
diff --git a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
index 63d64a81f57b..41c6fe4422e8 100644
--- a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
+++ b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: NeonPropFindRequest.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: kso $ $Date: 2002-08-22 11:37:31 $
+ *  last change: $Author: kso $ $Date: 2002-08-22 14:44:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -96,10 +96,10 @@ using namespace std;
 using namespace webdav_ucp;
 
 // -------------------------------------------------------------------
-extern "C" static int propfind_iter( void* userdata,
-                                     const NeonPropName* pname,
-                                     const char* value,
-                                     const HttpStatus* status )
+extern "C" int NPFR_propfind_iter( void* userdata,
+                                   const NeonPropName* pname,
+                                   const char* value,
+                                   const HttpStatus* status )
 {
     /*
         HTTP Response Status Classes:
@@ -202,16 +202,16 @@ extern "C" static int propfind_iter( void* userdata,
 }
 
 // -------------------------------------------------------------------
-extern "C" static void propfind_results( void* userdata,
-                                         const char* href,
-                                         const NeonPropFindResultSet* set )
+extern "C" void NPFR_propfind_results( void* userdata,
+                                       const char* href,
+                                       const NeonPropFindResultSet* set )
 {
     // @@@ href is not the uri! DAVResource ctor wants uri!
 
     DAVResource theResource(
                         OStringToOUString( href, RTL_TEXTENCODING_UTF8 ) );
 
-    ne_propset_iterate( set, propfind_iter, &theResource );
+    ne_propset_iterate( set, NPFR_propfind_iter, &theResource );
 
     // Add entry to resources list.
     vector< DAVResource > * theResources
@@ -220,10 +220,10 @@ extern "C" static void propfind_results( void* userdata,
 }
 
 // -------------------------------------------------------------------
-extern "C" static int propnames_iter( void* userdata,
-                                      const NeonPropName* pname,
-                                      const char* value,
-                                      const HttpStatus* status )
+extern "C" int NPFR_propnames_iter( void* userdata,
+                                    const NeonPropName* pname,
+                                    const char* value,
+                                    const HttpStatus* status )
 {
     OUString aFullName;
     DAVProperties::createUCBPropName( pname->nspace,
@@ -236,10 +236,9 @@ extern "C" static int propnames_iter( void* userdata,
 }
 
 // -------------------------------------------------------------------
-extern "C" static void propnames_results(
-                                      void* userdata,
-                                      const char* href,
-                                         const NeonPropFindResultSet* results )
+extern "C" void NPFR_propnames_results( void* userdata,
+                                        const char* href,
+                                        const NeonPropFindResultSet* results )
 {
     // @@@ href is not the uri! DAVResourceInfo ctor wants uri!
 
@@ -247,7 +246,7 @@ extern "C" static void propnames_results(
     DAVResourceInfo theResource(
                         OStringToOUString( href, RTL_TEXTENCODING_UTF8 ) );
     // Fill entry.
-    ne_propset_iterate( results, propnames_iter, &theResource );
+    ne_propset_iterate( results, NPFR_propnames_iter, &theResource );
 
     // Add entry to resources list.
     vector< DAVResourceInfo > * theResources
@@ -281,11 +280,11 @@ NeonPropFindRequest::NeonPropFindRequest( HttpSession* inSession,
         thePropNames[ theIndex ].name   = NULL;
 
         nError = ne_simple_propfind( inSession,
-                                          inPath,
-                                          inDepth,
-                                          thePropNames,
-                                          propfind_results,
-                                          &ioResources );
+                                     inPath,
+                                     inDepth,
+                                     thePropNames,
+                                     NPFR_propfind_results,
+                                     &ioResources );
 
         for ( theIndex = 0; theIndex < thePropCount; theIndex ++ )
             free( (void *)thePropNames[ theIndex ].name );
@@ -296,11 +295,11 @@ NeonPropFindRequest::NeonPropFindRequest( HttpSession* inSession,
     {
         // ALLPROP
         nError = ne_simple_propfind( inSession,
-                                          inPath,
-                                          inDepth,
-                                          NULL, // 0 == allprop
-                                          propfind_results,
-                                          &ioResources );
+                                     inPath,
+                                     inDepth,
+                                     NULL, // 0 == allprop
+                                     NPFR_propfind_results,
+                                     &ioResources );
     }
 
     // #87585# - Sometimes neon lies (because some servers lie).
@@ -321,10 +320,10 @@ NeonPropFindRequest::NeonPropFindRequest(
                             int & nError )
 {
     nError = ne_propnames( inSession,
-                            inPath,
-                            inDepth,
-                            propnames_results,
-                            &ioResInfo );
+                           inPath,
+                           inDepth,
+                           NPFR_propnames_results,
+                           &ioResInfo );
 
     // #87585# - Sometimes neon lies (because some servers lie).
     if ( ( nError == NE_OK ) && ioResInfo.empty() )
diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx
index a12299c1f43f..ca254ae6207a 100644
--- a/ucb/source/ucp/webdav/NeonSession.cxx
+++ b/ucb/source/ucp/webdav/NeonSession.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: NeonSession.cxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: kso $ $Date: 2002-08-22 11:37:32 $
+ *  last change: $Author: kso $ $Date: 2002-08-22 14:44:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -193,9 +193,9 @@ static sal_uInt16 makeStatusCode( const rtl::OUString & rStatusText )
 // ResponseBlockReader
 // A simple Neon response_block_reader for use with an XInputStream
 // -------------------------------------------------------------------
-extern "C" static void ResponseBlockReader( void *       inUserData,
-                                            const char * inBuf,
-                                            size_t       inLen )
+extern "C" void NeonSession_ResponseBlockReader( void *       inUserData,
+                                                 const char * inBuf,
+                                                 size_t       inLen )
 {
     // neon calls this function with (inLen == 0)...
     if ( inLen > 0 )
@@ -210,9 +210,9 @@ extern "C" static void ResponseBlockReader( void *       inUserData,
 // ResponseBlockWriter
 // A simple Neon response_block_reader for use with an XOutputStream
 // -------------------------------------------------------------------
-extern "C" static void ResponseBlockWriter( void *       inUserData,
-                                            const char * inBuf,
-                                            size_t       inLen )
+extern "C" void NeonSession_ResponseBlockWriter( void *       inUserData,
+                                                 const char * inBuf,
+                                                 size_t       inLen )
 {
     // neon calls this function with (inLen == 0)...
     if ( inLen > 0 )
@@ -229,11 +229,11 @@ extern "C" static void ResponseBlockWriter( void *       inUserData,
     }
 }
 
-extern "C" static int NeonAuth( void *      inUserData,
-                                const char *    inRealm,
-                                int          attempt,
-                                char *       inoutUserName,
-                                char *       inoutPassWord )
+extern "C" int NeonAuth( void *     inUserData,
+                         const char *   inRealm,
+                         int          attempt,
+                         char *       inoutUserName,
+                         char *       inoutPassWord )
 {
     NeonSession * theSession = static_cast< NeonSession * >( inUserData );
     if ( !theSession->getServerAuthListener() )
@@ -266,17 +266,17 @@ extern "C" static int NeonAuth( void *      inUserData,
 }
 
 
-extern "C" static void ProgressNotify( void * userdata,
-                                       off_t progress,
-                                       off_t total )
+extern "C" void NeonSession_ProgressNotify( void * userdata,
+                                            off_t progress,
+                                            off_t total )
 {
     // progress: bytes read so far
     // total:    total bytes to read, -1 -> total count not known
 }
 
-extern "C" static void StatusNotify( void * userdata,
-                                     ne_conn_status status,
-                                     const char *info )
+extern "C" void NeonSession_StatusNotify( void * userdata,
+                                          ne_conn_status status,
+                                          const char *info )
 {
 #if 0
     typedef enum {
@@ -290,9 +290,9 @@ extern "C" static void StatusNotify( void * userdata,
     // info: hostname
 }
 
-extern "C" static void PreSendRequest( ne_request * req,
-                                       void * userdata,
-                                       ne_buffer * headers )
+extern "C" void NeonSession_PreSendRequest( ne_request * req,
+                                            void * userdata,
+                                            ne_buffer * headers )
 {
     // userdata -> value returned by 'create'
 
@@ -660,7 +660,7 @@ uno::Reference< io::XInputStream > NeonSession::GET(
     int theRetVal = GET( m_pHttpSession,
                          rtl::OUStringToOString(
                              inPath, RTL_TEXTENCODING_UTF8 ),
-                         ResponseBlockReader,
+                         NeonSession_ResponseBlockReader,
                          theInputStream );
     HandleError( theRetVal );
     return theInputStream;
@@ -682,7 +682,7 @@ void NeonSession::GET( const rtl::OUString &                 inPath,
     int theRetVal = GET( m_pHttpSession,
                          rtl::OUStringToOString(
                              inPath, RTL_TEXTENCODING_UTF8 ),
-                         ResponseBlockWriter,
+                         NeonSession_ResponseBlockWriter,
                          &ioOutputStream );
     HandleError( theRetVal );
 }
@@ -745,7 +745,7 @@ uno::Reference< io::XInputStream > NeonSession::POST(
                             inPath, RTL_TEXTENCODING_UTF8 ),
                           reinterpret_cast< const char * >(
                               aDataToSend.getConstArray() ),
-                          ResponseBlockReader,
+                          NeonSession_ResponseBlockReader,
                           theInputStream,
                           rContentType,
                           rReferer );
@@ -780,7 +780,7 @@ void NeonSession::POST( const rtl::OUString & inPath,
                             inPath, RTL_TEXTENCODING_UTF8 ),
                           reinterpret_cast< const char * >(
                               aDataToSend.getConstArray() ),
-                          ResponseBlockWriter,
+                          NeonSession_ResponseBlockWriter,
                           &oOutputStream,
                           rContentType,
                           rReferer );
@@ -1035,11 +1035,13 @@ HttpSession * NeonSession::CreateSession( const ::rtl::OUString & inScheme,
                                                 inHostName, inPort ) );
 
     // Set a progress callback for the session.
-    ne_set_progress( theHttpSession, ProgressNotify, theHttpSession );
+    ne_set_progress(
+        theHttpSession, NeonSession_ProgressNotify, theHttpSession );
 
     // Set a status notification callback for the session, to report
     // connection status.
-    ne_set_status( theHttpSession, StatusNotify, theHttpSession );
+    ne_set_status(
+        theHttpSession, NeonSession_StatusNotify, theHttpSession );
 
     // Add hooks (i.e. for adding additional headers to the request)
 
@@ -1056,7 +1058,8 @@ HttpSession * NeonSession::CreateSession( const ::rtl::OUString & inScheme,
     //typedef void (*ne_pre_send_fn)(ne_request *req, void *userdata,
     //               ne_buffer *header);
 
-    ne_hook_pre_send( theHttpSession, PreSendRequest, this );
+    ne_hook_pre_send(
+        theHttpSession, NeonSession_PreSendRequest, this );
 
 #if 0
     /* Hook called after the request is sent. May return:
diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
index bd5d3ce853e1..601a742d35bc 100644
--- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
+++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: UCBDeadPropertyValue.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: kso $ $Date: 2002-08-22 11:37:32 $
+ *  last change: $Author: kso $ $Date: 2002-08-22 14:44:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -128,9 +128,9 @@ struct UCBDeadPropertyValueParseContext
 };
 
 //////////////////////////////////////////////////////////////////////////
-extern "C" static int validate_callback( void * userdata,
-                                         ne_xml_elmid parent,
-                                         ne_xml_elmid child )
+extern "C" int UCBDeadPropertyValue_validate_callback( void * userdata,
+                                                       ne_xml_elmid parent,
+                                                       ne_xml_elmid child )
 {
     switch ( parent )
     {
@@ -152,9 +152,9 @@ extern "C" static int validate_callback( void * userdata,
 
 //////////////////////////////////////////////////////////////////////////
 // static
-extern "C" static int endelement_callback( void * userdata,
-                                           const struct ne_xml_elm * s,
-                                           const char * cdata )
+extern "C" int UCBDeadPropertyValue_endelement_callback( void * userdata,
+                                                         const struct ne_xml_elm * s,
+                                                         const char * cdata )
 {
     UCBDeadPropertyValueParseContext * pCtx
             = static_cast< UCBDeadPropertyValueParseContext * >( userdata );
@@ -379,9 +379,9 @@ bool UCBDeadPropertyValue::createFromXML( const rtl::OString & rInData,
         UCBDeadPropertyValueParseContext aCtx;
         ne_xml_push_handler( parser,
                                   elements,
-                                  validate_callback,
+                                  UCBDeadPropertyValue_validate_callback,
                                   0, // startelement_callback
-                                  endelement_callback,
+                                  UCBDeadPropertyValue_endelement_callback,
                                   &aCtx );
 
         ne_xml_parse( parser, rInData.getStr(), rInData.getLength() );