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

More unused params.

Browse Source
This commit is contained in:
robocop 2009-04-28 13:48:18 +00:00
parent f5cbe45afb
commit 4490f77b06
6 changed files with 37 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/dsql/ddl.cpp
View File

@ -3722,26 +3722,26 @@ static void define_view(CompiledStatement* statement, NOD_TYPE op)
field_node->nod_type == nod_derived_field ||
field_node->nod_type == nod_map)
{
if (field_node->nod_type == nod_alias)
switch (field_node->nod_type)
{
case nod_alias:
if (!alias_name)
{
alias_name = (dsql_str*) field_node->nod_arg[e_alias_alias];
}
field_node = field_node->nod_arg[e_alias_value];
}
else if (field_node->nod_type == nod_derived_field)
{
break;
case nod_derived_field:
if (!alias_name)
{
alias_name = (dsql_str*) field_node->nod_arg[e_derived_field_name];
}
field_node = field_node->nod_arg[e_derived_field_value];
}
else if (field_node->nod_type == nod_map)
{
break;
case nod_map:
const dsql_map* map = (dsql_map*) field_node->nod_arg[e_map_map];
field_node = map->map_node;
break;
}
}

4
src/jrd/dyn.epp
View File

@ -570,7 +570,7 @@ void DYN_execute(Global* gbl,
break;
case isc_dyn_delete_local_fld:
DYN_delete_local_field(gbl, ptr, relation_name, field_name);
DYN_delete_local_field(gbl, ptr, relation_name); //, field_name);
break;
case isc_dyn_mod_sql_fld:
@ -610,7 +610,7 @@ void DYN_execute(Global* gbl,
break;
case isc_dyn_delete_dimensions:
DYN_delete_dimensions(gbl, ptr, relation_name, field_name);
DYN_delete_dimensions(gbl, ptr); // relation_name, field_name);
break;
case isc_dyn_mod_charset:

10
src/jrd/dyn_del.epp
View File

@ -257,9 +257,9 @@ void DYN_delete_constraint (Global* gbl, const UCHAR** ptr, const Firebird::Meta
void DYN_delete_dimensions(Global* gbl,
const UCHAR** ptr,
const Firebird::MetaName* relation_name,
Firebird::MetaName* field_name)
const UCHAR** ptr)
//const Firebird::MetaName* relation_name,
//Firebird::MetaName* field_name) // Obtained from the stream
{
/**************************************
*
@ -701,8 +701,8 @@ void DYN_delete_index( Global* gbl, const UCHAR** ptr)
void DYN_delete_local_field(Global* gbl,
const UCHAR** ptr,
const Firebird::MetaName* relation_name,
Firebird::MetaName* field_name)
const Firebird::MetaName* relation_name)
//Firebird::MetaName* field_name) // Obtained from the stream
{
/**************************************
*

4
src/jrd/dyn_dl_proto.h
View File

@ -26,14 +26,14 @@
void DYN_delete_collation(Jrd::Global*, const UCHAR**);
void DYN_delete_constraint(Jrd::Global*, const UCHAR**, const Firebird::MetaName*);
void DYN_delete_dimensions(Jrd::Global*, const UCHAR**, const Firebird::MetaName*, Firebird::MetaName*);
void DYN_delete_dimensions(Jrd::Global*, const UCHAR**); //, const Firebird::MetaName*, Firebird::MetaName*);
void DYN_delete_exception(Jrd::Global*, const UCHAR**);
void DYN_delete_filter(Jrd::Global*, const UCHAR**);
void DYN_delete_function(Jrd::Global*, const UCHAR**);
void DYN_delete_generator(Jrd::Global*, const UCHAR**);
void DYN_delete_global_field(Jrd::Global*, const UCHAR**);
void DYN_delete_index(Jrd::Global*, const UCHAR**);
void DYN_delete_local_field(Jrd::Global*, const UCHAR**, const Firebird::MetaName*, Firebird::MetaName*);
void DYN_delete_local_field(Jrd::Global*, const UCHAR**, const Firebird::MetaName*); //, Firebird::MetaName*);
void DYN_delete_parameter(Jrd::Global*, const UCHAR**, Firebird::MetaName*);
void DYN_delete_procedure(Jrd::Global*, const UCHAR**);
void DYN_delete_relation(Jrd::Global*, const UCHAR**, const Firebird::MetaName*);

46
src/jrd/dyn_mod.epp
View File

@ -90,15 +90,15 @@ const int MAX_CHARS_FLOAT = 13; /* 7 digits + 2 signs + E + decimal + 2 digit ex
static const UCHAR alloc_info[] = { isc_info_allocation, isc_info_end };
static void change_backup_mode(Global*, UCHAR verb);
static void modify_lfield_position(thread_db*, Database*, Global*, const MetaName&, const MetaName&,
static void modify_lfield_position(thread_db*, Global*, const MetaName&, const MetaName&,
USHORT, USHORT);
static bool check_view_dependency(thread_db*, Database*, Global*, const MetaName&, const MetaName&);
static bool check_sptrig_dependency(thread_db*, Database*, Global*, const MetaName&, const MetaName&);
static void modify_lfield_index(thread_db*, Database*, Global*, const MetaName&, const MetaName&,
static bool check_view_dependency(thread_db*, Global*, const MetaName&, const MetaName&);
static bool check_sptrig_dependency(thread_db*, Global*, const MetaName&, const MetaName&);
static void modify_lfield_index(thread_db*, Global*, const MetaName&, const MetaName&,
const MetaName&);
static bool field_exists(thread_db*, Database*, Global*, const MetaName&, const MetaName&);
static bool domain_exists(thread_db*, Database*, Global*, const MetaName&);
static void get_domain_type(thread_db*, Database*, Global*, dyn_fld&);
static bool field_exists(thread_db*, Global*, const MetaName&, const MetaName&);
static bool domain_exists(thread_db*, Global*, const MetaName&);
static void get_domain_type(thread_db*, Global*, dyn_fld&);
static ULONG check_update_fld_type(const dyn_fld&, const dyn_fld&);
static ULONG check_update_numeric_type(const dyn_fld&, const dyn_fld&);
static void modify_err_punt(thread_db*, ULONG, const dyn_fld&, const dyn_fld&);
@ -709,7 +709,7 @@ void DYN_modify_global_field(Global* gbl,
if (GET_STRING(ptr, newfld))
{
if (!domain_exists(tdbb, dbb, gbl, newfld))
if (!domain_exists(tdbb, gbl, newfld))
{
MODIFY FLD USING
strcpy(FLD.RDB$FIELD_NAME, newfld.c_str());
@ -738,7 +738,7 @@ void DYN_modify_global_field(Global* gbl,
strcpy(DOM.RDB$FIELD_SOURCE, newfld.c_str());
DOM.RDB$FIELD_SOURCE.NULL = FALSE;
END_MODIFY;
modify_lfield_index(tdbb, dbb, gbl,
modify_lfield_index(tdbb, gbl,
DOM.RDB$RELATION_NAME,
DOM.RDB$FIELD_NAME,
DOM.RDB$FIELD_NAME);
@ -1016,7 +1016,7 @@ void DYN_modify_global_field(Global* gbl,
FOR(REQUEST_HANDLE request TRANSACTION_HANDLE gbl->gbl_transaction)
DOM IN RDB$RELATION_FIELDS
WITH DOM.RDB$FIELD_SOURCE EQ orig_dom.dyn_fld_name.c_str()
modify_lfield_index(tdbb, dbb, gbl,
modify_lfield_index(tdbb, gbl,
DOM.RDB$RELATION_NAME,
DOM.RDB$FIELD_NAME,
DOM.RDB$FIELD_NAME);
@ -1386,11 +1386,11 @@ void DYN_modify_local_field(Global* gbl,
/* msg 212: "Zero length identifiers not allowed" */
}
check_view_dependency(tdbb, dbb, gbl, r, f);
check_sptrig_dependency(tdbb, dbb, gbl, r, f);
if (!field_exists(tdbb, dbb, gbl, r, new_fld)) {
check_view_dependency(tdbb, gbl, r, f);
check_sptrig_dependency(tdbb, gbl, r, f);
if (!field_exists(tdbb, gbl, r, new_fld)) {
strcpy(FLD.RDB$FIELD_NAME, new_fld.c_str());
modify_lfield_index(tdbb, dbb, gbl, r, f, FLD.RDB$FIELD_NAME);
modify_lfield_index(tdbb, gbl, r, f, FLD.RDB$FIELD_NAME);
}
else {
DYN_error_punt(false, 205, SafeArg() << f.c_str() << new_fld.c_str() <<
@ -1434,7 +1434,7 @@ void DYN_modify_local_field(Global* gbl,
DYN_REQUEST(drq_m_lfield) = request;
if (npflag && found && position != existing_position)
modify_lfield_position(tdbb, dbb, gbl, r, f, position, existing_position);
modify_lfield_position(tdbb, gbl, r, f, position, existing_position);
} // try
catch (const Exception& ex) {
stuff_exception(tdbb->tdbb_status_vector, ex);
@ -2356,7 +2356,6 @@ static void change_backup_mode( Global* gbl, UCHAR verb)
static void modify_lfield_position(thread_db* tdbb,
Database* dbb,
Global* gbl,
const MetaName& relation_name,
const MetaName& field_name,
@ -2469,7 +2468,6 @@ static void modify_lfield_position(thread_db* tdbb,
static bool check_view_dependency(thread_db* tdbb,
Database* dbb,
Global* gbl,
const MetaName& relation_name,
const MetaName& field_name)
@ -2516,7 +2514,6 @@ static bool check_view_dependency(thread_db* tdbb,
static bool check_sptrig_dependency(thread_db* tdbb,
Database* dbb,
Global* gbl,
const MetaName& relation_name,
const MetaName& field_name)
@ -2556,7 +2553,6 @@ static bool check_sptrig_dependency(thread_db* tdbb,
static void modify_lfield_index(thread_db* tdbb,
Database* dbb,
Global* gbl,
const MetaName& relation_name,
const MetaName& field_name,
@ -2597,7 +2593,6 @@ static void modify_lfield_index(thread_db* tdbb,
static bool field_exists(thread_db* tdbb,
Database* dbb,
Global* gbl,
const MetaName& relation_name,
const MetaName& field_name)
@ -2626,7 +2621,6 @@ static bool field_exists(thread_db* tdbb,
static bool domain_exists(thread_db* tdbb,
Database* dbb,
Global* gbl,
const MetaName& field_name)
{
@ -2713,7 +2707,7 @@ void DYN_modify_sql_field(Global* gbl,
// ASF: check disabled to allow change of field type to be used
// with TYPE OF COLUMN table.column feature.
//check_sptrig_dependency(tdbb, dbb, gbl, *relation_name,
//check_sptrig_dependency(tdbb, gbl, *relation_name,
// orig_fld.dyn_fld_name);
jrd_req* request = NULL;
@ -2791,7 +2785,7 @@ void DYN_modify_sql_field(Global* gbl,
orig_fld.dyn_fld_name.c_str());
// msg 224: "Cannot use the internal domain %s as new type for field %s".
}
get_domain_type(tdbb, dbb, gbl, dom_fld);
get_domain_type(tdbb, gbl, dom_fld);
update_domain = true;
break;
@ -3403,7 +3397,7 @@ void DYN_modify_sql_field(Global* gbl,
}
// Update any indices that exist
modify_lfield_index(tdbb, dbb, gbl, *relation_name, orig_fld.dyn_fld_name, orig_fld.dyn_fld_name);
modify_lfield_index(tdbb, gbl, *relation_name, orig_fld.dyn_fld_name, orig_fld.dyn_fld_name);
}
catch (const Exception& ex) {
@ -3479,7 +3473,7 @@ void DYN_modify_mapping(Global* gbl, const UCHAR** ptr)
}
}
void get_domain_type(thread_db* tdbb, Database* dbb, Global* gbl, dyn_fld& dom_fld)
void get_domain_type(thread_db* tdbb, Global* gbl, dyn_fld& dom_fld)
{
/**************************************
*
@ -3817,7 +3811,7 @@ static ULONG check_update_numeric_type(const dyn_fld& orig_fld, const dyn_fld& n
}
static void modify_err_punt(thread_db* tdbb,
static void modify_err_punt(thread_db* /*tdbb*/,
ULONG errorcode,
const dyn_fld& orig_fld_def,
const dyn_fld& new_fld_def)

2
src/qli/dtr.cpp
View File

@ -496,7 +496,7 @@ static bool process_statement(bool flush_flag)
}
static void CLIB_ROUTINE signal_arith_excp(USHORT sig, USHORT code, USHORT scp)
static void CLIB_ROUTINE signal_arith_excp(USHORT /*sig*/, USHORT code, USHORT /*scp*/)
{
/**************************************
*