[Libreoffice-commits] core.git: sal/osl

[Chris Sherlock]

 sal/osl/unx/pipe.cxx |    1 -
 sal/osl/w32/pipe.cxx |   30 +++---------------------------
 2 files changed, 3 insertions(+), 28 deletions(-)

New commits:
commit 0922085dc8acf5500e4c01b00f83d524c8adc300
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Sun Jun 25 08:16:37 2017 +1000

    osl: remove comment cruft from pipe.cxx on win32 and unx
    
    Change-Id: I774497c07f682a3923a6317af5804e477540995c
    Reviewed-on: https://gerrit.libreoffice.org/39225
    Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>
    Tested-by: Chris Sherlock <chris.sherlock79 at gmail.com>

diff --git a/sal/osl/unx/pipe.cxx b/sal/osl/unx/pipe.cxx
index 93da6c3d3a9d..d7896df3c093 100644
--- a/sal/osl/unx/pipe.cxx
+++ b/sal/osl/unx/pipe.cxx
@@ -62,7 +62,6 @@ static struct
     { -1,              osl_Pipe_E_invalidError      }
 };
 
-/* reverse map */
 static oslPipeError osl_PipeErrorFromNative(int nativeType)
 {
     int i = 0;
diff --git a/sal/osl/w32/pipe.cxx b/sal/osl/w32/pipe.cxx
index b2e0547a35b6..ac75fc0236c7 100644
--- a/sal/osl/w32/pipe.cxx
+++ b/sal/osl/w32/pipe.cxx
@@ -43,10 +43,6 @@ typedef struct
 
 } oslPipeBuffer;
 
-/*****************************************************************************/
-/* oslPipeImpl */
-/*****************************************************************************/
-
 struct oslPipeImpl
 {
     oslInterlockedCount  m_Reference;
@@ -61,10 +57,6 @@ struct oslPipeImpl
     bool                 m_bClosed;
 };
 
-/*****************************************************************************/
-/* osl_create/destroy-PipeImpl */
-/*****************************************************************************/
-
 oslPipe osl_createPipeImpl(void)
 {
     oslPipe pPipe;
@@ -108,9 +100,6 @@ void osl_destroyPipeImpl(oslPipe pPipe)
     }
 }
 
-/*****************************************************************************/
-/* osl_createPipe  */
-/*****************************************************************************/
 oslPipe SAL_CALL osl_createPipe(rtl_uString *strPipeName, oslPipeOptions Options,
                        oslSecurity Security)
 {
@@ -239,7 +228,7 @@ oslPipe SAL_CALL osl_createPipe(rtl_uString *strPipeName, oslPipeOptions Options
                 }
                 else
                 {
-                    // Pipe instance maybe catched by another client -> try again
+                    // Pipe instance maybe cached by another client -> try again
                 }
             }
         } while ( fPipeAvailable );
@@ -280,16 +269,12 @@ void SAL_CALL osl_closePipe(oslPipe pPipe)
         /* if we have a system pipe close it */
         if (pPipe->m_File != INVALID_HANDLE_VALUE)
         {
-            /*          FlushFileBuffers(pPipe->m_File); */
             DisconnectNamedPipe(pPipe->m_File);
             CloseHandle(pPipe->m_File);
         }
     }
 }
 
-/*****************************************************************************/
-/* osl_acceptPipe  */
-/*****************************************************************************/
 oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
 {
     oslPipe pAcceptedPipe = nullptr;
@@ -322,8 +307,8 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
                 // blocking call to accept
                 if( !GetOverlappedResult(pPipe->m_File, &os, &nBytesTransfered, TRUE))
                 {
-                    // Possible error could be that between ConnectNamedPipe and GetOverlappedResult a connect
-                    // took place.
+                    // Possible error could be that between ConnectNamedPipe and
+                    // GetOverlappedResult a connect took place.
 
                     switch (GetLastError())
                     {
@@ -366,9 +351,6 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
     return pAcceptedPipe;
 }
 
-/*****************************************************************************/
-/* osl_receivePipe  */
-/*****************************************************************************/
 sal_Int32 SAL_CALL osl_receivePipe(oslPipe pPipe,
                         void* pBuffer,
                         sal_Int32 BytesToRead)
@@ -405,9 +387,6 @@ sal_Int32 SAL_CALL osl_receivePipe(oslPipe pPipe,
     return nBytes;
 }
 
-/*****************************************************************************/
-/* osl_sendPipe  */
-/*****************************************************************************/
 sal_Int32 SAL_CALL osl_sendPipe(oslPipe pPipe,
                        const void* pBuffer,
                        sal_Int32 BytesToSend)
@@ -484,9 +463,6 @@ sal_Int32 SAL_CALL osl_readPipe(oslPipe pPipe, void *pBuffer, sal_Int32 n)
     return BytesRead;
 }
 
-/*****************************************************************************/
-/* osl_getLastPipeError  */
-/*****************************************************************************/
 oslPipeError SAL_CALL osl_getLastPipeError(oslPipe pPipe)
 {
     oslPipeError Error;