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

Misc

Browse Source
This commit is contained in:
asfernandes 2009-02-09 01:43:49 +00:00
parent 5cf26605eb
commit 628eb5b557
6 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jrd/fun.epp
View File

@ -81,7 +81,7 @@ namespace
#ifdef WIN_NT
libUtilPath.assign("ib_util");
#else
PathName id(Config::getInstallDirectory());
PathName id(Config::getInstallDirectory());
PathUtils::concatPath(libUtilPath, id, "lib/libib_util");
#endif // WIN_NT

4
src/jrd/opt.cpp
View File

@ -2296,7 +2296,7 @@ static bool dump_index(const jrd_nod* node, SCHAR** buffer_ptr, SSHORT* buffer_l
const char* namePtr = index_name.c_str();
const CHARSET_ID charset = tdbb->getAttachment()->att_charset;
if (charset!= CS_METADATA && charset != CS_NONE)
if (charset != CS_METADATA && charset != CS_NONE)
{
namePtr = (const char*) nameBuffer.getBuffer(DataTypeUtil(tdbb).convertLength(
MAX_SQL_IDENTIFIER_LEN, CS_METADATA, charset));
@ -5787,6 +5787,7 @@ static RecordSource* gen_union(thread_db* tdbb,
mark_rsb_recursive(rsb);
}
return rsb;
}
@ -6807,6 +6808,7 @@ static void mark_rsb_recursive(RecordSource* rsb)
while (true)
{
rsb->rsb_flags |= rsb_recursive;
switch (rsb->rsb_type)
{
case rsb_indexed:

8
src/jrd/rse.cpp
View File

@ -244,7 +244,7 @@ void RSE_close(thread_db* tdbb, RecordSource* rsb)
break;
case rsb_recursive_union:
RSBRecurse::close(tdbb, rsb, (irsb_recurse*)impure);
RSBRecurse::close(tdbb, rsb, (irsb_recurse*) impure);
return;
case rsb_ext_sequential:
@ -522,7 +522,7 @@ void RSE_open(thread_db* tdbb, RecordSource* rsb)
break;
case rsb_recursive_union:
RSBRecurse::open(tdbb, rsb, (irsb_recurse*)impure);
RSBRecurse::open(tdbb, rsb, (irsb_recurse*) impure);
return;
case rsb_aggregate:
@ -2364,7 +2364,7 @@ static bool get_record(thread_db* tdbb,
break;
case rsb_recursive_union:
if (!RSBRecurse::get(tdbb, rsb, (irsb_recurse*)impure))
if (!RSBRecurse::get(tdbb, rsb, (irsb_recurse*) impure))
return false;
break;
@ -3405,7 +3405,7 @@ static void restore_record(record_param* rpb)
{
// hvlad: saved copy of record have longer format, reallocate
// given record to make enough space for saved data
thread_db *tdbb = JRD_get_thread_data();
thread_db* tdbb = JRD_get_thread_data();
record = VIO_record(tdbb, rpb, rec_copy->rec_format, tdbb->getDefaultPool());
}
else

2
src/jrd/svc.cpp
View File

@ -693,7 +693,7 @@ Service::Service(const TEXT* service_name, USHORT spb_length, const UCHAR* spb_d
svc_username(getPool()), svc_enc_password(getPool()),
svc_trusted_login(getPool()), svc_trusted_role(false), svc_uses_security_database(false),
svc_switches(getPool()), svc_perm_sw(getPool()), svc_address_path(getPool()),
svc_network_protocol(getPool()), svc_remote_address(getPool()), svc_remote_process(getPool()),
svc_network_protocol(getPool()), svc_remote_address(getPool()), svc_remote_process(getPool()),
svc_remote_pid(0), svc_strings_buffer(NULL)
{
svc_trace_manager = NULL;

3
src/utilities/fbsvcmgr.cpp
View File

@ -133,7 +133,8 @@ bool putFileFromArgument(char**& av, ClumpletWriter& spb, unsigned int tag)
fseek(file, 0, SEEK_END);
const long len = ftell(file);
if (!len) {
if (len == 0) {
fclose(file);
(Arg::Gds(isc_fbsvcmgr_fp_empty) << *av).raise();
}

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

@ -1243,12 +1243,12 @@ void TracePluginImpl::log_event_proc_execute(TraceConnection* connection, TraceT
return;
// Do not log operation if it is below time threshold
const PerformanceInfo *info = started ? NULL : procedure->getPerf();
const PerformanceInfo* info = started ? NULL : procedure->getPerf();
if (config.time_threshold && info && info->pin_time < config.time_threshold)
return;
string line;
TraceParams *params = procedure->getInputs();
TraceParams* params = procedure->getInputs();
if (params && params->getCount())
{
appendParams(params, line);
@ -1283,7 +1283,7 @@ void TracePluginImpl::log_event_proc_execute(TraceConnection* connection, TraceT
"UNAUTHORIZED EXECUTE_PROCEDURE_FINISH";
break;
default:
event_type = "Unknown at executing procedure";
event_type = "Unknown event at executing procedure";
break;
}
@ -1450,7 +1450,7 @@ void TracePluginImpl::log_event_dsql_execute(TraceConnection* connection,
return;
// Do not log operation if it is below time threshold
const PerformanceInfo *info = started ? NULL : statement->getPerf();
const PerformanceInfo* info = started ? NULL : statement->getPerf();
if (config.time_threshold && info && info->pin_time < config.time_threshold)
return;
@ -1870,7 +1870,7 @@ void TracePluginImpl::log_event_trigger_execute(TraceConnection* connection, Tra
return;
// Do not log operation if it is below time threshold
const PerformanceInfo *info = started ? NULL : trigger->getPerf();
const PerformanceInfo* info = started ? NULL : trigger->getPerf();
if (config.time_threshold && info && info->pin_time < config.time_threshold)
return;