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

Cleanup.

Browse Source
This commit is contained in:
robocop 2008-03-30 09:38:24 +00:00
parent 66d74f5e46
commit f5c4d1853d
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/remote/protocol.cpp
View File

@ -81,7 +81,7 @@ typedef enum {
static bool alloc_cstring(XDR *, CSTRING *);
static void free_cstring(XDR *, CSTRING *);
static RSR get_statement(XDR *, SSHORT);
static Rsr* get_statement(XDR *, SSHORT);
static bool_t xdr_cstring(XDR*, CSTRING*);
static inline bool_t xdr_cstring_const(XDR*, CSTRING_CONST*);
static bool_t xdr_datum(XDR *, const DSC*, BLOB_PTR *);
@ -637,7 +637,7 @@ bool_t xdr_protocol(XDR* xdrs, PACKET* p)
information (for example: blr info)
*/
RSR statement = NULL;
Rsr* statement = NULL;
statement = get_statement(xdrs, sqldata->p_sqldata_statement);
if (statement)
REMOTE_reset_statement(statement);
@ -1512,7 +1512,7 @@ static bool_t xdr_sql_blr(
return TRUE;
rem_port* port = (rem_port*) xdrs->x_public;
RSR statement;
Rsr* statement;
if (statement_id >= 0) {
if (static_cast<ULONG>(statement_id) >= port->port_objects.getCount())
return FALSE;
@ -1597,7 +1597,7 @@ static bool_t xdr_sql_message( XDR* xdrs, SLONG statement_id)
* Map a formatted sql message.
*
**************************************/
RSR statement;
Rsr* statement;
if (xdrs->x_op == XDR_FREE)
return TRUE;
@ -1811,7 +1811,7 @@ static bool_t xdr_trrq_message( XDR* xdrs, USHORT msg_type)
}
static RSR get_statement( XDR * xdrs, SSHORT statement_id)
static Rsr* get_statement( XDR * xdrs, SSHORT statement_id)
{
/**************************************
*

4
src/remote/remote.cpp
View File

@ -81,7 +81,7 @@ void REMOTE_cleanup_transaction( RTR transaction)
}
}
for (RSR statement = transaction->rtr_rdb->rdb_sql_requests; statement;
for (Rsr* statement = transaction->rtr_rdb->rdb_sql_requests; statement;
statement = statement->rsr_next)
{
if (statement->rsr_rtr == transaction) {
@ -506,7 +506,7 @@ void REMOTE_reset_request( Rrq* request, REM_MSG active_message)
}
void REMOTE_reset_statement( RSR statement)
void REMOTE_reset_statement( Rsr* statement)
{
/**************************************
*

4
src/remote/remote.h
View File

@ -370,7 +370,7 @@ private:
// remote SQL request
typedef struct Rsr : public Firebird::GlobalStorage, public TypedHandle<rem_type_rsr>
struct Rsr : public Firebird::GlobalStorage, public TypedHandle<rem_type_rsr>
{
Rsr* rsr_next;
Rdb* rsr_rdb;
@ -421,7 +421,7 @@ public:
void releaseException();
static ISC_STATUS badHandle() { return isc_bad_req_handle; }
} *RSR;
};
// Makes it possible to safely store all handles in single array