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

Misc.

Browse Source
This commit is contained in:
robocop 2009-06-08 12:15:19 +00:00
parent a6b886f0e1
commit b4a695a031
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jrd/blb.cpp
View File

@ -1927,7 +1927,7 @@ static ISC_STATUS blob_filter(USHORT action,
thread_db* tdbb = JRD_get_thread_data(); thread_db* tdbb = JRD_get_thread_data();
jrd_tra* const transaction = (jrd_tra*) control->ctl_internal[1]; jrd_tra* const transaction = reinterpret_cast<jrd_tra*>(control->ctl_internal[1]);
bid* blob_id = reinterpret_cast<bid*>(control->ctl_internal[2]); bid* blob_id = reinterpret_cast<bid*>(control->ctl_internal[2]);
#ifdef DEV_BUILD #ifdef DEV_BUILD

2
src/jrd/pag.cpp
View File

@ -1354,8 +1354,8 @@ void PAG_header_init(thread_db* tdbb)
SCHAR temp_buffer[2 * MIN_PAGE_SIZE]; SCHAR temp_buffer[2 * MIN_PAGE_SIZE];
SCHAR* temp_page = (SCHAR *) FB_ALIGN((IPTR) temp_buffer, MIN_PAGE_SIZE); SCHAR* temp_page = (SCHAR *) FB_ALIGN((IPTR) temp_buffer, MIN_PAGE_SIZE);
header_page* header = (header_page*) temp_page;
PIO_header(dbb, temp_page, MIN_PAGE_SIZE); PIO_header(dbb, temp_page, MIN_PAGE_SIZE);
const header_page* header = (header_page*) temp_page;
if (header->hdr_header.pag_type != pag_header || header->hdr_sequence) { if (header->hdr_header.pag_type != pag_header || header->hdr_sequence) {
ERR_post(Arg::Gds(isc_bad_db_format) << Arg::Str(attachment->att_filename)); ERR_post(Arg::Gds(isc_bad_db_format) << Arg::Str(attachment->att_filename));

5
src/jrd/sdw.cpp
View File

@ -994,8 +994,9 @@ void SDW_start(thread_db* tdbb, const TEXT* file_name,
still around, then there is a possibility for shadow corruption */ still around, then there is a possibility for shadow corruption */
const int string_length = (USHORT) *p++; const int string_length = (USHORT) *p++;
if (strncmp(dbb_file->fil_string, reinterpret_cast<const char*>(p), string_length) && const char* fname = reinterpret_cast<const char*>(p);
check_for_file(tdbb, reinterpret_cast<const char*>(p), string_length)) if (strncmp(dbb_file->fil_string, fname, string_length) &&
check_for_file(tdbb, fname, string_length))
{ {
ERR_punt(); ERR_punt();
} }

2
src/utilities/ntrace/TracePluginImpl.cpp
View File

@ -736,7 +736,7 @@ void TracePluginImpl::appendServiceQueryParams(size_t send_item_length,
string send_query; string send_query;
string recv_query; string recv_query;
USHORT l; USHORT l;
SCHAR item; UCHAR item;
//USHORT timeout = 0; // Unused //USHORT timeout = 0; // Unused
const UCHAR* items = send_items; const UCHAR* items = send_items;