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

Fix IntlManager.cpp to sync with "config" cleanup.

Browse Source 
Notice that whereas JString had a const char* operator for automatic or forced conversion, Firebird::string doesn't have one. Worse, the layout of FBString has a static buffer of size 32 but can allocate a dynamic buffer for larger requirements and therefore, casting FBString to char* or const char* will most likely produce wrong behavior or crash. Thereforer, I removed the places with such explicit cast. Alex, please watch if there are more problems of this type in IntlManager.cpp, the "config" dir or the "vulcan" dir.
This commit is contained in:
robocop 2008-04-29 12:21:17 +00:00
parent 16dbb17061
commit 4cbdb23710
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/jrd/IntlManager.cpp
View File

@ -409,7 +409,7 @@ bool IntlManager::initialize()
{
while (dir.next())
{
ConfigFile configFile(dir.getFilePath(), 0);
ConfigFile configFile(dir.getFilePath(), ConfigFile::LEX_none);
ConfObj builtinModule(configFile.findObject("intl_module", "builtin"));
string s = getConfigInfo(builtinModule);
@ -479,9 +479,9 @@ bool IntlManager::initialize()
{
if (el2->name == "collation")
{
string collationName = (const char*)el2->getAttributeName(0);
string charSetCollation = charSetName + ":" + collationName;
const char* externalName = (const char*)el2->getAttributeName(1);
const string collationName = el2->getAttributeName(0);
const string charSetCollation = charSetName + ":" + collationName;
const char* externalName = el2->getAttributeName(1);
if (!registerCharSetCollation(charSetCollation, filename,
(externalName ? externalName : collationName), configInfo))