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

Misc.

Browse Source
This commit is contained in:
robocop 2009-09-03 11:17:46 +00:00
parent 849f5b1f93
commit 98a5f2e6a4
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jrd/blb.cpp
View File

@ -1347,7 +1347,7 @@ blb* BLB_open2(thread_db* tdbb,
if (try_relations)
{
// Ordinarily, we would call MET_relation to get the relation id.
// However, since the blob id must be consider suspect, this is
// However, since the blob id must be considered suspect, this is
// not a good idea. On the other hand, if we don't already
// know about the relation, the blob id has got to be invalid
// anyway.

4
src/jrd/extds/InternalDS.cpp
View File

@ -210,8 +210,8 @@ bool InternalConnection::isSameDatabase(thread_db* tdbb, const Firebird::string&
{
if (m_isCurrent)
return (tdbb->getAttachment() == m_attachment);
else
return Connection::isSameDatabase(tdbb, dbName, user, pwd, role);
return Connection::isSameDatabase(tdbb, dbName, user, pwd, role);
}
Transaction* InternalConnection::doCreateTransaction()

2
src/jrd/isc_sync.cpp
View File

@ -3951,7 +3951,7 @@ static bool make_object_name(TEXT* buffer, size_t bufsize,
**************************************/
char hostname[64];
const int rc = snprintf(buffer, bufsize, object_name, ISC_get_host(hostname, sizeof(hostname)));
if (rc == bufsize || rc <= 0)
if (size_t(rc) == bufsize || rc <= 0)
{
SetLastError(ERROR_FILENAME_EXCED_RANGE);
return false;

3
src/jrd/trace/TraceConfigStorage.cpp
View File

@ -415,13 +415,12 @@ void ConfigStorage::removeSession(ULONG id)
if (!getItemLength(tag, len))
return;
bool err;
if (tag == tagID)
{
ULONG currID;
fb_assert(len == sizeof(currID));
err = (::read(m_cfg_file, &currID, len) != len);
bool err = (::read(m_cfg_file, &currID, len) != len);
if (!err && currID == id)
{
setDirty();