diff options
| author | Arnaud Versini <arnaud.versini@gmail.com> | 2012-09-29 14:47:11 +0200 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-10-01 18:48:05 +0000 |
| commit | 36a2db3722b79ed3df075d7f3fa77fb761bcf5a4 (patch) | |
| tree | 838cdec72aeea68c3ad78f8d18535afd5408d43a /extensions | |
| parent | 053b68a0c7b75eae7d86d4465f65abc6046515ee (diff) | |
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>
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/ole/oleobjw.cxx | 1 | ||||
| -rw-r--r-- | extensions/source/update/feed/updatefeed.cxx | 1 | ||||
| -rw-r--r-- | extensions/workben/testpgp.cxx | 11 |
3 files changed, 5 insertions, 8 deletions
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index 88ef33662dba..f77cfcca28ed 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -55,7 +55,6 @@ #include <typelib/typedescription.hxx> #include <rtl/uuid.h> -#include <rtl/memory.h> #include <rtl/ustring.hxx> #include "jscriptclasses.hxx" diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index 65016a64af66..d1db88cbcea1 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -57,7 +57,6 @@ #include <com/sun/star/xml/xpath/XXPathAPI.hpp> #include <rtl/ref.hxx> -#include <rtl/memory.h> #include <rtl/bootstrap.hxx> #include <rtl/ustrbuf.hxx> #include <osl/process.h> diff --git a/extensions/workben/testpgp.cxx b/extensions/workben/testpgp.cxx index e6499dd0c2f1..5dad9bea661e 100644 --- a/extensions/workben/testpgp.cxx +++ b/extensions/workben/testpgp.cxx @@ -27,7 +27,6 @@ ************************************************************************/ #include <sal/types.h> -#include <rtl/memory.h> #ifndef _RTL_WSTRING_ #include <rtl/wstring> #endif @@ -220,7 +219,7 @@ void DataSource_Impl::setBuffer (const Sequence<sal_Int8> &rBuffer) { // Fill buffer from file descriptor. char buffer[1024]; - rtl_zeroMemory (buffer, sizeof(buffer)); + memset (buffer, 0, sizeof(buffer)); int k = read (m_fd, buffer, sizeof(buffer)); while (k > 0) @@ -228,10 +227,10 @@ void DataSource_Impl::setBuffer (const Sequence<sal_Int8> &rBuffer) sal_Int32 n = m_buffer.getLength(); m_buffer.realloc (n + k); - rtl_copyMemory (m_buffer.getArray() + n, buffer, k); + memcpy (m_buffer.getArray() + n, buffer, k); n += k; - rtl_zeroMemory (buffer, k); + memset (buffer, 0, k); k = read (m_fd, buffer, sizeof(buffer)); } } @@ -283,7 +282,7 @@ sal_Int32 SAL_CALL DataSource_Impl::readBytes ( if (k > 0) { rData.realloc(k); - rtl_copyMemory ( + memcpy ( rData.getArray(), m_buffer.getConstArray() + m_position, k); m_position += k; } @@ -390,7 +389,7 @@ void SAL_CALL DataSink_Impl::writeBytes (const Sequence<sal_Int8> &rBuffer) sal_Int32 n = m_buffer.getLength(); m_buffer.realloc (n + rBuffer.getLength()); - rtl_copyMemory ( + memcpy ( m_buffer.getArray() + n, rBuffer.getConstArray(), rBuffer.getLength()); |