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

Misc

Browse Source
This commit is contained in:
asfernandes 2010-03-21 23:01:30 +00:00
parent 1a5d7b1150
commit 2ed85aef29
5 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/dsql/Nodes.h
View File

@ -223,15 +223,9 @@ public:
return obj ? obj->as<T>() : NULL; return obj ? obj->as<T>() : NULL;
} }
template <typename T, typename LegacyType> static const T* const_as(const LegacyType* node)
{
const ExprNode* obj = T::fromLegacy(node);
return obj ? obj->as<T>() : NULL;
}
template <typename T, typename LegacyType> static bool is(const LegacyType* node) template <typename T, typename LegacyType> static bool is(const LegacyType* node)
{ {
ExprNode* obj = T::fromLegacy(node); const ExprNode* obj = T::fromLegacy(node);
return obj ? obj->is<T>() : false; return obj ? obj->is<T>() : false;
} }

2
src/include/types_pub.h
View File

@ -66,7 +66,7 @@ typedef ISC_STATUS ISC_STATUS_ARRAY[ISC_STATUS_LENGTH];
/* SQL State as defined in the SQL Standard. */ /* SQL State as defined in the SQL Standard. */
#define FB_SQLSTATE_LENGTH 5 #define FB_SQLSTATE_LENGTH 5
#define FB_SQLSTATE_SIZE FB_SQLSTATE_LENGTH + 1 #define FB_SQLSTATE_SIZE (FB_SQLSTATE_LENGTH + 1)
typedef char FB_SQLSTATE_STRING[FB_SQLSTATE_SIZE]; typedef char FB_SQLSTATE_STRING[FB_SQLSTATE_SIZE];
/******************************************************************/ /******************************************************************/

3
src/jrd/cmp.cpp
View File

@ -1756,8 +1756,7 @@ void CMP_get_desc(thread_db* tdbb, CompilerScratch* csb, jrd_nod* node, DSC* des
case nod_current_role: case nod_current_role:
desc->dsc_dtype = dtype_text; desc->dsc_dtype = dtype_text;
desc->dsc_ttype() = ttype_metadata; desc->dsc_ttype() = ttype_metadata;
// ASF: should be multiplied by maxBytesPerChar of ttype_metadata in the future desc->dsc_length = USERNAME_LENGTH * METADATA_BYTES_PER_CHAR;
desc->dsc_length = USERNAME_LENGTH;
desc->dsc_scale = 0; desc->dsc_scale = 0;
desc->dsc_flags = 0; desc->dsc_flags = 0;
return; return;

1
src/remote/interface.cpp
View File

@ -4657,7 +4657,6 @@ static rem_port* analyze(PathName& file_name,
#endif // SUPERCLIENT #endif // SUPERCLIENT
if (port || status_vector[1]) if (port || status_vector[1])
{ {
return port; return port;

1
src/remote/xnet_proto.h
View File

@ -40,4 +40,3 @@ rem_port* XNET_reconnect(ULONG, ISC_STATUS*);
#endif #endif
#endif // REMOTE_XNET_PROTO_H #endif // REMOTE_XNET_PROTO_H