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

Style.

Browse Source
This commit is contained in:
robocop 2009-06-07 10:19:09 +00:00
parent 989cd38f18
commit b6636f6af5
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/jrd/intl.cpp
View File

@ -713,8 +713,8 @@ int INTL_convert_string(dsc* to, const dsc* from, ErrorFunction err)
fb_assert(from != NULL); fb_assert(from != NULL);
fb_assert(IS_TEXT(to) && IS_TEXT(from)); fb_assert(IS_TEXT(to) && IS_TEXT(from));
CHARSET_ID from_cs = INTL_charset(tdbb, INTL_TTYPE(from)); const CHARSET_ID from_cs = INTL_charset(tdbb, INTL_TTYPE(from));
CHARSET_ID to_cs = INTL_charset(tdbb, INTL_TTYPE(to)); const CHARSET_ID to_cs = INTL_charset(tdbb, INTL_TTYPE(to));
UCHAR* p = to->dsc_address; UCHAR* p = to->dsc_address;
const UCHAR* start = p; const UCHAR* start = p;
@ -725,12 +725,11 @@ int INTL_convert_string(dsc* to, const dsc* from, ErrorFunction err)
USHORT from_type; USHORT from_type;
const USHORT from_len = CVT_get_string_ptr(from, &from_type, &from_ptr, NULL, 0, err); const USHORT from_len = CVT_get_string_ptr(from, &from_type, &from_ptr, NULL, 0, err);
ULONG to_size, to_len, to_fill; const ULONG to_size = TEXT_LEN(to);
to_size = to_len = TEXT_LEN(to); ULONG from_fill, to_fill;
ULONG from_fill;
const UCHAR* q = from_ptr; const UCHAR* q = from_ptr;
CharSet* toCharSet = INTL_charset_lookup(tdbb, to_cs); CharSet* const toCharSet = INTL_charset_lookup(tdbb, to_cs);
ULONG toLength; ULONG toLength;
switch (to->dsc_dtype) switch (to->dsc_dtype)
@ -739,7 +738,7 @@ int INTL_convert_string(dsc* to, const dsc* from, ErrorFunction err)
if (from_cs != to_cs && to_cs != CS_BINARY && to_cs != CS_NONE && from_cs != CS_NONE) if (from_cs != to_cs && to_cs != CS_BINARY && to_cs != CS_NONE && from_cs != CS_NONE)
{ {
to_len = INTL_convert_bytes(tdbb, to_cs, to->dsc_address, to_size, const ULONG to_len = INTL_convert_bytes(tdbb, to_cs, to->dsc_address, to_size,
from_cs, from_ptr, from_len, err); from_cs, from_ptr, from_len, err);
toLength = to_len; toLength = to_len;
to_fill = to_size - to_len; to_fill = to_size - to_len;
@ -749,7 +748,7 @@ int INTL_convert_string(dsc* to, const dsc* from, ErrorFunction err)
else { else {
/* binary string can always be converted TO by byte-copy */ /* binary string can always be converted TO by byte-copy */
to_len = MIN(from_len, to_size); ULONG to_len = MIN(from_len, to_size);
if (!toCharSet->wellFormed(to_len, q)) if (!toCharSet->wellFormed(to_len, q))
err(Arg::Gds(isc_malformed_string)); err(Arg::Gds(isc_malformed_string));
toLength = to_len; toLength = to_len;
@ -771,7 +770,7 @@ int INTL_convert_string(dsc* to, const dsc* from, ErrorFunction err)
case dtype_cstring: case dtype_cstring:
if (from_cs != to_cs && to_cs != CS_BINARY && to_cs != CS_NONE && from_cs != CS_NONE) if (from_cs != to_cs && to_cs != CS_BINARY && to_cs != CS_NONE && from_cs != CS_NONE)
{ {
to_len = INTL_convert_bytes(tdbb, to_cs, to->dsc_address, to_size, const ULONG to_len = INTL_convert_bytes(tdbb, to_cs, to->dsc_address, to_size,
from_cs, from_ptr, from_len, err); from_cs, from_ptr, from_len, err);
toLength = to_len; toLength = to_len;
to->dsc_address[to_len] = 0; to->dsc_address[to_len] = 0;
@ -780,7 +779,7 @@ int INTL_convert_string(dsc* to, const dsc* from, ErrorFunction err)
else { else {
/* binary string can always be converted TO by byte-copy */ /* binary string can always be converted TO by byte-copy */
to_len = MIN(from_len, to_size); ULONG to_len = MIN(from_len, to_size);
if (!toCharSet->wellFormed(to_len, q)) if (!toCharSet->wellFormed(to_len, q))
err(Arg::Gds(isc_malformed_string)); err(Arg::Gds(isc_malformed_string));
toLength = to_len; toLength = to_len;
@ -801,7 +800,7 @@ int INTL_convert_string(dsc* to, const dsc* from, ErrorFunction err)
{ {
UCHAR* vstr = reinterpret_cast<UCHAR*>(((vary*) to->dsc_address)->vary_string); UCHAR* vstr = reinterpret_cast<UCHAR*>(((vary*) to->dsc_address)->vary_string);
start = vstr; start = vstr;
to_len = INTL_convert_bytes(tdbb, to_cs, vstr, const ULONG to_len = INTL_convert_bytes(tdbb, to_cs, vstr,
to_size, from_cs, from_ptr, from_len, err); to_size, from_cs, from_ptr, from_len, err);
toLength = to_len; toLength = to_len;
((vary*) to->dsc_address)->vary_length = to_len; ((vary*) to->dsc_address)->vary_length = to_len;
@ -809,7 +808,7 @@ int INTL_convert_string(dsc* to, const dsc* from, ErrorFunction err)
} }
else { else {
/* binary string can always be converted TO by byte-copy */ /* binary string can always be converted TO by byte-copy */
to_len = MIN(from_len, to_size); ULONG to_len = MIN(from_len, to_size);
if (!toCharSet->wellFormed(to_len, q)) if (!toCharSet->wellFormed(to_len, q))
err(Arg::Gds(isc_malformed_string)); err(Arg::Gds(isc_malformed_string));
toLength = to_len; toLength = to_len;