Replace usage of rtl_*Memory with equivalent from string.h

Change-Id: I50ffc10f007f03c3252ef0196b59b881429cc159
Reviewed-on: https://gerrit.libreoffice.org/734
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>

9 files changed, 9 insertions, 13 deletions

diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index 9d63b26022e0..314226aaf6dc 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -47,7 +47,7 @@
 
 #include <memory>
 #include <vector>
-#include <rtl/memory.h>
+#include <string.h>
 #include "curl.hxx"
 #include <curl/easy.h>
 #include <ucbhelper/cancelcommandexecution.hxx>
@@ -730,7 +730,7 @@ sal_Int32 InsertData::read(sal_Int8 *dest,sal_Int32 nBytesRequested)
     if(m_xInputStream.is()) {
             Sequence<sal_Int8> seq(nBytesRequested);
         m = m_xInputStream->readBytes(seq,nBytesRequested);
-        rtl_copyMemory(dest,seq.getConstArray(),m);
+        memcpy(dest,seq.getConstArray(),m);
     }
     return m;
 }
diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index 13b5ae89b4ff..06ffa42cfe67 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -94,7 +94,7 @@ int MemoryContainer::append(
         m_pBuffer = rtl_reallocateMemory(m_pBuffer,m_nLen);
     }
 
-    rtl_copyMemory(static_cast<sal_Int8*>(m_pBuffer)+m_nWritePos,
+    memcpy(static_cast<sal_Int8*>(m_pBuffer)+m_nWritePos,
                    pBuffer,nLen);
     m_nWritePos = tmp;
     return nLen;
diff --git a/ucb/source/ucp/ftp/test_ftpurl.cxx b/ucb/source/ucp/ftp/test_ftpurl.cxx
index 3e2a5c22a2dd..573453e04595 100644
--- a/ucb/source/ucp/ftp/test_ftpurl.cxx
+++ b/ucb/source/ucp/ftp/test_ftpurl.cxx
@@ -32,7 +32,6 @@
 #include "ftploaderthread.hxx"
 #include "ftphandleprovider.hxx"
 #include "debughelper.hxx"
-#include <rtl/memory.h>
 #include <vector>
 
 #define TESTEVAL \
@@ -252,7 +251,7 @@ int test_ftpopen(void)
         char *dest = (char*) malloc(sizeof(char));
         dest[0] = 0;
         do {
-            rtl_zeroMemory((void*)buff,bffsz);
+            memset((void*)buff, 0, bffsz);
             fread(buff,bffsz-1,1,file);
             nbuf = strlen(buff);
             ndest = strlen(dest);
diff --git a/ucb/source/ucp/gio/gio_inputstream.cxx b/ucb/source/ucp/gio/gio_inputstream.cxx
index e0bc9c38b185..f4d60c85b5fc 100644
--- a/ucb/source/ucp/gio/gio_inputstream.cxx
+++ b/ucb/source/ucp/gio/gio_inputstream.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <rtl/memory.h>
 #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
 #include <ucbhelper/cancelcommandexecution.hxx>
 #include <string.h>
diff --git a/ucb/source/ucp/gio/gio_outputstream.cxx b/ucb/source/ucp/gio/gio_outputstream.cxx
index 047ef9fcdfc9..050133ebc9af 100644
--- a/ucb/source/ucp/gio/gio_outputstream.cxx
+++ b/ucb/source/ucp/gio/gio_outputstream.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <rtl/memory.h>
 #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
 #include <ucbhelper/cancelcommandexecution.hxx>
 #include <string.h>
diff --git a/ucb/source/ucp/gio/gio_seekable.cxx b/ucb/source/ucp/gio/gio_seekable.cxx
index e78ec0485903..2f9774ef5de4 100644
--- a/ucb/source/ucp/gio/gio_seekable.cxx
+++ b/ucb/source/ucp/gio/gio_seekable.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <rtl/memory.h>
 #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
 #include <ucbhelper/cancelcommandexecution.hxx>
 #include <string.h>
diff --git a/ucb/source/ucp/gvfs/gvfs_stream.cxx b/ucb/source/ucp/gvfs/gvfs_stream.cxx
index 3741703ac052..18dacfa50c34 100644
--- a/ucb/source/ucp/gvfs/gvfs_stream.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_stream.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 #include "gvfs_stream.hxx"
-#include <rtl/memory.h>
 #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
 
 #include <libgnomevfs/gnome-vfs-ops.h>
diff --git a/ucb/source/ucp/webdav/NeonInputStream.cxx b/ucb/source/ucp/webdav/NeonInputStream.cxx
index 240f41232c2a..882fa2520b4f 100644
--- a/ucb/source/ucp/webdav/NeonInputStream.cxx
+++ b/ucb/source/ucp/webdav/NeonInputStream.cxx
@@ -26,8 +26,9 @@
  *
  ************************************************************************/
 
+#include <string.h>
+
 #include "NeonInputStream.hxx"
-#include <rtl/memory.h>
 
 using namespace cppu;
 using namespace com::sun::star::io;
@@ -57,7 +58,7 @@ NeonInputStream::~NeonInputStream( void )
 void NeonInputStream::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;
 }
 
@@ -94,7 +95,7 @@ sal_Int32 SAL_CALL NeonInputStream::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/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx
index 45ee2409f0f0..b3a737fb5fa6 100644
--- a/ucb/source/ucp/webdav/NeonSession.cxx
+++ b/ucb/source/ucp/webdav/NeonSession.cxx
@@ -2125,7 +2125,7 @@ NeonSession::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;