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

Misc

Browse Source
This commit is contained in:
asfernandes 2010-01-04 00:43:45 +00:00
parent 5d9bf907c9
commit 4dc5b55f74
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/burp/OdsDetection.epp
View File

@ -22,7 +22,6 @@
*
*/
#include "firebird.h"
#include "../burp/burp.h"
#include "../burp/burp_proto.h"

1
src/burp/OdsDetection.h
View File

@ -22,7 +22,6 @@
*
*/
#ifndef BURP_ODSDETECTION_H
#define BURP_ODSDETECTION_H

2
src/include/gen/msgs.h
View File

@ -836,7 +836,7 @@ Data source : @4"}, /* eds_statement */
{336068875, "Default values for parameters are allowed only in declaration of packaged procedure @1.@2"}, /* dyn_defvaldecl_package */
{336068877, "Package body @1 already exists"}, /* dyn_package_body_exists */
{336068878, "Invalid DDL statement for function @1"}, /* dyn_invalid_ddl_func */
{336068879, "Cannot alter new style function @1 with ALTER EXTERNAL FUNCTION"}, /* dyn_newfc_oldsyntax */
{336068879, "Cannot alter new style function @1 with ALTER EXTERNAL FUNCTION. Use ALTER FUNCTION instead."}, /* dyn_newfc_oldsyntax */
{336330753, "found unknown switch"}, /* gbak_unknown_switch */
{336330754, "page size parameter missing"}, /* gbak_page_size_missing */
{336330755, "Page size specified (@1) greater than limit (16384 bytes)"}, /* gbak_page_size_toobig */

20
src/jrd/ExtEngineManager.cpp
View File

@ -774,8 +774,9 @@ ExtEngineManager::Function* ExtEngineManager::makeFunction(thread_db* tdbb, cons
if (!externalFunction)
{
status_exception::raise(Arg::Gds(isc_eem_func_not_returned) <<
udf->getName().toString().c_str() << engine.c_str());
status_exception::raise(
Arg::Gds(isc_eem_func_not_returned) <<
udf->getName().toString() << engine);
}
}
@ -816,8 +817,9 @@ ExtEngineManager::Procedure* ExtEngineManager::makeProcedure(thread_db* tdbb, co
if (!externalProcedure)
{
status_exception::raise(Arg::Gds(isc_eem_proc_not_returned) <<
prc->getName().toString().c_str() << engine.c_str());
status_exception::raise(
Arg::Gds(isc_eem_proc_not_returned) <<
prc->getName().toString() << engine);
}
}
@ -860,8 +862,8 @@ ExtEngineManager::Trigger* ExtEngineManager::makeTrigger(thread_db* tdbb, const
if (!externalTrigger)
{
status_exception::raise(Arg::Gds(isc_eem_trig_not_returned) << trg->name.c_str()
<< engine.c_str());
status_exception::raise(
Arg::Gds(isc_eem_trig_not_returned) << trg->name << engine.c_str());
}
}
@ -911,8 +913,8 @@ ExternalEngine* ExtEngineManager::getEngine(thread_db* tdbb, const Firebird::Met
if (version != EXTERNAL_VERSION_1)
{
status_exception::raise(
Arg::Gds(isc_eem_bad_plugin_ver) << Arg::Num(version) <<
name.c_str());
Arg::Gds(isc_eem_bad_plugin_ver) <<
Arg::Num(version) << name);
}
Database::SyncGuard dsGuard(tdbb->getDatabase());
@ -948,7 +950,7 @@ ExternalEngine* ExtEngineManager::getEngine(thread_db* tdbb, const Firebird::Met
if (!engine)
{
status_exception::raise(Arg::Gds(isc_eem_engine_notfound) << name.c_str());
status_exception::raise(Arg::Gds(isc_eem_engine_notfound) << name);
}
return engine;

8
src/jrd/PluginManager.cpp
View File

@ -176,7 +176,7 @@ PluginImpl* PluginManager::getPlugin(const string& name)
s.printf("Plugin %s not found.", name.c_str());
gds__log(s.c_str());
status_exception::raise(Arg::Gds(isc_pman_plugin_notfound) << name.c_str());
status_exception::raise(Arg::Gds(isc_pman_plugin_notfound) << name);
}
if (plugin->module)
@ -203,7 +203,7 @@ PluginImpl* PluginManager::getPlugin(const string& name)
s.printf("Can't load plugin module '%s'.", plugin->filename.c_str());
gds__log(s.c_str());
status_exception::raise(Arg::Gds(isc_pman_cannot_load_plugin) << plugin->filename.c_str());
status_exception::raise(Arg::Gds(isc_pman_cannot_load_plugin) << plugin->filename);
}
PluginEntryPoint entryPoint;
@ -216,7 +216,7 @@ PluginImpl* PluginManager::getPlugin(const string& name)
s.printf("Entrypoint of Plugin '%s' does not exist.", plugin->filename.c_str());
gds__log(s.c_str());
status_exception::raise(Arg::Gds(isc_pman_entrypoint_notfound) << plugin->filename.c_str());
status_exception::raise(Arg::Gds(isc_pman_entrypoint_notfound) << plugin->filename);
}
plugin->module = module;
@ -275,7 +275,7 @@ ExternalEngineFactory* PluginImpl::getExternalEngineFactory()
if (!externalEngineFactory)
{
status_exception::raise(
Arg::Gds(isc_pman_unknown_instance) << name.c_str() << "ExternalEngine");
Arg::Gds(isc_pman_unknown_instance) << name << "ExternalEngine");
}
return externalEngineFactory;