removed obsolete methods provide/acceptIOResource

2 files changed, 5 insertions, 74 deletions

diff --git a/vos/inc/vos/process.hxx b/vos/inc/vos/process.hxx
index 15b4f2a39292..ce2c20bd0d3e 100644
--- a/vos/inc/vos/process.hxx
+++ b/vos/inc/vos/process.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: process.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: th $ $Date: 2001-05-10 10:51:00 $
+ *  last change: $Author: obr $ $Date: 2001-06-08 13:55:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -258,21 +258,10 @@ public:
     */
     TProcessError SAL_CALL join();
 
-    /** provide a socket as ioresource for the child process.
-        The child has to call OStartUpInfo::acceptIOResources() if any
-        ioresources are provided by calling this method, otherwise execute()
-        will not return.
-        This method should only be called before execute().
-        @see OStartupInfo::acceptIOResource
-    */
-    void SAL_CALL provideIOResource(oslSocket Socket, TDescriptorFlags Flags = TFlags_Wait);
-
 protected:
     const ::rtl::OUString m_strImageName;
     const ::rtl::OUString m_strDirectory;
 
-    oslIOResource*     m_IoResources;
-    sal_Int32          m_NoResources;
     oslProcess         m_Process;
 };
 
@@ -305,16 +294,6 @@ public:
     */
     ~OStartupInfo();
 
-    /** get one ioresource from the parent process.
-        The recieved socket has been opened by the parent process and will be
-        duplicated for the calling process, wich has full read-write access to
-        this socket.
-        @param rSocket [out] returns the recieved socket.
-        @return True, if the parent process provides resources for the caller, otherwise no return.
-        @see OProcess::provideIOResource
-    */
-    sal_Bool SAL_CALL acceptIOResource(OSocket& rSocket);
-
     /** @return the number of command line arguments.
      */
     sal_uInt32 SAL_CALL getCommandArgCount();
@@ -335,10 +314,6 @@ public:
         @return eNONE, if the variable exist in the enviroment, otherwise False.
     */
     TStartupError SAL_CALL getEnvironment(const ::rtl::OUString& strVar, ::rtl::OUString& strValue);
-
-protected:
-    oslIOResource* m_IoResources;
-    sal_Int32              m_NoResources;
 };
 
 
diff --git a/vos/source/process.cxx b/vos/source/process.cxx
index 194cc7cd8f4d..86e5cd3596e4 100644
--- a/vos/source/process.cxx
+++ b/vos/source/process.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: process.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: jl $ $Date: 2001-03-16 15:25:50 $
+ *  last change: $Author: obr $ $Date: 2001-06-08 13:56:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -259,8 +259,6 @@ VOS_IMPLEMENT_CLASSINFO(
 OProcess::OProcess( ) :
     m_strImageName( ),
     m_strDirectory(),
-    m_IoResources(0),
-    m_NoResources(0),
     m_Process(0)
 {
 }
@@ -269,8 +267,6 @@ OProcess::OProcess( ) :
 OProcess::OProcess( const rtl::OUString& strImageName ) :
     m_strImageName( strImageName ),
     m_strDirectory(),
-    m_IoResources(0),
-    m_NoResources(0),
     m_Process(0)
 {
     // empty
@@ -280,8 +276,6 @@ OProcess::OProcess( const rtl::OUString& strImageName ) :
 OProcess::OProcess(const rtl::OUString& strImageName, const rtl::OUString& strWorkingDirectory) :
     m_strImageName( strImageName ),
     m_strDirectory( strWorkingDirectory ),
-    m_IoResources(0),
-    m_NoResources(0),
     m_Process(0)
 {
     // empty
@@ -291,8 +285,6 @@ OProcess::OProcess(const rtl::OUString& strImageName, const rtl::OUString& strWo
 OProcess::~OProcess()
 {
     osl_freeProcessHandle(m_Process);
-
-    delete m_IoResources;
 }
 
 OProcess* OProcess::getProcess(TProcessIdentifier Identifier)
@@ -316,9 +308,6 @@ OProcess::TProcessError OProcess::execute(TProcessOption Options,
                                           const OArgumentList& aArgumentList,
                                           const OEnvironment&  aEnvironment )
 {
-    if (m_IoResources)
-        m_IoResources[m_NoResources].Type = osl_Process_TypeNone;
-
     return ((TProcessError)osl_executeProcess(m_strImageName.pData,
                                               aArgumentList.m_aVec,
                                               aArgumentList.n_Args,
@@ -327,7 +316,6 @@ OProcess::TProcessError OProcess::execute(TProcessOption Options,
                                               m_strDirectory.pData,
                                               aEnvironment.m_aVec,
                                               aEnvironment.n_Vars,
-                                              m_IoResources,
                                               &m_Process));
 }
 
@@ -337,9 +325,6 @@ OProcess::TProcessError OProcess::execute( TProcessOption Options,
                                            const OArgumentList& aArgumentList,
                                            const OEnvironment&  aEnvironment )
 {
-    if (m_IoResources)
-        m_IoResources[m_NoResources].Type = osl_Process_TypeNone;
-
     return ((TProcessError)osl_executeProcess(m_strImageName.pData,
                                               aArgumentList.m_aVec,
                                               aArgumentList.n_Args,
@@ -348,7 +333,6 @@ OProcess::TProcessError OProcess::execute( TProcessOption Options,
                                               m_strDirectory.pData,
                                               aEnvironment.m_aVec,
                                               aEnvironment.n_Vars,
-                                              m_IoResources,
                                               &m_Process));
 }
 
@@ -374,25 +358,6 @@ OProcess::TProcessError OProcess::join()
 }
 
 
-void OProcess::provideIOResource(oslSocket Socket, TDescriptorFlags Flags)
-{
-    if (! m_IoResources)
-    {
-        m_IoResources= new oslIOResource[MAX_RESOURCES + 1];
-        m_NoResources = 0;
-    }
-
-    VOS_ASSERT(m_IoResources != 0);
-    VOS_ASSERT(m_NoResources < MAX_RESOURCES);
-
-    m_IoResources[m_NoResources].Type  = osl_Process_TypeSocket;
-    m_IoResources[m_NoResources].Flags = (oslDescriptorFlag)Flags;
-    m_IoResources[m_NoResources].Descriptor.Socket = Socket;
-
-    m_NoResources++;
-}
-
-
 /*
 OProcess::TProcessError OProcess::searchPath(const sal_Char* Name, sal_Char *Buffer, sal_uInt32 Max,
                                              const sal_Char* Path, sal_Char Separator)
@@ -409,21 +374,12 @@ VOS_IMPLEMENT_CLASSINFO(
     VOS_NAMESPACE(OStartupInfo, vos),
     VOS_NAMESPACE(OObject, vos), 0);
 
-OStartupInfo::OStartupInfo() :
-    m_IoResources(0),
-    m_NoResources(0)
+OStartupInfo::OStartupInfo()
 {
 }
 
 OStartupInfo::~OStartupInfo()
 {
-    delete m_IoResources;
-}
-
-sal_Bool OStartupInfo::acceptIOResource(OSocket& rSocket)
-{
-    // jbu : functionality removed from vos
-    return sal_False;
 }
 
 OStartupInfo::TStartupError OStartupInfo::getExecutableFile( rtl::OUString& strImageName )