"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/jrd/IntlManager.cpp" between
Firebird-3.0.2.32703-0.tar.bz2 and Firebird-3.0.4.33054-0.tar.bz2

About: Firebird is a relational database offering many ANSI SQL standard features.

IntlManager.cpp  (Firebird-3.0.2.32703-0.tar.bz2)	:	IntlManager.cpp  (Firebird-3.0.4.33054-0.tar.bz2)
skipping to change at line 469		skipping to change at line 469
{		{
fatal_exception::raiseFmt("Missin g parameter 'filename' for intl_module %s\n", module->value.c_str());		fatal_exception::raiseFmt("Missin g parameter 'filename' for intl_module %s\n", module->value.c_str());
}		}
filename = fname->value.ToPathName();		filename = fname->value.ToPathName();
configInfo = getConfigInfo(objModule);		configInfo = getConfigInfo(objModule);
ModuleLoader::Module* mod = NULL;		ModuleLoader::Module* mod = NULL;
bool exists = modules->exist(filename);		bool exists = modules->exist(filename);
		ISC_STATUS_ARRAY status;
if (!exists)		if (!exists)
{		{
mod = ModuleLoader::loadModule(fi lename);		mod = ModuleLoader::loadModule(st atus, filename);
if (!mod)		if (!mod)
{		{
ModuleLoader::doctorModul eExtension(filename);		ModuleLoader::doctorModul eExtension(filename);
exists = modules->exist(f ilename);		exists = modules->exist(f ilename);
if (!exists)		if (!exists)
mod = ModuleLoade r::loadModule(filename);		mod = ModuleLoade r::loadModule(status, filename);
}		}
}		}
if (!exists)		if (!exists)
{		{
if (mod)		if (mod)
{		{
// Negotiate version		// Negotiate version
pfn_INTL_version versionF unction;		pfn_INTL_version versionF unction;
USHORT version;		USHORT version;
skipping to change at line 510		skipping to change at line 511
err_msg.printf("I NTL module '%s' is of incompatible version number %d",		err_msg.printf("I NTL module '%s' is of incompatible version number %d",
filename. c_str(), version);		filename. c_str(), version);
gds__log(err_msg. c_str());		gds__log(err_msg. c_str());
ok = false;		ok = false;
}		}
else		else
modules->put(file name, mod);		modules->put(file name, mod);
}		}
else		else
{		{
gds__log((string("Can't l		iscLogStatus((string("Can
oad INTL module '") +		't load INTL module '") +
filename.c_str()		filename.c_str()
+ "'").c_str());		+ "'").c_str(), status);
ok = false;		ok = false;
		<span class="insert">"'").c_str(), status);</span>
}		}
}		}
}		}
const ConfigFile::Parameters& sub = ch->sub->getP arameters();		const ConfigFile::Parameters& sub = ch->sub->getP arameters();
for (FB_SIZE_T coll = 0; coll < sub.getCount(); + +coll)		for (FB_SIZE_T coll = 0; coll < sub.getCount(); + +coll)
{		{
if (sub[coll].name != "collation")		if (sub[coll].name != "collation")
{		{
End of changes. 5 change blocks.
6 lines changed or deleted		8 lines changed or added

---