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

Misc

Browse Source
This commit is contained in:
asfernandes 2009-06-20 18:46:59 +00:00
parent 4e8915efda
commit 26c1892310
8 changed files with 29 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/jrd/sqz.cpp
View File

@ -103,6 +103,7 @@ USHORT SQZ_compress(const DataComprControl* dcc, const SCHAR* input, SCHAR* outp
const SCHAR* control = dcc->begin(); const SCHAR* control = dcc->begin();
const SCHAR* dcc_end = dcc->end(); const SCHAR* dcc_end = dcc->end();
while (control < dcc_end) while (control < dcc_end)
{ {
if (--space <= 0) if (--space <= 0)
@ -143,7 +144,7 @@ USHORT SQZ_compress(const DataComprControl* dcc, const SCHAR* input, SCHAR* outp
} }
} }
BUGCHECK(178); /* msg 178 record length inconsistent */ BUGCHECK(178); // msg 178 record length inconsistent
return input - start; // shut up compiler warning return input - start; // shut up compiler warning
} }
@ -167,6 +168,7 @@ USHORT SQZ_compress_length(const DataComprControl* dcc, const SCHAR* input, int
const SCHAR* control = dcc->begin(); const SCHAR* control = dcc->begin();
const SCHAR* dcc_end = dcc->end(); const SCHAR* dcc_end = dcc->end();
while (control < dcc_end) while (control < dcc_end)
{ {
if (--space <= 0) if (--space <= 0)
@ -189,7 +191,7 @@ USHORT SQZ_compress_length(const DataComprControl* dcc, const SCHAR* input, int
} }
} }
BUGCHECK(178); /* msg 178 record length inconsistent */ BUGCHECK(178); // msg 178 record length inconsistent
return input - start; // shut up compiler warning return input - start; // shut up compiler warning
} }
@ -392,6 +394,7 @@ void SQZ_fast(const DataComprControl* dcc, const SCHAR* input, SCHAR* output)
**************************************/ **************************************/
const SCHAR* control = dcc->begin(); const SCHAR* control = dcc->begin();
const SCHAR* dcc_end = dcc->end(); const SCHAR* dcc_end = dcc->end();
while (control < dcc_end) while (control < dcc_end)
{ {
const SSHORT length = *control++; const SSHORT length = *control++;
@ -491,4 +494,3 @@ USHORT SQZ_length(const SCHAR* data, int length, DataComprControl* dcc)
return length; return length;
} }

37
src/jrd/svc.cpp
View File

@ -1038,12 +1038,10 @@ ISC_STATUS Service::query2(thread_db* tdbb,
put(items - 3, l + 3); put(items - 3, l + 3);
break; break;
case isc_info_svc_timeout: case isc_info_svc_timeout:
timeout = timeout = (USHORT) gds__vax_integer(items, l);
(USHORT) gds__vax_integer(items, l);
break; break;
case isc_info_svc_version: case isc_info_svc_version:
version = version = (USHORT) gds__vax_integer(items, l);
(USHORT) gds__vax_integer(items, l);
break; break;
} }
} }
@ -1067,7 +1065,7 @@ ISC_STATUS Service::query2(thread_db* tdbb,
items++; items++;
} }
else { else {
start_info = 0; start_info = NULL;
} }
while (items < end_items2 && *items != isc_info_end) while (items < end_items2 && *items != isc_info_end)
@ -1295,7 +1293,6 @@ ISC_STATUS Service::query2(thread_db* tdbb,
} // scope } // scope
break; break;
case isc_info_svc_user_dbpath: case isc_info_svc_user_dbpath:
if (svc_user_flag & SVC_user_dba) if (svc_user_flag & SVC_user_dba)
{ {
@ -1348,9 +1345,7 @@ ISC_STATUS Service::query2(thread_db* tdbb,
case isc_info_svc_response_more: case isc_info_svc_response_more:
if ( (l = length = svc_resp_len) ) if ( (l = length = svc_resp_len) )
length = MIN(end - (info + 5), l); length = MIN(end - (info + 5), l);
if (! if (!(info = INF_put_item(item, length, svc_resp_ptr, info, end)))
(info =
INF_put_item(item, length, svc_resp_ptr, info, end)))
{ {
return 0; return 0;
} }
@ -1446,10 +1441,8 @@ ISC_STATUS Service::query2(thread_db* tdbb,
if (svc_trace_manager->needs().event_service_query) if (svc_trace_manager->needs().event_service_query)
{ {
TraceServiceImpl service(this); TraceServiceImpl service(this);
svc_trace_manager->event_service_query(&service, svc_trace_manager->event_service_query(&service, send_item_length, send_items,
send_item_length, send_items, recv_item_length, recv_items, res_successful);
recv_item_length, recv_items,
res_successful);
} }
} // try } // try
@ -1464,10 +1457,8 @@ ISC_STATUS Service::query2(thread_db* tdbb,
exc == isc_insufficient_svc_privileges); exc == isc_insufficient_svc_privileges);
TraceServiceImpl service(this); TraceServiceImpl service(this);
svc_trace_manager->event_service_query(&service, svc_trace_manager->event_service_query(&service, send_item_length, send_items,
send_item_length, send_items, recv_item_length, recv_items, (no_priv ? res_unauthorized : res_failed));
recv_item_length, recv_items,
no_priv ? res_unauthorized : res_failed);
} }
throw; throw;
} }
@ -1851,10 +1842,8 @@ void Service::query(USHORT send_item_length,
// Report to Trace API that query failed // Report to Trace API that query failed
TraceServiceImpl service(this); TraceServiceImpl service(this);
svc_trace_manager->event_service_query(&service, svc_trace_manager->event_service_query(&service, send_item_length, send_items,
send_item_length, send_items, recv_item_length, recv_items, (no_priv ? res_unauthorized : res_failed));
recv_item_length, recv_items,
no_priv ? res_unauthorized : res_failed);
} }
throw; throw;
} }
@ -1865,10 +1854,8 @@ void Service::query(USHORT send_item_length,
svc_trace_manager->needs().event_service_query) svc_trace_manager->needs().event_service_query)
{ {
TraceServiceImpl service(this); TraceServiceImpl service(this);
svc_trace_manager->event_service_query(&service, svc_trace_manager->event_service_query(&service, send_item_length, send_items,
send_item_length, send_items, recv_item_length, recv_items, res_successful);
recv_item_length, recv_items,
res_successful);
} }
finish(SVC_finished); finish(SVC_finished);

2
src/jrd/vio.cpp
View File

@ -3974,6 +3974,7 @@ static THREAD_ENTRY_DECLARE garbage_collector(THREAD_ENTRY_PARAM arg)
rpb.rpb_relation = relation; rpb.rpb_relation = relation;
if (relation->rel_gc_bitmap) if (relation->rel_gc_bitmap)
{
while (relation->rel_gc_bitmap->getFirst()) while (relation->rel_gc_bitmap->getFirst())
{ {
const ULONG dp_sequence = relation->rel_gc_bitmap->current(); const ULONG dp_sequence = relation->rel_gc_bitmap->current();
@ -4030,6 +4031,7 @@ static THREAD_ENTRY_DECLARE garbage_collector(THREAD_ENTRY_PARAM arg)
} }
} }
} }
}
rel_exit: rel_exit:
if (relation->rel_gc_bitmap) if (relation->rel_gc_bitmap)

2
src/msgs/messages2.sql
View File

@ -764,7 +764,7 @@ Data source : @4', NULL, NULL)
-- More extras for isc_expression_eval_err -- More extras for isc_expression_eval_err
('sysf_argmustbe_nonzero', 'evlStdMath', 'SysFunction.cpp', NULL, 0, 656, NULL, 'Argument for @1 must be different than zero', NULL, NULL); ('sysf_argmustbe_nonzero', 'evlStdMath', 'SysFunction.cpp', NULL, 0, 656, NULL, 'Argument for @1 must be different than zero', NULL, NULL);
('sysf_argmustbe_range_inc1_1', 'evlStdMath', 'SysFunction.cpp', NULL, 0, 657, NULL, 'Argument for @1 must be in the range [-1, 1]', NULL, NULL); ('sysf_argmustbe_range_inc1_1', 'evlStdMath', 'SysFunction.cpp', NULL, 0, 657, NULL, 'Argument for @1 must be in the range [-1, 1]', NULL, NULL);
('sysf_argmustbe_gteq_one', 'evlStdMath', 'SysFunction.cpp', NULL, 0, 658, NULL, 'Argument for @1 must be greater o equal than one', NULL, NULL); ('sysf_argmustbe_gteq_one', 'evlStdMath', 'SysFunction.cpp', NULL, 0, 658, NULL, 'Argument for @1 must be greater or equal than one', NULL, NULL);
('sysf_argmustbe_range_exc1_1', 'evlStdMath', 'SysFunction.cpp', NULL, 0, 659, NULL, 'Argument for @1 must be in the range ]-1, 1[', NULL, NULL); ('sysf_argmustbe_range_exc1_1', 'evlStdMath', 'SysFunction.cpp', NULL, 0, 659, NULL, 'Argument for @1 must be in the range ]-1, 1[', NULL, NULL);
-- End of extras for isc_expression_eval_err -- End of extras for isc_expression_eval_err
-- QLI -- QLI

4
src/remote/server.cpp
View File

@ -263,8 +263,6 @@ static THREAD_ENTRY_DECLARE loopThread(THREAD_ENTRY_PARAM);
static void zap_packet(PACKET*, bool); static void zap_packet(PACKET*, bool);
inline bool bad_db(ISC_STATUS* status_vector, Rdb* rdb) inline bool bad_db(ISC_STATUS* status_vector, Rdb* rdb)
{ {
return bad_port_context(status_vector, rdb, isc_bad_db_handle); return bad_port_context(status_vector, rdb, isc_bad_db_handle);
@ -332,7 +330,7 @@ static server_req_t* free_requests = NULL;
static server_req_t* active_requests = NULL; static server_req_t* active_requests = NULL;
static Firebird::GlobalPtr<Firebird::Mutex> servers_mutex; static Firebird::GlobalPtr<Firebird::Mutex> servers_mutex;
static srvr* servers; static srvr* servers = NULL;
static Firebird::AtomicCounter cntServers; static Firebird::AtomicCounter cntServers;
static bool server_shutdown = false; static bool server_shutdown = false;