Changeset 38439 in vbox

Timestamp:

Aug 12, 2011 3:29:32 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

73484

Message:

GuestCtrl: Removed dead code.

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxService/VBoxServiceControlExecThread.cpp (modified) (1 diff)
• Main/include/GuestCtrlImplPrivate.h (modified) (1 diff)
• Main/include/GuestImpl.h (modified) (1 diff)
• Main/src-client/GuestCtrlIO.cpp (modified) (1 diff)
• Main/src-client/GuestCtrlImpl.cpp (modified) (1 diff)
• Main/src-client/GuestCtrlImplDir.cpp (modified) (1 diff)
• Main/src-client/GuestCtrlImplFile.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlExecThread.cpp

@@ -385 +385 @@
                 {
                     if (fEnabled && !cbRead)
-                        AssertMsgFailed(("[PID %u]: Waited (%ums) for pipe buffer %u (%u bytes left) , but nothing read!\n",
+                        AssertMsgFailed(("[PID %u]: Waited (%ums) for pipe buffer %u (%u bytes left), but nothing read!\n",
                                          uPID, uTimeout, pPipeBuf->uPipeId, pPipeBuf->cbSize - pPipeBuf->cbOffset));
                     if (pcbRead)

trunk/src/VBox/Main/include/GuestCtrlImplPrivate.h

@@ -123 +123 @@
     int ParseBlock(GuestProcessStreamBlock &streamBlock);
 
-public:
-
-    static void FreeBlock(GuestProcessStreamBlock *pStreamBlock);
-
 protected:
 

trunk/src/VBox/Main/include/GuestImpl.h

@@ -161 +161 @@
     HRESULT executeStreamQueryFsObjInfo(IN_BSTR aObjName,GuestProcessStreamBlock &streamBlock, PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAddAttribs);
     int     executeStreamDrain(ULONG aPID, GuestProcessStream &stream);
-    void    executeStreamFree(GuestCtrlStreamObjects &streamObjects);
-    void    executeStreamFreeBlock(GuestProcessStreamBlock *pBlock);
     int     executeStreamGetNextBlock(ULONG aPID, GuestProcessStream &stream, GuestProcessStreamBlock &streamBlock);
     HRESULT executeStreamParse(ULONG aPID, GuestCtrlStreamObjects &streamObjects);

trunk/src/VBox/Main/src-client/GuestCtrlIO.cpp

@@ -400 +400 @@
 }
 
-void GuestProcessStream::FreeBlock(GuestProcessStreamBlock *pStreamBlock)
-{
-    if (pStreamBlock)
-    {
-        pStreamBlock->Clear();
-        delete pStreamBlock;
-        pStreamBlock = NULL;
-    }
-}
-

trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp

@@ -1302 +1302 @@
 
 /**
- * Frees a guest stream objects vector.
- *
- * @param   streamObjects           Vector to free.
- */
-void Guest::executeStreamFree(GuestCtrlStreamObjects &streamObjects)
-{
-    /*for (GuestCtrlStreamObjectsIter it = streamObjects.begin();
-         it != streamObjects.end(); it++)
-    {
-        executeStreamFreeBlock(*it);
-    }*/
-    streamObjects.clear();
-}
-
-/**
- * Frees a guest stream block. Pure convenience function for
- * GuestProcessStream::FreeBlock().
- *
- * @return  IPRT status code.
- * @param   pBlock
- */
-void Guest::executeStreamFreeBlock(GuestProcessStreamBlock *pBlock)
-{
-    GuestProcessStream::FreeBlock(pBlock);
-}
-
-/**
  * Tries to get the next upcoming value block from a started guest process
  * by first draining its output and then processing the received guest stream.

trunk/src/VBox/Main/src-client/GuestCtrlImplDir.cpp

@@ -505 +505 @@
                 }
 
-                executeStreamFree(streamObjs);
-
                 if (pRC)
                     *pRC = rc;

trunk/src/VBox/Main/src-client/GuestCtrlImplFile.cpp

@@ -164 +164 @@
                 }
 
-                executeStreamFree(streamObjs);
-
                 if (pRC)
                     *pRC = rc;