[Libreoffice-commits] .: ucb/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Nov 2 06:02:32 PDT 2012


 ucb/source/ucp/webdav/SerfInputStream.cxx |    6 +++---
 ucb/source/ucp/webdav/SerfSession.cxx     |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 62e18c4f3c202c5caca6ed5efa61c4e1985240b9
Author: Arnaud Versini <arnaud.versini at gmail.com>
Date:   Thu Nov 1 17:47:44 2012 +0100

    Use memcpy instead of rtl_copyMemory in ucb
    
    Change-Id: I1bdb02c6d607a10fee03d3044bad20cb811e9939
    Reviewed-on: https://gerrit.libreoffice.org/961
    Reviewed-by: Arnaud Versini <arnaud.versini at gmail.com>
    Tested-by: Arnaud Versini <arnaud.versini at gmail.com>

diff --git a/ucb/source/ucp/webdav/SerfInputStream.cxx b/ucb/source/ucp/webdav/SerfInputStream.cxx
index d8c7222..a6b97eb 100644
--- a/ucb/source/ucp/webdav/SerfInputStream.cxx
+++ b/ucb/source/ucp/webdav/SerfInputStream.cxx
@@ -22,7 +22,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_ucb.hxx"
 #include "SerfInputStream.hxx"
-#include <rtl/memory.h>
+#include <string.h>
 
 using namespace cppu;
 using namespace rtl;
@@ -54,7 +54,7 @@ SerfInputStream::~SerfInputStream( void )
 void SerfInputStream::AddToStream( const char * inBuf, sal_Int32 inLen )
 {
     mInputBuffer.realloc( sal::static_int_cast<sal_Int32>(mLen) + inLen );
-    rtl_copyMemory( mInputBuffer.getArray() + mLen, inBuf, inLen );
+    memcpy( mInputBuffer.getArray() + mLen, inBuf, inLen );
     mLen += inLen;
 }
 
@@ -91,7 +91,7 @@ sal_Int32 SAL_CALL SerfInputStream::readBytes(
     aData.realloc( theBytes2Read );
 
     // Write the data
-    rtl_copyMemory(
+    memcpy(
         aData.getArray(), mInputBuffer.getConstArray() + mPos, theBytes2Read );
 
     // Update our stream position for next time
diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx
index bd858b4..16984f0 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -1509,7 +1509,7 @@ SerfSession::getDataFromInputStream(
                         rData.realloc( nPos + nRead );
 
                     aBuffer.realloc( nRead );
-                    rtl_copyMemory( (void*)( rData.getArray() + nPos ),
+                    memcpy( (void*)( rData.getArray() + nPos ),
                                     (const void*)aBuffer.getConstArray(),
                                     nRead );
                     nPos += nRead;


More information about the Libreoffice-commits mailing list