Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[62971] firebird/trunk
|
From: <asf...@us...> - 2016-02-15 02:53:26
|
Revision: 62971
http://sourceforge.net/p/firebird/code/62971
Author: asfernandes
Date: 2016-02-15 02:53:24 +0000 (Mon, 15 Feb 2016)
Log Message:
-----------
Misc.
Modified Paths:
--------------
firebird/trunk/builds/install/arch-specific/win32/installation_readme.txt
firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp
firebird/trunk/examples/dbcrypt/DbCrypt.cpp
firebird/trunk/src/dsql/parse.y
firebird/trunk/src/jrd/CryptoManager.cpp
firebird/trunk/src/jrd/cch.cpp
firebird/trunk/src/jrd/extds/InternalDS.cpp
firebird/trunk/src/jrd/extds/IscDS.cpp
firebird/trunk/src/jrd/nbak.cpp
firebird/trunk/src/jrd/sdw.cpp
firebird/trunk/src/jrd/vio.cpp
Modified: firebird/trunk/builds/install/arch-specific/win32/installation_readme.txt
===================================================================
--- firebird/trunk/builds/install/arch-specific/win32/installation_readme.txt 2016-02-15 02:53:05 UTC (rev 62970)
+++ firebird/trunk/builds/install/arch-specific/win32/installation_readme.txt 2016-02-15 02:53:24 UTC (rev 62971)
@@ -111,7 +111,7 @@
o Libraries deployed by instclient may fail to load if
the MS runtime libraries have not been installed.
This may be a problem if installing on older Windows
- platforms.
+ platforms.
Uninstallation
Modified: firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp
===================================================================
--- firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp 2016-02-15 02:53:05 UTC (rev 62970)
+++ firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp 2016-02-15 02:53:24 UTC (rev 62971)
@@ -164,7 +164,7 @@
class NamedCallback : public ICryptKeyCallbackImpl<NamedCallback, CheckStatusWrapper>
{
public:
- NamedCallback(NamedCallback *n, const char* nm, UCHAR k)
+ NamedCallback(NamedCallback* n, const char* nm, UCHAR k)
: next(n), key(k)
{
strncpy(name, nm, sizeof(name));
Modified: firebird/trunk/examples/dbcrypt/DbCrypt.cpp
===================================================================
--- firebird/trunk/examples/dbcrypt/DbCrypt.cpp 2016-02-15 02:53:05 UTC (rev 62970)
+++ firebird/trunk/examples/dbcrypt/DbCrypt.cpp 2016-02-15 02:53:24 UTC (rev 62971)
@@ -154,7 +154,7 @@
vector[0] = isc_arg_gds;
vector[1] = isc_random;
vector[2] = isc_arg_string;
- vector[3] = (ISC_STATUS)msg;
+ vector[3] = (ISC_STATUS) msg;
vector[4] = isc_arg_end;
status->setErrors(vector);
}
@@ -205,7 +205,7 @@
if (key != 0)
return;
- strncpy(savedKeyName, keyName ? keyName : "", sizeof(savedKeyName));
+ strncpy(savedKeyName, (keyName ? keyName : ""), sizeof(savedKeyName));
savedKeyName[sizeof(savedKeyName) - 1] = 0;
IConfig* def = config->getDefaultConfig(status);
Modified: firebird/trunk/src/dsql/parse.y
===================================================================
--- firebird/trunk/src/dsql/parse.y 2016-02-15 02:53:05 UTC (rev 62970)
+++ firebird/trunk/src/dsql/parse.y 2016-02-15 02:53:24 UTC (rev 62971)
@@ -3480,7 +3480,7 @@
{ $$ = Nullable<bool>::val(true); }
| INACTIVE
{ $$ = Nullable<bool>::val(false); }
- |
+ | // nothing
{ $$ = Nullable<bool>::empty(); }
;
@@ -3976,9 +3976,8 @@
%type crypt_key_clause(<alterDatabaseNode>)
crypt_key_clause($alterDatabaseNode)
- : /* nothing */
- | KEY valid_symbol_name
- { $alterDatabaseNode->keyName = *$2; }
+ : // nothing
+ | KEY valid_symbol_name { $alterDatabaseNode->keyName = *$2; }
;
// ALTER TRIGGER
Modified: firebird/trunk/src/jrd/CryptoManager.cpp
===================================================================
--- firebird/trunk/src/jrd/CryptoManager.cpp 2016-02-15 02:53:05 UTC (rev 62970)
+++ firebird/trunk/src/jrd/CryptoManager.cpp 2016-02-15 02:53:24 UTC (rev 62971)
@@ -416,7 +416,7 @@
if (sv->getState() & IStatus::STATE_ERRORS)
Arg::StatusVector(&sv).raise();
- // calculate it's hash
+ // calculate its hash
const string verifier(result, sizeof(result));
Sha1::hashBased64(valid, verifier);
}
Modified: firebird/trunk/src/jrd/cch.cpp
===================================================================
--- firebird/trunk/src/jrd/cch.cpp 2016-02-15 02:53:05 UTC (rev 62970)
+++ firebird/trunk/src/jrd/cch.cpp 2016-02-15 02:53:24 UTC (rev 62971)
@@ -4892,7 +4892,7 @@
bool callback(thread_db* tdbb, FbStatusVector* status, Ods::pag* page)
{
- Database *dbb = tdbb->getDatabase();
+ Database* dbb = tdbb->getDatabase();
while (!PIO_write(tdbb, file, bdb, page, status))
{
@@ -4925,7 +4925,7 @@
Pio io(pageSpace->file, bdb, inAst, isTempPage, pageSpace);
result = dbb->dbb_crypto_manager->write(tdbb, status, page, &io);
- if ((!result) && (bdb->bdb_flags & BDB_io_error))
+ if (!result && (bdb->bdb_flags & BDB_io_error))
{
return false;
}
Modified: firebird/trunk/src/jrd/extds/InternalDS.cpp
===================================================================
--- firebird/trunk/src/jrd/extds/InternalDS.cpp 2016-02-15 02:53:05 UTC (rev 62970)
+++ firebird/trunk/src/jrd/extds/InternalDS.cpp 2016-02-15 02:53:24 UTC (rev 62971)
@@ -160,7 +160,7 @@
m_dbName = dbb->dbb_database_name.c_str();
generateDPB(tdbb, m_dpb, user, pwd, role);
- // Avoid change of m_dpb by validatePassword() below
+ // Avoid change of m_dpb by validatePassword() below
ClumpletWriter newDpb(m_dpb);
validatePassword(tdbb, m_dbName, newDpb);
Modified: firebird/trunk/src/jrd/extds/IscDS.cpp
===================================================================
--- firebird/trunk/src/jrd/extds/IscDS.cpp 2016-02-15 02:53:05 UTC (rev 62970)
+++ firebird/trunk/src/jrd/extds/IscDS.cpp 2016-02-15 02:53:24 UTC (rev 62971)
@@ -117,7 +117,7 @@
m_dbName = dbName;
generateDPB(tdbb, m_dpb, user, pwd, role);
- // Avoid change of m_dpb by validatePassword() below
+ // Avoid change of m_dpb by validatePassword() below
ClumpletWriter newDpb(m_dpb);
validatePassword(tdbb, m_dbName, newDpb);
Modified: firebird/trunk/src/jrd/nbak.cpp
===================================================================
--- firebird/trunk/src/jrd/nbak.cpp 2016-02-15 02:53:05 UTC (rev 62970)
+++ firebird/trunk/src/jrd/nbak.cpp 2016-02-15 02:53:24 UTC (rev 62971)
@@ -822,10 +822,12 @@
{
return PIO_write(tdbb, file, bdb, page, sv);
}
+
private:
jrd_file* file;
BufferDesc* bdb;
};
+
Pio io(diff_file, &temp_bdb);
if (!database->dbb_crypto_manager->write(tdbb, status, page, &io))
@@ -850,10 +852,12 @@
{
return PIO_read(tdbb, file, bdb, page, sv);
}
+
private:
jrd_file* file;
BufferDesc* bdb;
};
+
Pio io(diff_file, &temp_bdb);
if (!database->dbb_crypto_manager->read(tdbb, tdbb->tdbb_status_vector, page, &io))
Modified: firebird/trunk/src/jrd/sdw.cpp
===================================================================
--- firebird/trunk/src/jrd/sdw.cpp 2016-02-15 02:53:05 UTC (rev 62970)
+++ firebird/trunk/src/jrd/sdw.cpp 2016-02-15 02:53:24 UTC (rev 62971)
@@ -514,10 +514,11 @@
Shadow* shadow;
BufferDesc* bdb;
};
+
Pio cryptIo(shadow, window.win_bdb);
if (!dbb->dbb_crypto_manager->write(tdbb, tdbb->tdbb_status_vector,
- window.win_bdb->bdb_buffer, &cryptIo))
+ window.win_bdb->bdb_buffer, &cryptIo))
{
CCH_RELEASE(tdbb, &window);
ERR_punt();
Modified: firebird/trunk/src/jrd/vio.cpp
===================================================================
--- firebird/trunk/src/jrd/vio.cpp 2016-02-15 02:53:05 UTC (rev 62970)
+++ firebird/trunk/src/jrd/vio.cpp 2016-02-15 02:53:24 UTC (rev 62971)
@@ -2266,7 +2266,7 @@
case tra_committed:
return !(rpb->rpb_flags & rpb_deleted);
case tra_dead:
- // Run backout else false key violation could be reported, see CORE-5110
+ // Run backout otherwise false key violation could be reported, see CORE-5110
//
// if (transaction->tra_attachment->att_flags & ATT_no_cleanup)
// return !foreign_key;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
