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 /desktop | |
| 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 'desktop')
| -rw-r--r-- | desktop/source/deployment/misc/dp_misc.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/registry/configuration/dp_configuration.cxx | 5 | ||||
| -rw-r--r-- | desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index 2c30677aff02..31cb38c2f4ed 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -526,7 +526,7 @@ OUString readConsole() } #else char buf[1024]; - rtl_zeroMemory(buf, 1024); + memset(buf, 0, 1024); // read one char less so that the last char in buf is always zero if (fgets(buf, 1024, stdin) != NULL) { diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index c1019bacefe4..06589bf80ed6 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -39,7 +39,6 @@ #include "rtl/string.hxx" #include "rtl/ustrbuf.hxx" #include "rtl/uri.hxx" -#include "rtl/memory.h" #include "osl/file.hxx" #include "cppuhelper/exc_hlp.hxx" #include "ucbhelper/content.hxx" @@ -640,7 +639,7 @@ OUString replaceOrigin( if ((write_pos + index) > filtered.getLength()) filtered.realloc( (filtered.getLength() + index) * 2 ); - rtl_copyMemory( filtered.getArray() + write_pos, pBytes, index ); + memcpy( filtered.getArray() + write_pos, pBytes, index ); write_pos += index; pBytes += index; nBytes -= index; @@ -679,7 +678,7 @@ OUString replaceOrigin( } if ((write_pos + nAdd) > filtered.getLength()) filtered.realloc( (filtered.getLength() + nAdd) * 2 ); - rtl_copyMemory( filtered.getArray() + write_pos, pAdd, nAdd ); + memcpy( filtered.getArray() + write_pos, pAdd, nAdd ); write_pos += nAdd; } if (!use_filtered) diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx index b7b57b27e1d4..85141645fb96 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx @@ -31,7 +31,6 @@ #include "../../deployment/gui/dp_gui_shared.hxx" #include "unopkg_shared.h" #include "osl/thread.h" -#include "rtl/memory.h" #include "tools/string.hxx" #include "tools/resmgr.hxx" #include "cppuhelper/implbase3.hxx" |