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

Some cleanup

Browse Source
This commit is contained in:
dimitr 2003-09-16 17:08:44 +00:00
parent fa4710d003
commit dabc8fc047
2 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/jrd/btr.cpp
View File

@ -24,7 +24,7 @@
*
*/
/*
$Id: btr.cpp,v 1.35 2003-08-18 21:13:56 skidder Exp $
$Id: btr.cpp,v 1.36 2003-09-16 17:08:44 dimitr Exp $
*/
#include "firebird.h"
@ -176,29 +176,13 @@ static INT64_KEY make_int64_key(SINT64, SSHORT);
#ifdef DEBUG_INDEXKEY
static void print_int64_key(SINT64, SSHORT, INT64_KEY);
#endif
static void quad_put(SLONG, SCHAR *);
static void quad_put(SLONG, UCHAR *);
static void quad_move(UCHAR*, UCHAR*);
static CONTENTS remove_node(TDBB, IIB *, WIN *);
static CONTENTS remove_leaf_node(TDBB, IIB *, WIN *);
static BOOLEAN scan(TDBB, BTN, SBM *, UCHAR, KEY *, USHORT);
} // extern "C"
//
// TMN: Ease C -> C++ conversion. These functions must be outside the
// extern "C" block since it uses function overloading.
//
inline void quad_put(SLONG value, UCHAR * data)
{
quad_put(value, reinterpret_cast<SCHAR*>(data));
}
extern "C" {
USHORT BTR_all(TDBB tdbb,
JRD_REL relation,
IDX** start_buffer,
@ -4133,7 +4117,7 @@ static void print_int64_key(SINT64 value, SSHORT scale, INT64_KEY key)
#endif /* DEBUG_INDEXKEY */
static void quad_put(SLONG value, SCHAR* data)
static void quad_put(SLONG value, UCHAR* data)
{
/**************************************
*
@ -4146,7 +4130,7 @@ static void quad_put(SLONG value, SCHAR* data)
*
**************************************/
const SCHAR* p = (SCHAR*) &value;
const UCHAR* p = (UCHAR*) &value;
data[0] = p[0];
data[1] = p[1];

1
src/jrd/btr_proto.h
View File

@ -45,7 +45,6 @@ extern struct btn *BTR_find_leaf(struct btr *, struct key *, UCHAR *, UCHAR *,
extern struct btr *BTR_find_page(struct tdbb *, struct irb *, struct win *,
struct idx *, struct key *, struct key *,
BOOLEAN);
extern SLONG BTR_get_quad(const SCHAR*);
extern void BTR_insert(struct tdbb *, struct win *, struct iib *);
extern enum idx_e BTR_key(struct tdbb *, struct jrd_rel *, struct rec *,
struct idx *, struct key *, idx_null_state *);