diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-28 09:09:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-29 09:05:39 +0200 |
| commit | 37f9fdc11c4e95d6a34cb515a454503256a82c63 (patch) | |
| tree | 35099c65caf4c62451a5b7a7c0bac249473c9733 /registry/source/regkey.cxx | |
| parent | 4c91b89d8ce9c34179f31854dc88bd0a9fa84cba (diff) | |
replace rtl_allocateMemory with std::malloc
where used directly, since rtl_allocateMemory now just calls into std::malloc
Change-Id: I59f85bdb7efdf6baa30e8fcd2370c0f8e9c999ad
Reviewed-on: https://gerrit.libreoffice.org/59685
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'registry/source/regkey.cxx')
| -rw-r--r-- | registry/source/regkey.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/registry/source/regkey.cxx b/registry/source/regkey.cxx index bf4f464d7b52..52bb9105ac92 100644 --- a/registry/source/regkey.cxx +++ b/registry/source/regkey.cxx @@ -154,7 +154,7 @@ RegError REGISTRY_CALLTYPE closeSubKeys(RegKeyHandle* phSubKeys, { (void) pReg->closeKey(phSubKeys[i]); } - rtl_freeMemory(phSubKeys); + std::free(phSubKeys); return RegError::NO_ERROR; } @@ -576,7 +576,7 @@ RegError REGISTRY_CALLTYPE freeValueList(RegValueType valueType, { case RegValueType::LONGLIST: { - rtl_freeMemory(pValueList); + std::free(pValueList); } break; case RegValueType::STRINGLIST: @@ -584,10 +584,10 @@ RegError REGISTRY_CALLTYPE freeValueList(RegValueType valueType, sal_Char** pVList = static_cast<sal_Char**>(pValueList); for (sal_uInt32 i=0; i < len; i++) { - rtl_freeMemory(pVList[i]); + std::free(pVList[i]); } - rtl_freeMemory(pVList); + std::free(pVList); } break; case RegValueType::UNICODELIST: @@ -595,10 +595,10 @@ RegError REGISTRY_CALLTYPE freeValueList(RegValueType valueType, sal_Unicode** pVList = static_cast<sal_Unicode**>(pValueList); for (sal_uInt32 i=0; i < len; i++) { - rtl_freeMemory(pVList[i]); + std::free(pVList[i]); } - rtl_freeMemory(pVList); + std::free(pVList); } break; default: @@ -660,7 +660,7 @@ RegError REGISTRY_CALLTYPE freeKeyNames(rtl_uString** pKeyNames, rtl_uString_release(pKeyNames[i]); } - rtl_freeMemory(pKeyNames); + std::free(pKeyNames); return RegError::NO_ERROR; } |