From 58aea3f36c14414f95668e229a7350598f6c53a8 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 30 Sep 2015 10:29:19 +0200 Subject: loplugin:unusedmethods - improvements to the plugin to find more method calls - improvements to python script to remove more false+ - fix the FORCE_COMPILE_ALL build flag to include code in the $WORKDIR Change-Id: I4d6015dcb9b9d60c26f0bcee8abad807177a7836 Reviewed-on: https://gerrit.libreoffice.org/19064 Tested-by: Jenkins Reviewed-by: Noel Grandin --- registry/source/reflcnst.hxx | 14 --- registry/source/registry.cxx | 93 ------------------ registry/source/regkey.cxx | 219 ------------------------------------------- 3 files changed, 326 deletions(-) (limited to 'registry/source') diff --git a/registry/source/reflcnst.hxx b/registry/source/reflcnst.hxx index ae1acd21d426..468bd549f533 100644 --- a/registry/source/reflcnst.hxx +++ b/registry/source/reflcnst.hxx @@ -178,20 +178,6 @@ inline sal_uInt32 readUINT32(const sal_uInt8* buffer, sal_uInt32& v) return sizeof(sal_uInt32); } -inline sal_uInt32 writeINT64(sal_uInt8* buffer, sal_Int64 v) -{ - buffer[0] = (sal_uInt8)((v >> 56) & 0xFF); - buffer[1] = (sal_uInt8)((v >> 48) & 0xFF); - buffer[2] = (sal_uInt8)((v >> 40) & 0xFF); - buffer[3] = (sal_uInt8)((v >> 32) & 0xFF); - buffer[4] = (sal_uInt8)((v >> 24) & 0xFF); - buffer[5] = (sal_uInt8)((v >> 16) & 0xFF); - buffer[6] = (sal_uInt8)((v >> 8) & 0xFF); - buffer[7] = (sal_uInt8)((v >> 0) & 0xFF); - - return sizeof(sal_Int64); -} - inline sal_uInt32 writeUINT64(sal_uInt8* buffer, sal_uInt64 v) { buffer[0] = (sal_uInt8)((v >> 56) & 0xFF); diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx index 8ef134e5318e..97a577e7234f 100644 --- a/registry/source/registry.cxx +++ b/registry/source/registry.cxx @@ -446,80 +446,6 @@ Registry_Api* REGISTRY_CALLTYPE initRegistry_Api() } -// reg_loadRegKey - -RegError REGISTRY_CALLTYPE reg_loadKey(RegKeyHandle hKey, - rtl_uString* keyName, - rtl_uString* regFileName) -{ - ORegKey *pKey; - - if (hKey) - pKey = static_cast(hKey); - else - return RegError::INVALID_KEY; - - return loadKey(pKey->getRegistry(), hKey, keyName, regFileName); -} - - -// reg_saveKey - -RegError REGISTRY_CALLTYPE reg_saveKey(RegKeyHandle hKey, - rtl_uString* keyName, - rtl_uString* regFileName) -{ - ORegKey *pKey; - - if (hKey) - pKey = static_cast(hKey); - else - return RegError::INVALID_KEY; - - return saveKey(pKey->getRegistry(), hKey, keyName, regFileName); -} - - -// reg_mergeKey - -RegError REGISTRY_CALLTYPE reg_mergeKey(RegKeyHandle hKey, - rtl_uString* keyName, - rtl_uString* regFileName, - bool bWarnings, - bool bReport) -{ - ORegKey *pKey; - - if (hKey) - pKey = static_cast(hKey); - else - return RegError::INVALID_KEY; - - return mergeKey(pKey->getRegistry(), hKey, keyName, regFileName, bWarnings, bReport); -} - - -// reg_createRegistry - -RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName, - RegHandle* phRegistry) -{ - RegError ret; - - ORegistry* pReg = new ORegistry(); - if ((ret = pReg->initRegistry(registryName, RegAccessMode::READWRITE, true/*bCreate*/)) != RegError::NO_ERROR) - { - delete pReg; - *phRegistry = NULL; - return ret; - } - - *phRegistry = pReg; - - return RegError::NO_ERROR; -} - - // reg_openRootKey RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry, @@ -530,15 +456,6 @@ RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry, -// reg_getName - -RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName) -{ - return getName(hRegistry, pName); -} - - - // reg_openRegistry RegError REGISTRY_CALLTYPE reg_openRegistry(rtl_uString* registryName, @@ -578,16 +495,6 @@ RegError REGISTRY_CALLTYPE reg_closeRegistry(RegHandle hRegistry) -// reg_destroyRegistry - -RegError REGISTRY_CALLTYPE reg_destroyRegistry(RegHandle hRegistry, - rtl_uString* registryName) -{ - return destroyRegistry(hRegistry, registryName); -} - - - // reg_dumpRegistry RegError REGISTRY_CALLTYPE reg_dumpRegistry(RegKeyHandle hKey) diff --git a/registry/source/regkey.cxx b/registry/source/regkey.cxx index 52298383fe03..bf61f64db68d 100644 --- a/registry/source/regkey.cxx +++ b/registry/source/regkey.cxx @@ -672,19 +672,6 @@ RegError REGISTRY_CALLTYPE freeKeyNames(rtl_uString** pKeyNames, -// reg_createKey - -RegError REGISTRY_CALLTYPE reg_createKey(RegKeyHandle hKey, - rtl_uString* keyName, - RegKeyHandle* phNewKey) -{ - if (!hKey) - return RegError::INVALID_KEY; - - return createKey(hKey, keyName, phNewKey); -} - - // reg_openKey RegError REGISTRY_CALLTYPE reg_openKey(RegKeyHandle hKey, @@ -698,44 +685,6 @@ RegError REGISTRY_CALLTYPE reg_openKey(RegKeyHandle hKey, } -// reg_openSubKeys - -RegError REGISTRY_CALLTYPE reg_openSubKeys(RegKeyHandle hKey, - rtl_uString* keyName, - RegKeyHandle** pphSubKeys, - sal_uInt32* pnSubKeys) -{ - if (!hKey) - return RegError::INVALID_KEY; - - return openSubKeys(hKey, keyName, pphSubKeys, pnSubKeys); -} - - -// reg_closeSubKeys - -RegError REGISTRY_CALLTYPE reg_closeSubKeys(RegKeyHandle* pphSubKeys, - sal_uInt32 nSubKeys) -{ - if (!pphSubKeys) - return RegError::INVALID_KEY; - - return closeSubKeys(pphSubKeys, nSubKeys); -} - - -// reg_deleteKey - -RegError REGISTRY_CALLTYPE reg_deleteKey(RegKeyHandle hKey, - rtl_uString* keyName) -{ - if (!hKey) - return RegError::INVALID_KEY; - - return deleteKey(hKey, keyName); -} - - // reg_closeKey RegError REGISTRY_CALLTYPE reg_closeKey(RegKeyHandle hKey) @@ -748,172 +697,4 @@ RegError REGISTRY_CALLTYPE reg_closeKey(RegKeyHandle hKey) -// reg_getKeyName - -RegError REGISTRY_CALLTYPE reg_getKeyName(RegKeyHandle hKey, rtl_uString** pKeyName) -{ - if (hKey) - { - rtl_uString_assign( pKeyName, static_cast(hKey)->getName().pData ); - return RegError::NO_ERROR; - } else - { - rtl_uString_new( pKeyName ); - return RegError::INVALID_KEY; - } -} - - -// reg_setValue - -RegError REGISTRY_CALLTYPE reg_setValue(RegKeyHandle hKey, - rtl_uString* keyName, - RegValueType valueType, - RegValue pData, - sal_uInt32 valueSize) -{ - if (!hKey) - return RegError::INVALID_KEY; - - return setValue(hKey, keyName, valueType, pData, valueSize); -} - - -// reg_setLongListValue - -RegError REGISTRY_CALLTYPE reg_setLongListValue(RegKeyHandle hKey, - rtl_uString* keyName, - sal_Int32* pValueList, - sal_uInt32 len) -{ - if (!hKey) - return RegError::INVALID_KEY; - - return setLongListValue(hKey, keyName, pValueList, len); -} - - -// reg_setStringListValue - -RegError REGISTRY_CALLTYPE reg_setStringListValue(RegKeyHandle hKey, - rtl_uString* keyName, - sal_Char** pValueList, - sal_uInt32 len) -{ - if (!hKey) - return RegError::INVALID_KEY; - - return setStringListValue(hKey, keyName, pValueList, len); -} - - -// reg_setUnicodeListValue - -RegError REGISTRY_CALLTYPE reg_setUnicodeListValue(RegKeyHandle hKey, - rtl_uString* keyName, - sal_Unicode** pValueList, - sal_uInt32 len) -{ - if (!hKey) - return RegError::INVALID_KEY; - - return setUnicodeListValue(hKey, keyName, pValueList, len); -} - - -// reg_getValueInfo - -RegError REGISTRY_CALLTYPE reg_getValueInfo(RegKeyHandle hKey, - rtl_uString* keyName, - RegValueType* pValueType, - sal_uInt32* pValueSize) -{ - if (!hKey) - return RegError::INVALID_KEY; - - return getValueInfo(hKey, keyName, pValueType, pValueSize); -} - - -// reg_getValueInfo - -RegError REGISTRY_CALLTYPE reg_getValue(RegKeyHandle hKey, - rtl_uString* keyName, - RegValue pData) -{ - if (!hKey) - return RegError::INVALID_KEY; - - return getValue(hKey, keyName, pData); -} - - -// reg_getLongListValue - -RegError REGISTRY_CALLTYPE reg_getLongListValue(RegKeyHandle hKey, - rtl_uString* keyName, - sal_Int32** pValueList, - sal_uInt32* pLen) -{ - if (!hKey) - return RegError::INVALID_KEY; - - return getLongListValue(hKey, keyName, pValueList, pLen); -} - - -// reg_getStringListValue - -RegError REGISTRY_CALLTYPE reg_getStringListValue(RegKeyHandle hKey, - rtl_uString* keyName, - sal_Char*** pValueList, - sal_uInt32* pLen) -{ - if (!hKey) - return RegError::INVALID_KEY; - - return getStringListValue(hKey, keyName, pValueList, pLen); -} - - -// reg_getUnicodeListValue - -RegError REGISTRY_CALLTYPE reg_getUnicodeListValue(RegKeyHandle hKey, - rtl_uString* keyName, - sal_Unicode*** pValueList, - sal_uInt32* pLen) -{ - if (!hKey) - return RegError::INVALID_KEY; - - return getUnicodeListValue(hKey, keyName, pValueList, pLen); -} - - -// reg_freeValueList - -RegError REGISTRY_CALLTYPE reg_freeValueList(RegValueType valueType, - RegValue pValueList, - sal_uInt32 len) -{ - if (pValueList) - return freeValueList(valueType, pValueList, len); - else - return RegError::INVALID_VALUE; -} - - -// reg_getResolvedKeyName - -RegError REGISTRY_CALLTYPE reg_getResolvedKeyName(RegKeyHandle hKey, - rtl_uString* keyName, - bool firstLinkOnly, - rtl_uString** pResolvedName) -{ - if (!hKey) - return RegError::INVALID_KEY; - - return getResolvedKeyName(hKey, keyName, firstLinkOnly, pResolvedName); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit