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

Warnings

Browse Source
This commit is contained in:
aafemt 2005-06-22 05:13:54 +00:00
parent 6bb0aef835
commit b61d8b3c17
5 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/config/ConfObject.cpp
View File

@ -51,11 +51,11 @@ struct BooleanName
static const BooleanName booleanNames [] =
{
"yes", true,
"true", true,
"false", false,
"no", false,
NULL
{"yes", true},
{"true", true},
{"false", false},
{"no", false},
{NULL}
};
ConfObject::ConfObject(ConfigFile *confFile)
@ -363,4 +363,4 @@ const char* ConfObject::getName(void)
ConfObject* ConfObject::findObject(const char* objectType, const char* objectName)
{
return configFile->findObject(objectType, objectName);
}
}

2
src/jrd/Optimizer.cpp
View File

@ -779,7 +779,7 @@ IndexScratchSegment::IndexScratchSegment(MemoryPool& p, IndexScratchSegment* seg
}
IndexScratch::IndexScratch(MemoryPool& p, index_desc* ix) :
segments(p), idx(ix)
idx(ix), segments(p)
{
/**************************************
*

40
src/jrd/intl.cpp
View File

@ -402,25 +402,25 @@ public:
return srcLen / minBytesPerChar();
}
virtual ULONG substring(thread_db* tdbb, ULONG srcLen, const UCHAR* src, ULONG dstLen, UCHAR* dst, ULONG startPos, ULONG length) const
virtual ULONG substring(thread_db* tdbb, ULONG srcLen, const UCHAR* src, ULONG dstLen, UCHAR* dst, ULONG startPos, ULONG len) const
{
fb_assert(getStruct());
if (getStruct()->charset_fn_substring)
return getStruct()->charset_fn_substring(getStruct(), srcLen, src, dstLen, dst, startPos, length);
return getStruct()->charset_fn_substring(getStruct(), srcLen, src, dstLen, dst, startPos, len);
else
{
fb_assert(src != NULL && dst != NULL);
if (dstLen < length * minBytesPerChar())
if (dstLen < len * minBytesPerChar())
return INTL_BAD_STR_LENGTH;
else if (startPos * minBytesPerChar() > srcLen)
return 0;
length = MIN(srcLen / minBytesPerChar() - startPos, length) * minBytesPerChar();
len = MIN(srcLen / minBytesPerChar() - startPos, len) * minBytesPerChar();
memcpy(dst, src + startPos * minBytesPerChar(), length);
memcpy(dst, src + startPos * minBytesPerChar(), len);
return length;
return len;
}
}
};
@ -443,28 +443,28 @@ public:
{
USHORT errCode;
ULONG errPos;
ULONG length = getConvToUnicode().convertLength(srcLen);
ULONG len = getConvToUnicode().convertLength(srcLen);
// convert to UTF16
Firebird::HalfStaticArray<USHORT, BUFFER_SMALL> str;
length = getConvToUnicode().convert(srcLen, src, length,
str.getBuffer(length / sizeof(USHORT)), &errCode, &errPos);
len = getConvToUnicode().convert(srcLen, src, len,
str.getBuffer(len / sizeof(USHORT)), &errCode, &errPos);
// calculate length of UTF16
return UnicodeUtil::utf16Length(length, str.begin());
return UnicodeUtil::utf16Length(len, str.begin());
}
}
virtual ULONG substring(thread_db* tdbb, ULONG srcLen, const UCHAR* src, ULONG dstLen, UCHAR* dst, ULONG startPos, ULONG length) const
virtual ULONG substring(thread_db* tdbb, ULONG srcLen, const UCHAR* src, ULONG dstLen, UCHAR* dst, ULONG startPos, ULONG len) const
{
fb_assert(getStruct());
if (getStruct()->charset_fn_substring)
return getStruct()->charset_fn_substring(getStruct(), srcLen, src, dstLen, dst, startPos, length);
return getStruct()->charset_fn_substring(getStruct(), srcLen, src, dstLen, dst, startPos, len);
else
{
fb_assert(src != NULL && dst != NULL);
if (length == 0 || startPos >= srcLen)
if (len == 0 || startPos >= srcLen)
return 0;
USHORT errCode;
@ -472,17 +472,17 @@ public:
// convert to UTF16
Firebird::HalfStaticArray<UCHAR, BUFFER_SMALL> str;
ULONG length = getConvToUnicode().convertLength(srcLen);
length = getConvToUnicode().convert(srcLen, src, length,
reinterpret_cast<USHORT*>(str.getBuffer(length)), &errCode, &errPos);
ULONG unilength = getConvToUnicode().convertLength(srcLen);
unilength = getConvToUnicode().convert(srcLen, src, unilength,
reinterpret_cast<USHORT*>(str.getBuffer(unilength)), &errCode, &errPos);
// generate substring of UTF16
Firebird::HalfStaticArray<UCHAR, BUFFER_SMALL> substr;
length = UnicodeUtil::utf16Substring(length, reinterpret_cast<const USHORT*>(str.begin()),
length, reinterpret_cast<USHORT*>(substr.getBuffer(length)), startPos, length);
unilength = UnicodeUtil::utf16Substring(unilength, reinterpret_cast<const USHORT*>(str.begin()),
unilength, reinterpret_cast<USHORT*>(substr.getBuffer(unilength)), startPos, len);
// convert generated substring to original charset
return getConvFromUnicode().convert(length, substr.begin(), dstLen, dst, &errCode, &errPos);
return getConvFromUnicode().convert(unilength, substr.begin(), dstLen, dst, &errCode, &errPos);
}
}
};
@ -492,7 +492,7 @@ template <typename pContainsObjectImpl, typename pLikeObjectImpl,
class CollationImpl : public TextType
{
public:
CollationImpl(TTYPE_ID type, TEXTTYPE tt, CharSet* cs) : TextType(type, tt, cs) {}
CollationImpl(TTYPE_ID a_type, TEXTTYPE a_tt, CharSet* a_cs) : TextType(a_type, a_tt, a_cs) {}
virtual bool matches(thread_db* tdbb, const UCHAR* a, SLONG b, const UCHAR* c, SLONG d)
{

6
src/jrd/opt.cpp
View File

@ -792,12 +792,12 @@ RecordSource* OPT_compile(thread_db* tdbb,
// Create river and copy the streams.
River* river = FB_NEW_RPT(*tdbb->getDefaultPool(), count) River();
river->riv_count = (UCHAR) count;
UCHAR* stream = river->riv_streams;
UCHAR* stream_itr = river->riv_streams;
RiverStack::iterator stack2(rivers_stack);
for (; stack2.hasData(); ++stack2) {
River* subRiver = stack2.object();
MOVE_FAST(subRiver->riv_streams, stream, subRiver->riv_count);
stream += subRiver->riv_count;
MOVE_FAST(subRiver->riv_streams, stream_itr, subRiver->riv_count);
stream_itr += subRiver->riv_count;
}
river->riv_rsb = make_cross(tdbb, opt, rivers_stack);
rivers_stack.push(river);

4
src/jrd/unicode_util.cpp
View File

@ -57,7 +57,7 @@ USHORT UnicodeUtil::utf16ToKey(USHORT srcLen, const USHORT* src, USHORT dstLen,
fb_assert(U_SUCCESS(status));
int32_t len = ucnv_fromUChars(conv, reinterpret_cast<char*>(dst), dstLen,
src, srcLen / sizeof(*src), &status);
reinterpret_cast<const UChar*>(src), srcLen / sizeof(*src), &status);
fb_assert(U_SUCCESS(status));
ucnv_close(conv);
@ -536,7 +536,7 @@ USHORT UnicodeUtil::Utf16Collation::stringToKey(USHORT srcLen, const USHORT* src
return INTL_BAD_KEY_LENGTH;
}
return ucol_getSortKey((UCollator*)collator, src, srcLen / sizeof(*src), dst, dstLen);
return ucol_getSortKey((UCollator*)collator, reinterpret_cast<const UChar *>(src), srcLen / sizeof(*src), dst, dstLen);
}