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

Misc changes as per Claudio and Alex comments

Browse Source
This commit is contained in:
asfernandes 2007-04-19 01:09:44 +00:00
parent 54e881e3c2
commit f2ecfc4898
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builds/win32/msvc7/intl.vcproj
View File

@ -244,9 +244,6 @@
<File
RelativePath="..\..\..\src\intl\ld.cpp">
</File>
<File
RelativePath="..\..\..\src\jrd\unicode_util.cpp">
</File>
</Filter>
<Filter
Name="Header files"
@ -680,6 +677,9 @@
<File
RelativePath="..\..\..\src\jrd\IntlUtil.cpp">
</File>
<File
RelativePath="..\..\..\src\jrd\unicode_util.cpp">
</File>
<File
RelativePath="..\..\..\src\jrd\os\win32\mod_loader.cpp">
</File>

8
builds/win32/msvc8/intl.vcproj
View File

@ -459,10 +459,6 @@
RelativePath="..\..\..\src\intl\ld.cpp"
>
</File>
<File
RelativePath="..\..\..\src\jrd\unicode_util.cpp"
>
</File>
</Filter>
<Filter
Name="Header files"
@ -1052,6 +1048,10 @@
RelativePath="..\..\..\src\jrd\IntlUtil.cpp"
>
</File>
<File
RelativePath="..\..\..\src\jrd\unicode_util.cpp"
>
</File>
<File
RelativePath="..\..\..\src\jrd\os\win32\mod_loader.cpp"
>

2
src/jrd/IntlManager.cpp
View File

@ -366,7 +366,7 @@ Firebird::string IntlManager::getConfigInfo(const ConfObj& confObj)
values.append(el->getAttributeName(i));
}
if (!configInfo.isEmpty())
if (configInfo.hasData())
configInfo.append(";");
configInfo.append(string(el->name) + "=" + values);
}

8
src/jrd/unicode_util.cpp
View File

@ -1110,15 +1110,15 @@ UnicodeUtil::ICU* UnicodeUtil::Utf16Collation::loadICU(
if (locale.hasData())
{
int i = icu->ulocCountAvailable();
int avail = icu->ulocCountAvailable();
while (--i >= 0)
while (--avail >= 0)
{
if (locale == icu->ulocGetAvailable(i))
if (locale == icu->ulocGetAvailable(avail))
break;
}
if (i < 0)
if (avail < 0)
continue;
}