loplugin:unusedfields in include/package,include/registry
Change-Id: Iadba30885ba3bab7aaee58e298a9dc6b22c8b977
This commit is contained in:
parent
fa452b54a5
commit
a78182a993
@ -35,7 +35,6 @@ protected:
|
||||
css::uno::Sequence< sal_Int8 > sInBuffer;
|
||||
bool bFinish;
|
||||
bool bFinished;
|
||||
sal_Int32 nStrategy;
|
||||
sal_Int64 nOffset, nLength;
|
||||
z_stream* pStream;
|
||||
|
||||
|
@ -43,10 +43,7 @@ struct Registry_Api
|
||||
RegError (REGISTRY_CALLTYPE *openRegistry) (rtl_uString*, RegHandle*, RegAccessMode);
|
||||
RegError (REGISTRY_CALLTYPE *closeRegistry) (RegHandle);
|
||||
RegError (REGISTRY_CALLTYPE *destroyRegistry) (RegHandle, rtl_uString*);
|
||||
RegError (REGISTRY_CALLTYPE *loadKey) (RegHandle, RegKeyHandle, rtl_uString*, rtl_uString*);
|
||||
RegError (REGISTRY_CALLTYPE *saveKey) (RegHandle, RegKeyHandle, rtl_uString*, rtl_uString*);
|
||||
RegError (REGISTRY_CALLTYPE *mergeKey) (RegHandle, RegKeyHandle, rtl_uString*, rtl_uString*, sal_Bool, sal_Bool);
|
||||
RegError (REGISTRY_CALLTYPE *dumpRegistry) (RegHandle, RegKeyHandle);
|
||||
void (REGISTRY_CALLTYPE *acquireKey) (RegKeyHandle);
|
||||
void (REGISTRY_CALLTYPE *releaseKey) (RegKeyHandle);
|
||||
sal_Bool (REGISTRY_CALLTYPE *isKeyReadOnly) (RegKeyHandle);
|
||||
|
@ -60,7 +60,6 @@ void Deflater::init (sal_Int32 nLevelArg, sal_Int32 nStrategyArg, bool bNowrap)
|
||||
Deflater::Deflater(sal_Int32 nSetLevel, bool bNowrap)
|
||||
: bFinish(false)
|
||||
, bFinished(false)
|
||||
, nStrategy(DEFAULT_STRATEGY)
|
||||
, nOffset(0)
|
||||
, nLength(0)
|
||||
{
|
||||
|
@ -236,97 +236,6 @@ static RegError REGISTRY_CALLTYPE destroyRegistry(RegHandle hReg,
|
||||
|
||||
|
||||
|
||||
// loadRegKey
|
||||
|
||||
static RegError REGISTRY_CALLTYPE loadKey(RegHandle hReg,
|
||||
RegKeyHandle hKey,
|
||||
rtl_uString* keyName,
|
||||
rtl_uString* regFileName)
|
||||
{
|
||||
|
||||
ORegistry* pReg = static_cast< ORegistry* >(hReg);
|
||||
if (!pReg)
|
||||
return RegError::INVALID_REGISTRY;
|
||||
|
||||
if (!pReg->isOpen())
|
||||
return RegError::REGISTRY_NOT_OPEN;
|
||||
|
||||
ORegKey* pKey = static_cast< ORegKey* >(hKey);
|
||||
if (!pKey)
|
||||
return RegError::INVALID_KEY;
|
||||
|
||||
if (pKey->getRegistry() != pReg)
|
||||
return RegError::INVALID_KEY;
|
||||
if (pKey->isDeleted())
|
||||
return RegError::INVALID_KEY;
|
||||
if (pKey->isReadOnly())
|
||||
return RegError::REGISTRY_READONLY;
|
||||
|
||||
|
||||
ORegKey* pNewKey = nullptr;
|
||||
RegError _ret = pKey->openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pNewKey));
|
||||
if (_ret == RegError::NO_ERROR)
|
||||
{
|
||||
pKey->releaseKey(pNewKey);
|
||||
pKey->deleteKey(keyName);
|
||||
}
|
||||
|
||||
_ret = pKey->createKey(keyName, reinterpret_cast<RegKeyHandle*>(&pNewKey));
|
||||
if (_ret != RegError::NO_ERROR)
|
||||
return _ret;
|
||||
|
||||
_ret = pReg->loadKey(pNewKey, regFileName);
|
||||
if (_ret != RegError::NO_ERROR)
|
||||
{
|
||||
pKey->releaseKey(pNewKey);
|
||||
pKey->deleteKey(keyName);
|
||||
return _ret;
|
||||
}
|
||||
|
||||
return pKey->closeKey(pNewKey);
|
||||
}
|
||||
|
||||
|
||||
// saveKey
|
||||
|
||||
static RegError REGISTRY_CALLTYPE saveKey(RegHandle hReg,
|
||||
RegKeyHandle hKey,
|
||||
rtl_uString* keyName,
|
||||
rtl_uString* regFileName)
|
||||
{
|
||||
|
||||
ORegistry* pReg = static_cast< ORegistry* >(hReg);
|
||||
if (!pReg)
|
||||
return RegError::INVALID_REGISTRY;
|
||||
|
||||
if (!pReg->isOpen())
|
||||
return RegError::REGISTRY_NOT_OPEN;
|
||||
|
||||
ORegKey* pKey = static_cast< ORegKey* >(hKey);
|
||||
if (!pKey)
|
||||
return RegError::INVALID_KEY;
|
||||
|
||||
if (pKey->getRegistry() != pReg)
|
||||
return RegError::INVALID_KEY;
|
||||
if (pKey->isDeleted())
|
||||
return RegError::INVALID_KEY;
|
||||
|
||||
ORegKey* pNewKey = nullptr;
|
||||
RegError _ret = pKey->openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pNewKey));
|
||||
if (_ret != RegError::NO_ERROR)
|
||||
return _ret;
|
||||
|
||||
_ret = pReg->saveKey(pNewKey, regFileName);
|
||||
if (_ret != RegError::NO_ERROR)
|
||||
{
|
||||
(void) pKey->releaseKey(pNewKey);
|
||||
return _ret;
|
||||
}
|
||||
|
||||
return pKey->releaseKey(pNewKey);
|
||||
}
|
||||
|
||||
|
||||
// mergeKey
|
||||
|
||||
static RegError REGISTRY_CALLTYPE mergeKey(RegHandle hReg,
|
||||
@ -412,10 +321,7 @@ Registry_Api* REGISTRY_CALLTYPE initRegistry_Api()
|
||||
&openRegistry,
|
||||
&closeRegistry,
|
||||
&destroyRegistry,
|
||||
&loadKey,
|
||||
&saveKey,
|
||||
&mergeKey,
|
||||
&dumpRegistry,
|
||||
&acquireKey,
|
||||
&releaseKey,
|
||||
&isKeyReadOnly,
|
||||
|
Loading…
x
Reference in New Issue
Block a user