Skip to content

C
core
Kaydet (Commit) 75c8d59d authored tarafından Alexander Wilms's avatar Alexander Wilms Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

Remove visual noise from registry 

Change-Id: Ica0c7fe04dae3c52583cc2324bae1cfa5af1e197
Reviewed-on: https://gerrit.libreoffice.org/8292Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 043e3785
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 140 additions and 140 deletions
registry/source/keyimpl.cxx
Dosyayı görüntüle @ 75c8d59d
......@@ -30,9 +30,9 @@ using namespace store;
namespace { static char const VALUE_PREFIX[] = "$VL_"; }
//*********************************************************************
// ORegKey()
//
ORegKey::ORegKey(const OUString& keyName, ORegistry* pReg)
: m_refCount(1)
, m_name(keyName)
......@@ -42,43 +42,43 @@ ORegKey::ORegKey(const OUString& keyName, ORegistry* pReg)
{
}
//*********************************************************************
// ~ORegKey()
//
ORegKey::~ORegKey()
{
OSL_POSTCOND(m_refCount == 0, "registry::ORegKey::dtor(): refcount not zero.");
}
//*********************************************************************
// releaseKey
//
RegError ORegKey::releaseKey(RegKeyHandle hKey)
{
return m_pRegistry->releaseKey(hKey);
}
//*********************************************************************
// createKey
//
RegError ORegKey::createKey(const OUString& keyName, RegKeyHandle* phNewKey)
{
return m_pRegistry->createKey(this, keyName, phNewKey);
}
//*********************************************************************
// openKey
//
RegError ORegKey::openKey(const OUString& keyName, RegKeyHandle* phOpenKey)
{
return m_pRegistry->openKey(this, keyName, phOpenKey);
}
//*********************************************************************
// openSubKeys
//
RegError ORegKey::openSubKeys(const OUString& keyName, RegKeyHandle** phOpenSubKeys, sal_uInt32* pnSubKeys)
{
RegError _ret = REG_NO_ERROR;
......@@ -138,9 +138,9 @@ RegError ORegKey::openSubKeys(const OUString& keyName, RegKeyHandle** phOpenSubK
}
//*********************************************************************
// getKeyNames
//
RegError ORegKey::getKeyNames(const OUString& keyName,
rtl_uString*** pSubKeyNames,
sal_uInt32* pnSubKeys)
......@@ -198,27 +198,27 @@ RegError ORegKey::getKeyNames(const OUString& keyName,
}
//*********************************************************************
// closeKey
//
RegError ORegKey::closeKey(RegKeyHandle hKey)
{
return (m_pRegistry->closeKey(hKey));
}
//*********************************************************************
// deleteKey
//
RegError ORegKey::deleteKey(const OUString& keyName)
{
return (m_pRegistry->deleteKey(this, keyName));
}
//*********************************************************************
// getValueType
//
RegError ORegKey::getValueInfo(const OUString& valueName, RegValueType* pValueType, sal_uInt32* pValueSize) const
{
OStoreStream rValue;
......@@ -283,9 +283,9 @@ RegError ORegKey::getValueInfo(const OUString& valueName, RegValueType* pValueTy
}
//*********************************************************************
// setValue
//
RegError ORegKey::setValue(const OUString& valueName, RegValueType vType, RegValue value, sal_uInt32 vSize)
{
OStoreStream rValue;
......@@ -358,9 +358,9 @@ RegError ORegKey::setValue(const OUString& valueName, RegValueType vType, RegVal
return REG_NO_ERROR;
}
//*********************************************************************
// setLongListValue
//
RegError ORegKey::setLongListValue(const OUString& valueName, sal_Int32* pValueList, sal_uInt32 len)
{
OStoreStream rValue;
......@@ -417,9 +417,9 @@ RegError ORegKey::setLongListValue(const OUString& valueName, sal_Int32* pValueL
return REG_NO_ERROR;
}
//*********************************************************************
// setStringListValue
//
RegError ORegKey::setStringListValue(const OUString& valueName, sal_Char** pValueList, sal_uInt32 len)
{
OStoreStream rValue;
......@@ -485,9 +485,9 @@ RegError ORegKey::setStringListValue(const OUString& valueName, sal_Char** pValu
return REG_NO_ERROR;
}
//*********************************************************************
// setUnicodeListValue
//
RegError ORegKey::setUnicodeListValue(const OUString& valueName, sal_Unicode** pValueList, sal_uInt32 len)
{
OStoreStream rValue;
......@@ -553,9 +553,9 @@ RegError ORegKey::setUnicodeListValue(const OUString& valueName, sal_Unicode** p
return REG_NO_ERROR;
}
//*********************************************************************
// getValue
//
RegError ORegKey::getValue(const OUString& valueName, RegValue value) const
{
OStoreStream rValue;
......@@ -646,9 +646,9 @@ RegError ORegKey::getValue(const OUString& valueName, RegValue value) const
return REG_NO_ERROR;
}
//*********************************************************************
// getLongListValue
//
RegError ORegKey::getLongListValue(const OUString& valueName, sal_Int32** pValueList, sal_uInt32* pLen) const
{
OStoreStream rValue;
......@@ -743,9 +743,9 @@ RegError ORegKey::getLongListValue(const OUString& valueName, sal_Int32** pValue
return REG_NO_ERROR;
}
//*********************************************************************
// getStringListValue
//
RegError ORegKey::getStringListValue(const OUString& valueName, sal_Char*** pValueList, sal_uInt32* pLen) const
{
OStoreStream rValue;
......@@ -849,9 +849,9 @@ RegError ORegKey::getStringListValue(const OUString& valueName, sal_Char*** pVal
return REG_NO_ERROR;
}
//*********************************************************************
// getUnicodeListValue
//
RegError ORegKey::getUnicodeListValue(const OUString& valueName, sal_Unicode*** pValueList, sal_uInt32* pLen) const
{
OStoreStream rValue;
......@@ -955,9 +955,9 @@ RegError ORegKey::getUnicodeListValue(const OUString& valueName, sal_Unicode***
return REG_NO_ERROR;
}
//*********************************************************************
// getKeyType()
//
RegError ORegKey::getKeyType(const OUString& name, RegKeyType* pKeyType) const
{
*pKeyType = RG_KEYTYPE;
......@@ -988,9 +988,9 @@ RegError ORegKey::getResolvedKeyName(const OUString& keyName,
return REG_NO_ERROR;
}
//*********************************************************************
// countSubKeys()
//
sal_uInt32 ORegKey::countSubKeys()
{
REG_GUARD(m_pRegistry->m_mutex);
......
registry/source/regimpl.cxx
Dosyayı görüntüle @ 75c8d59d
......@@ -420,9 +420,9 @@ void dumpType(typereg::Reader const & reader, OString const & indent) {
}
//*********************************************************************
// ORegistry()
//
ORegistry::ORegistry()
: m_refCount(1)
, m_readOnly(false)
......@@ -431,9 +431,9 @@ ORegistry::ORegistry()
{
}
//*********************************************************************
// ~ORegistry()
//
ORegistry::~ORegistry()
{
ORegKey* pRootKey = m_openKeyTable[ROOT];
......@@ -445,9 +445,9 @@ ORegistry::~ORegistry()
}
//*********************************************************************
// initRegistry
//
RegError ORegistry::initRegistry(const OUString& regName, RegAccessMode accessMode)
{
RegError eRet = REG_INVALID_REGISTRY;
......@@ -512,9 +512,9 @@ RegError ORegistry::initRegistry(const OUString& regName, RegAccessMode accessMo
}
//*********************************************************************
// closeRegistry
//
RegError ORegistry::closeRegistry()
{
REG_GUARD(m_mutex);
......@@ -532,9 +532,9 @@ RegError ORegistry::closeRegistry()
}
//*********************************************************************
// destroyRegistry
//
RegError ORegistry::destroyRegistry(const OUString& regName)
{
REG_GUARD(m_mutex);
......@@ -594,9 +594,9 @@ RegError ORegistry::destroyRegistry(const OUString& regName)
return REG_NO_ERROR;
}
//*********************************************************************
// acquireKey
//
RegError ORegistry::acquireKey (RegKeyHandle hKey)
{
ORegKey* pKey = static_cast< ORegKey* >(hKey);
......@@ -609,9 +609,9 @@ RegError ORegistry::acquireKey (RegKeyHandle hKey)
return REG_NO_ERROR;
}
//*********************************************************************
// releaseKey
//
RegError ORegistry::releaseKey (RegKeyHandle hKey)
{
ORegKey* pKey = static_cast< ORegKey* >(hKey);
......@@ -627,9 +627,9 @@ RegError ORegistry::releaseKey (RegKeyHandle hKey)
return REG_NO_ERROR;
}
//*********************************************************************
// createKey
//
RegError ORegistry::createKey(RegKeyHandle hKey, const OUString& keyName,
RegKeyHandle* phNewKey)
{
......@@ -688,9 +688,9 @@ RegError ORegistry::createKey(RegKeyHandle hKey, const OUString& keyName,
}
//*********************************************************************
// openKey
//
RegError ORegistry::openKey(RegKeyHandle hKey, const OUString& keyName,
RegKeyHandle* phOpenKey)
{
......@@ -739,9 +739,9 @@ RegError ORegistry::openKey(RegKeyHandle hKey, const OUString& keyName,
}
//*********************************************************************
// closeKey
//
RegError ORegistry::closeKey(RegKeyHandle hKey)
{
ORegKey* pKey = static_cast< ORegKey* >(hKey);
......@@ -773,9 +773,9 @@ RegError ORegistry::closeKey(RegKeyHandle hKey)
return releaseKey(pKey);
}
//*********************************************************************
// deleteKey
//
RegError ORegistry::deleteKey(RegKeyHandle hKey, const OUString& keyName)
{
ORegKey* pKey = static_cast< ORegKey* >(hKey);
......@@ -855,9 +855,9 @@ RegError ORegistry::eraseKey(ORegKey* pKey, const OUString& keyName)
return pKey->closeKey(pOldKey);
}
//*********************************************************************
// deleteSubKeysAndValues
//
RegError ORegistry::deleteSubkeysAndValues(ORegKey* pKey)
{
OStoreDirectory::iterator iter;
......@@ -896,9 +896,9 @@ RegError ORegistry::deleteSubkeysAndValues(ORegKey* pKey)
}
//*********************************************************************
// loadKey
//
RegError ORegistry::loadKey(RegKeyHandle hKey, const OUString& regFileName,
bool bWarnings, bool bReport)
{
......@@ -944,9 +944,9 @@ RegError ORegistry::loadKey(RegKeyHandle hKey, const OUString& regFileName,
}
//*********************************************************************
// saveKey
//
RegError ORegistry::saveKey(RegKeyHandle hKey, const OUString& regFileName,
bool bWarnings, bool bReport)
{
......@@ -995,9 +995,9 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
}
//*********************************************************************
// loadAndSaveValue()
//
RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey,
ORegKey* pSourceKey,
const OUString& valueName,
......@@ -1123,9 +1123,9 @@ RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey,
}
//*********************************************************************
// checkblop()
//
RegError ORegistry::checkBlop(OStoreStream& rValue,
const OUString& sTargetPath,
sal_uInt32 srcValueSize,
......@@ -1253,9 +1253,9 @@ static sal_uInt32 checkTypeReaders(RegistryTypeReader& reader1,
return count;
}
//*********************************************************************
// mergeModuleValue()
//
RegError ORegistry::mergeModuleValue(OStoreStream& rTargetValue,
RegistryTypeReader& reader,
RegistryTypeReader& reader2)
......@@ -1328,9 +1328,9 @@ RegError ORegistry::mergeModuleValue(OStoreStream& rTargetValue,
return REG_NO_ERROR;
}
//*********************************************************************
// loadAndSaveKeys()
//
RegError ORegistry::loadAndSaveKeys(ORegKey* pTargetKey,
ORegKey* pSourceKey,
const OUString& keyName,
......@@ -1398,9 +1398,9 @@ RegError ORegistry::loadAndSaveKeys(ORegKey* pTargetKey,
}
//*********************************************************************
// getRootKey()
//
ORegKey* ORegistry::getRootKey()
{
m_openKeyTable[ROOT]->acquire();
......@@ -1408,9 +1408,9 @@ ORegKey* ORegistry::getRootKey()
}
//*********************************************************************
// dumpRegistry()
//
RegError ORegistry::dumpRegistry(RegKeyHandle hKey) const
{
ORegKey *pKey = (ORegKey*)hKey;
......@@ -1447,9 +1447,9 @@ RegError ORegistry::dumpRegistry(RegKeyHandle hKey) const
return REG_NO_ERROR;
}
//*********************************************************************
// dumpValue()
//
RegError ORegistry::dumpValue(const OUString& sPath, const OUString& sName, sal_Int16 nSpc) const
{
OStoreStream rValue;
......@@ -1688,9 +1688,9 @@ RegError ORegistry::dumpValue(const OUString& sPath, const OUString& sName, sal_
return REG_NO_ERROR;
}
//*********************************************************************
// dumpKey()
//
RegError ORegistry::dumpKey(const OUString& sPath, const OUString& sName, sal_Int16 nSpace) const
{
OStoreDirectory rStoreDir;
......
registry/source/registry.cxx
Dosyayı görüntüle @ 75c8d59d
......@@ -39,9 +39,9 @@
extern "C" {
//*********************************************************************
// acquire
//
static void REGISTRY_CALLTYPE acquire(RegHandle hReg)
{
ORegistry* pReg = (ORegistry*) hReg;
......@@ -51,9 +51,9 @@ static void REGISTRY_CALLTYPE acquire(RegHandle hReg)
}
//*********************************************************************
// release
//
static void REGISTRY_CALLTYPE release(RegHandle hReg)
{
ORegistry* pReg = (ORegistry*) hReg;
......@@ -69,9 +69,9 @@ static void REGISTRY_CALLTYPE release(RegHandle hReg)
}
//*********************************************************************
// getName
//
static RegError REGISTRY_CALLTYPE getName(RegHandle hReg, rtl_uString** pName)
{
ORegistry* pReg;
......@@ -95,9 +95,9 @@ static RegError REGISTRY_CALLTYPE getName(RegHandle hReg, rtl_uString** pName)
}
//*********************************************************************
// isReadOnly
//
static sal_Bool REGISTRY_CALLTYPE isReadOnly(RegHandle hReg)
{
if (hReg)
......@@ -107,9 +107,9 @@ static sal_Bool REGISTRY_CALLTYPE isReadOnly(RegHandle hReg)
}
//*********************************************************************
// createRegistry
//
static RegError REGISTRY_CALLTYPE createRegistry(rtl_uString* registryName,
RegHandle* phRegistry)
{
......@@ -127,9 +127,9 @@ static RegError REGISTRY_CALLTYPE createRegistry(rtl_uString* registryName,
return REG_NO_ERROR;
}
//*********************************************************************
// openRootKey
//
static RegError REGISTRY_CALLTYPE openRootKey(RegHandle hReg,
RegKeyHandle* phRootKey)
{
......@@ -152,9 +152,9 @@ static RegError REGISTRY_CALLTYPE openRootKey(RegHandle hReg,
}
//*********************************************************************
// openRegistry
//
static RegError REGISTRY_CALLTYPE openRegistry(rtl_uString* registryName,
RegHandle* phRegistry,
RegAccessMode accessMode)
......@@ -175,9 +175,9 @@ static RegError REGISTRY_CALLTYPE openRegistry(rtl_uString* registryName,
return REG_NO_ERROR;
}
//*********************************************************************
// closeRegistry
//
static RegError REGISTRY_CALLTYPE closeRegistry(RegHandle hReg)
{
ORegistry *pReg;
......@@ -205,9 +205,9 @@ static RegError REGISTRY_CALLTYPE closeRegistry(RegHandle hReg)
}
//*********************************************************************
// destroyRegistry
//
static RegError REGISTRY_CALLTYPE destroyRegistry(RegHandle hReg,
rtl_uString* registryName)
{
......@@ -236,9 +236,9 @@ static RegError REGISTRY_CALLTYPE destroyRegistry(RegHandle hReg,
}
//*********************************************************************
// loadRegKey
//
static RegError REGISTRY_CALLTYPE loadKey(RegHandle hReg,
RegKeyHandle hKey,
rtl_uString* keyName,
......@@ -287,9 +287,9 @@ static RegError REGISTRY_CALLTYPE loadKey(RegHandle hReg,
return pKey->closeKey(pNewKey);
}
//*********************************************************************
// saveKey
//
static RegError REGISTRY_CALLTYPE saveKey(RegHandle hReg,
RegKeyHandle hKey,
rtl_uString* keyName,
......@@ -327,9 +327,9 @@ static RegError REGISTRY_CALLTYPE saveKey(RegHandle hReg,
return pKey->releaseKey(pNewKey);
}
//*********************************************************************
// mergeKey
//
static RegError REGISTRY_CALLTYPE mergeKey(RegHandle hReg,
RegKeyHandle hKey,
rtl_uString* keyName,
......@@ -376,9 +376,9 @@ static RegError REGISTRY_CALLTYPE mergeKey(RegHandle hReg,
return pReg->loadKey(pKey, regFileName, bWarnings, bReport);
}
//*********************************************************************
// dumpRegistry
//
static RegError REGISTRY_CALLTYPE dumpRegistry(RegHandle hReg,
RegKeyHandle hKey)
{
......@@ -399,9 +399,9 @@ static RegError REGISTRY_CALLTYPE dumpRegistry(RegHandle hReg,
return pReg->dumpRegistry(hKey);
}
//*********************************************************************
// initRegistry_Api
//
REG_DLLPUBLIC Registry_Api* REGISTRY_CALLTYPE initRegistry_Api(void)
{
static Registry_Api aApi= {&acquire,
......@@ -450,9 +450,9 @@ REG_DLLPUBLIC Registry_Api* REGISTRY_CALLTYPE initRegistry_Api(void)
}
//*********************************************************************
// reg_loadRegKey
//
REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_loadKey(RegKeyHandle hKey,
rtl_uString* keyName,
rtl_uString* regFileName)
......@@ -467,9 +467,9 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_loadKey(RegKeyHandle hKey,
return loadKey(pKey->getRegistry(), hKey, keyName, regFileName);
}
//*********************************************************************
// reg_saveKey
//
REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_saveKey(RegKeyHandle hKey,
rtl_uString* keyName,
rtl_uString* regFileName)
......@@ -484,9 +484,9 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_saveKey(RegKeyHandle hKey,
return saveKey(pKey->getRegistry(), hKey, keyName, regFileName);
}
//*********************************************************************
// reg_mergeKey
//
REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_mergeKey(RegKeyHandle hKey,
rtl_uString* keyName,
rtl_uString* regFileName,
......@@ -503,9 +503,9 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_mergeKey(RegKeyHandle hKey,
return mergeKey(pKey->getRegistry(), hKey, keyName, regFileName, bWarnings, bReport);
}
//*********************************************************************
// reg_createRegistry
//
REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName,
RegHandle* phRegistry)
{
......@@ -523,9 +523,9 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registr
return REG_NO_ERROR;
}
//*********************************************************************
// reg_openRootKey
//
REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry,
RegKeyHandle* phRootKey)
{
......@@ -533,27 +533,27 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry,
}
//*********************************************************************
// reg_getName
//
REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName)
{
return getName(hRegistry, pName);
}
//*********************************************************************
// reg_isReadOnly
//
REG_DLLPUBLIC sal_Bool REGISTRY_CALLTYPE reg_isReadOnly(RegHandle hRegistry)
{
return isReadOnly(hRegistry);
}
//*********************************************************************
// reg_openRegistry
//
REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_openRegistry(rtl_uString* registryName,
RegHandle* phRegistry,
RegAccessMode accessMode)
......@@ -572,9 +572,9 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_openRegistry(rtl_uString* registryN
return REG_NO_ERROR;
}
//*********************************************************************
// reg_closeRegistry
//
REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_closeRegistry(RegHandle hRegistry)
{
ORegistry* pReg;
......@@ -591,9 +591,9 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_closeRegistry(RegHandle hRegistry)
}
//*********************************************************************
// reg_destroyRegistry
//
REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_destroyRegistry(RegHandle hRegistry,
rtl_uString* registryName)
{
......@@ -601,9 +601,9 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_destroyRegistry(RegHandle hRegistry
}
//*********************************************************************
// reg_dumpRegistry
//
REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_dumpRegistry(RegKeyHandle hKey)
{
ORegKey *pKey;
......
registry/source/regkey.cxx
Dosyayı görüntüle @ 75c8d59d
This diff is collapsed.
registry/test/testmerge.cxx
Dosyayı görüntüle @ 75c8d59d
......@@ -186,7 +186,7 @@ void test_merge()
REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString("/stardiv/IchbineinMergeKey"),
OUString("merge2.rdb")), "testMerge error 4");
///////////////////////////////////////////////////////////////////////////
REG_ENSURE(!rootKey.openKey("/stardiv/IchbineinMergeKey", key1), "testMerge error 5");
......@@ -215,7 +215,7 @@ void test_merge()
REG_ENSURE(!key1.closeKey(), "testMerge error 24");
///////////////////////////////////////////////////////////////////////////
REG_ENSURE(!rootKey.openKey("/stardiv/IchbineinMergeKey", key2), "testMerge error 25");
......@@ -244,7 +244,7 @@ void test_merge()
REG_ENSURE(!key2.closeKey(), "testMerge error 44");
///////////////////////////////////////////////////////////////////////////
REG_ENSURE(!rootKey.openKey("/stardiv/IchbineinMergeKey", key1u2), "testMerge error 40");
......@@ -288,7 +288,7 @@ void test_merge()
REG_ENSURE(!key1u2.closeKey(), "testMerge error 71");
///////////////////////////////////////////////////////////////////////////
RegValueType valueType;
sal_uInt32 valueSize;
......@@ -395,7 +395,7 @@ void test_merge()
REG_ENSURE(!key1.closeKey(), "testMerge error 24");
///////////////////////////////////////////////////////////////////////////
REG_ENSURE(!rootKey.closeKey(), "testMerge error 10");
......
registry/test/testregcpp.cxx
Dosyayı görüntüle @ 75c8d59d
......@@ -397,7 +397,7 @@ void test_registry_CppApi()
REG_ENSURE(!rootKey.createKey(OUString("mySixthKey"), key6), "test_registry_CppApi error 7b");
// Link Test
//
REG_ENSURE(!rootKey.createKey(OUString("/myFourthKey/X"), key7), "test_registry_CppApi error 7c)");;
REG_ENSURE(!key6.createLink(OUString("myFirstLink"), OUString("/myFourthKey/X")), "test_registry_CppApi error 7d");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment