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 /rdbmaker | |
| 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 'rdbmaker')
| -rw-r--r-- | rdbmaker/inc/codemaker/registry.hxx | 4 | ||||
| -rw-r--r-- | rdbmaker/source/rdbmaker/typeblop.cxx | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/rdbmaker/inc/codemaker/registry.hxx b/rdbmaker/inc/codemaker/registry.hxx index 404d53bfe571..bb30b85fb1e6 100644 --- a/rdbmaker/inc/codemaker/registry.hxx +++ b/rdbmaker/inc/codemaker/registry.hxx @@ -20,6 +20,8 @@ #ifndef _CODEMAKER_REGISTRY_HXX_ #define _CODEMAKER_REGISTRY_HXX_ +#include <string.h> + #include <rtl/alloc.h> #include <osl/interlck.h> #include <registry/registry.hxx> @@ -40,7 +42,7 @@ struct TypeReader_Impl if (copyData) { m_pBlop = (sal_uInt8*)rtl_allocateMemory(bufferLen); - rtl_copyMemory((void*)m_pBlop, buffer, bufferLen); + memcpy(const_cast<sal_uInt8*>(m_pBlop), buffer, bufferLen); } else { m_blopSize = bufferLen; diff --git a/rdbmaker/source/rdbmaker/typeblop.cxx b/rdbmaker/source/rdbmaker/typeblop.cxx index f9acdfd93343..7049da4502be 100644 --- a/rdbmaker/source/rdbmaker/typeblop.cxx +++ b/rdbmaker/source/rdbmaker/typeblop.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <string.h> + #include <rtl/alloc.h> #include <registry/reflwrit.hxx> #include <cppuhelper/servicefactory.hxx> @@ -287,7 +289,7 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop) length = writer.getBlopSize(); *pBlop = (sal_uInt8*)rtl_allocateMemory( length ); - rtl_copyMemory(*pBlop, writer.getBlop(), length); + memcpy(*pBlop, writer.getBlop(), length); } break; case TypeClass_MODULE: @@ -329,7 +331,7 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop) length = writer.getBlopSize(); *pBlop = (sal_uInt8*)rtl_allocateMemory( length ); - rtl_copyMemory(*pBlop, writer.getBlop(), length); + memcpy(*pBlop, writer.getBlop(), length); } break; case TypeClass_INTERFACE: @@ -404,7 +406,7 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop) length = writer.getBlopSize(); *pBlop = (sal_uInt8*)rtl_allocateMemory( length ); - rtl_copyMemory(*pBlop, writer.getBlop(), length); + memcpy(*pBlop, writer.getBlop(), length); } break; case TypeClass_STRUCT: @@ -444,7 +446,7 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop) length = writer.getBlopSize(); *pBlop = (sal_uInt8*)rtl_allocateMemory( length ); - rtl_copyMemory(*pBlop, writer.getBlop(), length); + memcpy(*pBlop, writer.getBlop(), length); } break; case TypeClass_ENUM: @@ -473,7 +475,7 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop) length = writer.getBlopSize(); *pBlop = (sal_uInt8*)rtl_allocateMemory( length ); - rtl_copyMemory(*pBlop, writer.getBlop(), length); + memcpy(*pBlop, writer.getBlop(), length); } break; case TypeClass_TYPEDEF: @@ -488,7 +490,7 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop) 0, 0, 0); length = writer.getBlopSize(); *pBlop = (sal_uInt8*)rtl_allocateMemory( length ); - rtl_copyMemory(*pBlop, writer.getBlop(), length); + memcpy(*pBlop, writer.getBlop(), length); } break; default: |