firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 22:43:03 +01:00
Code Issues

Misc

Browse Source
This commit is contained in:
Dmitry Yemanov 2025-01-19 21:36:22 +03:00
parent 93819f233c
commit 963d71ae57
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/jrd/CryptoManager.cpp
View File

@ -54,10 +54,11 @@
using namespace Firebird;
namespace {
namespace
{
THREAD_ENTRY_DECLARE cryptThreadStatic(THREAD_ENTRY_PARAM p)
{
Jrd::CryptoManager* cryptoManager = (Jrd::CryptoManager*) p;
const auto cryptoManager = (Jrd::CryptoManager*) p;
cryptoManager->cryptThread();
return 0;
@ -68,12 +69,12 @@ namespace {
const UCHAR CRYPT_CHANGE = LCK_PW;
const UCHAR CRYPT_INIT = LCK_EX;
const int MAX_PLUGIN_NAME_LEN = 31;
constexpr int MAX_PLUGIN_NAME_LEN = sizeof(Ods::header_page::hdr_crypt_plugin) - 1;
}
namespace Jrd {
namespace Jrd
{
class Header
{
protected:
@ -625,9 +626,9 @@ namespace Jrd {
void CryptoManager::changeCryptState(thread_db* tdbb, const string& plugName)
{
if (plugName.length() > 31)
if (plugName.length() > MAX_PLUGIN_NAME_LEN)
{
(Arg::Gds(isc_cp_name_too_long) << Arg::Num(31)).raise();
(Arg::Gds(isc_cp_name_too_long) << Arg::Num(MAX_PLUGIN_NAME_LEN)).raise();
}
const bool newCryptState = plugName.hasData();
@ -656,8 +657,8 @@ namespace Jrd {
// Nbak's lock was taken in prepareChangeCryptState()
// If it was invalidated it's enough reason not to continue now
int bak_state = dbb.dbb_backup_manager->getState();
if (bak_state != Ods::hdr_nbak_normal)
auto backupState = dbb.dbb_backup_manager->getState();
if (backupState != Ods::hdr_nbak_normal)
{
(Arg::Gds(isc_wish_list) << Arg::Gds(isc_random) <<
"Cannot crypt: please wait for nbackup completion").raise();
@ -669,7 +670,7 @@ namespace Jrd {
(Arg::Gds(isc_cp_process_active)).raise();
}
bool headerCryptState = hdr->hdr_flags & Ods::hdr_encrypted;
const bool headerCryptState = hdr->hdr_flags & Ods::hdr_encrypted;
if (headerCryptState == newCryptState)
{
(Arg::Gds(isc_cp_already_crypted)).raise();