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

Fixed Sun compiler warnings

Browse Source
This commit is contained in:
alexpeshkoff 2009-06-04 09:32:08 +00:00
parent 8a07337904
commit 0c9bc92dad
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/StatusArg.cpp
View File

@ -113,7 +113,7 @@ bool StatusVector::ImplStatusVector::appendWarnings(const ImplBase* const v) thr
bool StatusVector::ImplStatusVector::append(const ISC_STATUS* const from, const int count) throw()
{
int copied = 0;
unsigned int copied = 0;
for (int i = 0; i < count; )
{
@ -183,7 +183,7 @@ ISC_STATUS StatusVector::ImplStatusVector::copyTo(ISC_STATUS* dest) const throw(
{
if (hasData())
{
memcpy(dest, value(), (length() + 1) * sizeof(ISC_STATUS));
memcpy(dest, value(), (length() + 1u) * sizeof(ISC_STATUS));
}
else {
dest[0] = isc_arg_gds;

6
src/jrd/gds.cpp
View File

@ -3587,15 +3587,15 @@ static void safe_concat_path(TEXT *resultString, const TEXT *appendString)
* Thread/signal safe code.
*
**************************************/
int len = strlen(resultString);
size_t len = strlen(resultString);
if (resultString[len - 1] != PathUtils::dir_sep && len < MAXPATHLEN - 1) {
resultString[len++] = PathUtils::dir_sep;
resultString[len] = 0;
}
int alen = strlen(appendString);
size_t alen = strlen(appendString);
if (len + alen > MAXPATHLEN - 1)
alen = MAXPATHLEN - 1 - len;
fb_assert(alen >= 0);
fb_assert(len + alen <= MAXPATHLEN);
memcpy(&resultString[len], appendString, alen);
resultString[len + alen] = 0;
}