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

Removed some compiler messages

Browse Source
This commit is contained in:
asfernandes 2005-06-13 02:12:14 +00:00
parent 7937deb4de
commit 4efb74fc51
4 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/dsql/gen.cpp
View File

@ -1532,16 +1532,16 @@ static void gen_constant( dsql_req* request, dsc* desc, bool negate_value)
input += sizeof(USHORT);
memcpy(input, desc->dsc_address, desc->dsc_length);
ISC_STATUS_ARRAY user_status;
tsql* tdsql = DSQL_get_thread_data();
THREAD_EXIT();
const ISC_STATUS s =
isc_database_info(user_status, &request->req_dbb->dbb_database_handle,
isc_database_info(tdsql->tsql_status, &request->req_dbb->dbb_database_handle,
inputBuffer.getCount(), (SCHAR*)inputBuffer.begin(),
sizeof(buffer), buffer);
THREAD_ENTER();
if (s)
;
#pragma FB_COMPILER_MESSAGE("Adriano should put an error message here.")
Firebird::status_exception::raise(tdsql->tsql_status);
l = desc->dsc_length = gds__vax_integer((UCHAR*)buffer + sizeof(UCHAR) + sizeof(USHORT), sizeof(SLONG));

8
src/dsql/make.cpp
View File

@ -1720,16 +1720,16 @@ dsql_nod* MAKE_field(dsql_ctx* context, dsql_fld* field, dsql_nod* indices)
*input++ = INF_internal_db_info_intl_is_legacy_charset;
*input++ = INTL_GET_CHARSET(&node->nod_desc);
ISC_STATUS_ARRAY user_status;
tsql* tdsql = DSQL_get_thread_data();
THREAD_EXIT();
const ISC_STATUS s =
isc_database_info(user_status, &context->ctx_request->req_dbb->dbb_database_handle,
isc_database_info(tdsql->tsql_status, &context->ctx_request->req_dbb->dbb_database_handle,
inputBuffer.getCapacity(), (SCHAR*)inputBuffer.begin(),
sizeof(buffer), buffer);
THREAD_ENTER();
if (s)
;
#pragma FB_COMPILER_MESSAGE("Adriano should put an error message here.")
Firebird::status_exception::raise(tdsql->tsql_status);
if (*((UCHAR*)buffer + sizeof(UCHAR) + sizeof(USHORT))) // CHARSET_LEGACY_SEMANTICS
{

15
src/dsql/pass1.cpp
View File

@ -3216,26 +3216,19 @@ static dsql_nod* pass1_constant( dsql_req* request, dsql_nod* constant)
input += sizeof(USHORT);
memcpy(input, constant->nod_desc.dsc_address, constant->nod_desc.dsc_length);
ISC_STATUS_ARRAY user_status;
tsql* tdsql = DSQL_get_thread_data();
THREAD_EXIT();
const ISC_STATUS s =
isc_database_info(user_status, &request->req_dbb->dbb_database_handle,
isc_database_info(tdsql->tsql_status, &request->req_dbb->dbb_database_handle,
inputBuffer.getCount(), (SCHAR*)inputBuffer.begin(),
sizeof(buffer), buffer);
THREAD_ENTER();
if (s)
;
#pragma FB_COMPILER_MESSAGE("Adriano should put an error message here.")
Firebird::status_exception::raise(tdsql->tsql_status);
SLONG length = gds__vax_integer((UCHAR*)buffer + sizeof(UCHAR) + sizeof(USHORT), sizeof(SLONG));
if (length == -1) // malformed string
{
ERRD_post(isc_sqlerr,
isc_arg_number, (SLONG) - 104,
isc_arg_gds, isc_malformed_string, 0);
}
constant->nod_desc.dsc_length = length * METD_get_charset_bpc(request, INTL_GET_CHARSET(&constant->nod_desc));
constant->nod_desc.dsc_length += adjust;

6
src/jrd/inf.cpp
View File

@ -790,7 +790,11 @@ int INF_database_info(const SCHAR* items,
{
ULONG offendingPos;
if (!charSet->wellFormed(strLen, (const UCHAR*)items, &offendingPos))
length = INF_convert(-1, buffer);
{
ERR_post(isc_sqlerr,
isc_arg_number, (SLONG) - 104,
isc_arg_gds, isc_malformed_string, 0);
}
else
{
length = INF_convert(charSet->length(tdbb, strLen,