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

Fixing the damn interface.

Browse Source
This commit is contained in:
robocop 2008-03-30 09:42:24 +00:00
parent d6ee92043a
commit 3de79a20c9
7 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dsql/user__proto.h
View File

@ -40,7 +40,7 @@ ISC_STATUS API_ROUTINE gds__fetch(ISC_STATUS*, const SCHAR*, SQLDA*);
ISC_STATUS API_ROUTINE gds__fetch_a(ISC_STATUS*, int*, const SCHAR*, SQLDA*); ISC_STATUS API_ROUTINE gds__fetch_a(ISC_STATUS*, int*, const SCHAR*, SQLDA*);
ISC_STATUS API_ROUTINE gds__open(ISC_STATUS*, FB_API_HANDLE*, const SCHAR*, SQLDA*); ISC_STATUS API_ROUTINE gds__open(ISC_STATUS*, FB_API_HANDLE*, const SCHAR*, SQLDA*);
ISC_STATUS API_ROUTINE gds__prepare(ISC_STATUS*, FB_API_HANDLE*, FB_API_HANDLE*, const SCHAR*, ISC_STATUS API_ROUTINE gds__prepare(ISC_STATUS*, FB_API_HANDLE*, FB_API_HANDLE*, const SCHAR*,
SSHORT*, const SCHAR*, SQLDA*); const SSHORT*, const SCHAR*, SQLDA*);
ISC_STATUS API_ROUTINE gds__to_sqlda(SQLDA*, int, SCHAR*, int, SCHAR*); ISC_STATUS API_ROUTINE gds__to_sqlda(SQLDA*, int, SCHAR*, int, SCHAR*);
ISC_STATUS API_ROUTINE isc_close(ISC_STATUS*, const SCHAR*); ISC_STATUS API_ROUTINE isc_close(ISC_STATUS*, const SCHAR*);
ISC_STATUS API_ROUTINE isc_declare(ISC_STATUS*, const SCHAR*, const SCHAR*); ISC_STATUS API_ROUTINE isc_declare(ISC_STATUS*, const SCHAR*, const SCHAR*);
@ -93,8 +93,8 @@ ISC_STATUS API_ROUTINE isc_execute_immediate(ISC_STATUS*, FB_API_HANDLE*, FB_API
ISC_STATUS API_ROUTINE isc_fetch(ISC_STATUS*, const SCHAR*, SQLDA*); ISC_STATUS API_ROUTINE isc_fetch(ISC_STATUS*, const SCHAR*, SQLDA*);
ISC_STATUS API_ROUTINE isc_fetch_a(ISC_STATUS*, int*, const SCHAR*, SQLDA*); ISC_STATUS API_ROUTINE isc_fetch_a(ISC_STATUS*, int*, const SCHAR*, SQLDA*);
ISC_STATUS API_ROUTINE isc_open(ISC_STATUS*, FB_API_HANDLE*, const SCHAR*, SQLDA*); ISC_STATUS API_ROUTINE isc_open(ISC_STATUS*, FB_API_HANDLE*, const SCHAR*, SQLDA*);
ISC_STATUS API_ROUTINE isc_prepare(ISC_STATUS*, FB_API_HANDLE*, FB_API_HANDLE*, const SCHAR*, SSHORT*, ISC_STATUS API_ROUTINE isc_prepare(ISC_STATUS*, FB_API_HANDLE*, FB_API_HANDLE*, const SCHAR*,
const SCHAR*, SQLDA*); const SSHORT*, const SCHAR*, SQLDA*);
int API_ROUTINE isc_to_sqlda(SQLDA*, int, SCHAR*, int, SCHAR*); int API_ROUTINE isc_to_sqlda(SQLDA*, int, SCHAR*, int, SCHAR*);
#ifdef __cplusplus #ifdef __cplusplus

4
src/dsql/user_dsql.cpp
View File

@ -970,7 +970,7 @@ ISC_STATUS API_ROUTINE isc_prepare( ISC_STATUS* status_vector,
FB_API_HANDLE* db_handle, FB_API_HANDLE* db_handle,
FB_API_HANDLE* tra_handle, FB_API_HANDLE* tra_handle,
const SCHAR* statement_name, const SCHAR* statement_name,
SSHORT* sql_length, const SSHORT* sql_length,
const SCHAR* sql, const SCHAR* sql,
SQLDA* sqlda) SQLDA* sqlda)
{ {
@ -1090,7 +1090,7 @@ ISC_STATUS API_ROUTINE gds__prepare(ISC_STATUS* status_vector,
FB_API_HANDLE* db_handle, FB_API_HANDLE* db_handle,
FB_API_HANDLE* tra_handle, FB_API_HANDLE* tra_handle,
const SCHAR* statement_name, const SCHAR* statement_name,
SSHORT* sql_length, const SSHORT* sql_length,
const SCHAR* sql, const SCHAR* sql,
SQLDA* sqlda) SQLDA* sqlda)
{ {

8
src/jrd/ibase.h
View File

@ -637,7 +637,7 @@ ISC_STATUS ISC_EXPORT isc_transact_request(ISC_STATUS*,
unsigned short, unsigned short,
const ISC_SCHAR*, const ISC_SCHAR*,
unsigned short, unsigned short,
ISC_SCHAR*, const ISC_SCHAR*,
unsigned short, unsigned short,
ISC_SCHAR*); ISC_SCHAR*);
@ -819,7 +819,7 @@ ISC_STATUS ISC_EXPORT isc_prepare(ISC_STATUS*,
isc_db_handle*, isc_db_handle*,
isc_tr_handle*, isc_tr_handle*,
const ISC_SCHAR*, const ISC_SCHAR*,
short*, const short*,
const ISC_SCHAR*, const ISC_SCHAR*,
XSQLDA*); XSQLDA*);
@ -835,7 +835,7 @@ ISC_STATUS ISC_EXPORT isc_dsql_execute_m(ISC_STATUS*,
const ISC_SCHAR*, const ISC_SCHAR*,
unsigned short, unsigned short,
unsigned short, unsigned short,
ISC_SCHAR*); const ISC_SCHAR*);
ISC_STATUS ISC_EXPORT isc_dsql_execute2_m(ISC_STATUS*, ISC_STATUS ISC_EXPORT isc_dsql_execute2_m(ISC_STATUS*,
isc_tr_handle*, isc_tr_handle*,
@ -873,7 +873,7 @@ ISC_STATUS ISC_EXPORT isc_dsql_exec_immed3_m(ISC_STATUS*,
const ISC_SCHAR*, const ISC_SCHAR*,
unsigned short, unsigned short,
unsigned short, unsigned short,
ISC_SCHAR*, const ISC_SCHAR*,
unsigned short, unsigned short,
ISC_SCHAR*, ISC_SCHAR*,
unsigned short, unsigned short,

2
src/jrd/jrd.cpp
View File

@ -3189,7 +3189,7 @@ ISC_STATUS GDS_TRANSACT_REQUEST(ISC_STATUS* user_status,
USHORT blr_length, USHORT blr_length,
const SCHAR* blr, const SCHAR* blr,
USHORT in_msg_length, USHORT in_msg_length,
SCHAR* in_msg, const SCHAR* in_msg,
USHORT out_msg_length, USHORT out_msg_length,
SCHAR* out_msg) SCHAR* out_msg)
{ {

2
src/jrd/jrd_proto.h
View File

@ -131,7 +131,7 @@ ISC_STATUS jrd8_transaction_info(ISC_STATUS*, Jrd::jrd_tra**,
SCHAR*); SCHAR*);
ISC_STATUS jrd8_transact_request(ISC_STATUS*, Jrd::Attachment**, ISC_STATUS jrd8_transact_request(ISC_STATUS*, Jrd::Attachment**,
Jrd::jrd_tra**, USHORT, const SCHAR*, Jrd::jrd_tra**, USHORT, const SCHAR*,
USHORT, SCHAR*, USHORT, USHORT, const SCHAR*, USHORT,
SCHAR*); SCHAR*);
ISC_STATUS jrd8_unwind_request(ISC_STATUS *, Jrd::jrd_req**, SSHORT); ISC_STATUS jrd8_unwind_request(ISC_STATUS *, Jrd::jrd_req**, SSHORT);
int jrd8_shutdown_all(unsigned int); int jrd8_shutdown_all(unsigned int);

16
src/jrd/why.cpp
View File

@ -1048,7 +1048,7 @@ const int PROC_ROLLBACK = 18;
const int PROC_SEND = 19; const int PROC_SEND = 19;
const int PROC_START_AND_SEND = 20; const int PROC_START_AND_SEND = 20;
const int PROC_START = 21; const int PROC_START = 21;
const int PROC_START_MULTIPLE = 22; //const int PROC_START_MULTIPLE = 22;
const int PROC_START_TRANSACTION= 23; const int PROC_START_TRANSACTION= 23;
const int PROC_TRANSACTION_INFO = 24; const int PROC_TRANSACTION_INFO = 24;
const int PROC_UNWIND = 25; const int PROC_UNWIND = 25;
@ -1065,9 +1065,9 @@ const int PROC_TRANSACT_REQUEST = 35;
const int PROC_DROP_DATABASE = 36; const int PROC_DROP_DATABASE = 36;
const int PROC_DSQL_ALLOCATE = 37; const int PROC_DSQL_ALLOCATE = 37;
const int PROC_DSQL_EXECUTE = 38; //const int PROC_DSQL_EXECUTE = 38;
const int PROC_DSQL_EXECUTE2 = 39; const int PROC_DSQL_EXECUTE2 = 39;
const int PROC_DSQL_EXEC_IMMED = 40; //const int PROC_DSQL_EXEC_IMMED = 40;
const int PROC_DSQL_EXEC_IMMED2 = 41; const int PROC_DSQL_EXEC_IMMED2 = 41;
const int PROC_DSQL_FETCH = 42; const int PROC_DSQL_FETCH = 42;
const int PROC_DSQL_FREE = 43; const int PROC_DSQL_FREE = 43;
@ -2517,7 +2517,7 @@ ISC_STATUS API_ROUTINE GDS_DSQL_EXECUTE_M(ISC_STATUS* user_status,
const SCHAR* blr, const SCHAR* blr,
USHORT msg_type, USHORT msg_type,
USHORT msg_length, USHORT msg_length,
SCHAR* msg) const SCHAR* msg)
{ {
/************************************** /**************************************
* *
@ -2543,7 +2543,7 @@ ISC_STATUS API_ROUTINE GDS_DSQL_EXECUTE2_M(ISC_STATUS* user_status,
const SCHAR* in_blr, const SCHAR* in_blr,
USHORT in_msg_type, USHORT in_msg_type,
USHORT in_msg_length, USHORT in_msg_length,
SCHAR* in_msg, const SCHAR* in_msg,
USHORT out_blr_length, USHORT out_blr_length,
SCHAR* out_blr, SCHAR* out_blr,
USHORT out_msg_type, USHORT out_msg_type,
@ -2797,7 +2797,7 @@ ISC_STATUS API_ROUTINE GDS_DSQL_EXEC_IMM2_M(ISC_STATUS* user_status,
const SCHAR* in_blr, const SCHAR* in_blr,
USHORT in_msg_type, USHORT in_msg_type,
USHORT in_msg_length, USHORT in_msg_length,
SCHAR* in_msg, const SCHAR* in_msg,
USHORT out_blr_length, USHORT out_blr_length,
SCHAR* out_blr, SCHAR* out_blr,
USHORT out_msg_type, USHORT out_msg_type,
@ -2908,7 +2908,7 @@ ISC_STATUS API_ROUTINE GDS_DSQL_EXEC_IMM3_M(ISC_STATUS* user_status,
const SCHAR* in_blr, const SCHAR* in_blr,
USHORT in_msg_type, USHORT in_msg_type,
USHORT in_msg_length, USHORT in_msg_length,
SCHAR* in_msg, const SCHAR* in_msg,
USHORT out_blr_length, USHORT out_blr_length,
SCHAR* out_blr, SCHAR* out_blr,
USHORT out_msg_type, USHORT out_msg_type,
@ -4935,7 +4935,7 @@ ISC_STATUS API_ROUTINE GDS_TRANSACT_REQUEST(ISC_STATUS* user_status,
USHORT blr_length, USHORT blr_length,
const SCHAR* blr, const SCHAR* blr,
USHORT in_msg_length, USHORT in_msg_length,
SCHAR* in_msg, const SCHAR* in_msg,
USHORT out_msg_length, USHORT out_msg_length,
SCHAR* out_msg) SCHAR* out_msg)
{ {

10
src/jrd/why_proto.h
View File

@ -38,12 +38,12 @@ ISC_STATUS API_ROUTINE isc_dsql_describe_bind(ISC_STATUS*, FB_API_HANDLE*,
ISC_STATUS API_ROUTINE isc_dsql_execute(ISC_STATUS*, FB_API_HANDLE*, FB_API_HANDLE*, ISC_STATUS API_ROUTINE isc_dsql_execute(ISC_STATUS*, FB_API_HANDLE*, FB_API_HANDLE*,
USHORT, XSQLDA*); USHORT, XSQLDA*);
ISC_STATUS API_ROUTINE isc_dsql_execute_m(ISC_STATUS*, FB_API_HANDLE*, FB_API_HANDLE*, USHORT, ISC_STATUS API_ROUTINE isc_dsql_execute_m(ISC_STATUS*, FB_API_HANDLE*, FB_API_HANDLE*, USHORT,
const SCHAR*, USHORT, USHORT, SCHAR*); const SCHAR*, USHORT, USHORT, const SCHAR*);
ISC_STATUS API_ROUTINE isc_dsql_execute2(ISC_STATUS*, FB_API_HANDLE*, FB_API_HANDLE*, USHORT, ISC_STATUS API_ROUTINE isc_dsql_execute2(ISC_STATUS*, FB_API_HANDLE*, FB_API_HANDLE*, USHORT,
XSQLDA*, XSQLDA*); XSQLDA*, XSQLDA*);
ISC_STATUS API_ROUTINE isc_dsql_execute2_m(ISC_STATUS*, FB_API_HANDLE*, ISC_STATUS API_ROUTINE isc_dsql_execute2_m(ISC_STATUS*, FB_API_HANDLE*,
FB_API_HANDLE*, USHORT, const SCHAR*, FB_API_HANDLE*, USHORT, const SCHAR*,
USHORT, USHORT, SCHAR*, USHORT, USHORT, USHORT, const SCHAR*, USHORT,
SCHAR*, USHORT, USHORT, SCHAR*, USHORT, USHORT,
SCHAR*); SCHAR*);
ISC_STATUS API_ROUTINE isc_dsql_execute_immediate(ISC_STATUS*, FB_API_HANDLE*, ISC_STATUS API_ROUTINE isc_dsql_execute_immediate(ISC_STATUS*, FB_API_HANDLE*,
@ -65,13 +65,13 @@ ISC_STATUS API_ROUTINE isc_dsql_exec_immed2_m(ISC_STATUS*, FB_API_HANDLE*,
FB_API_HANDLE*, USHORT, FB_API_HANDLE*, USHORT,
const SCHAR*, USHORT, USHORT, const SCHAR*, USHORT, USHORT,
const SCHAR*, USHORT, USHORT, const SCHAR*, USHORT, USHORT,
SCHAR*, USHORT, SCHAR*, const SCHAR*, USHORT, SCHAR*,
USHORT, USHORT, SCHAR*); USHORT, USHORT, SCHAR*);
ISC_STATUS API_ROUTINE isc_dsql_exec_immed3_m(ISC_STATUS*, FB_API_HANDLE*, ISC_STATUS API_ROUTINE isc_dsql_exec_immed3_m(ISC_STATUS*, FB_API_HANDLE*,
FB_API_HANDLE*, USHORT, FB_API_HANDLE*, USHORT,
const SCHAR*, USHORT, USHORT, const SCHAR*, USHORT, USHORT,
const SCHAR*, USHORT, USHORT, const SCHAR*, USHORT, USHORT,
SCHAR*, USHORT, SCHAR*, const SCHAR*, USHORT, SCHAR*,
USHORT, USHORT, SCHAR*); USHORT, USHORT, SCHAR*);
ISC_STATUS API_ROUTINE isc_dsql_fetch(ISC_STATUS*, FB_API_HANDLE*, USHORT, XSQLDA*); ISC_STATUS API_ROUTINE isc_dsql_fetch(ISC_STATUS*, FB_API_HANDLE*, USHORT, XSQLDA*);
#ifdef SCROLLABLE_CURSORS #ifdef SCROLLABLE_CURSORS
@ -238,7 +238,7 @@ ISC_STATUS API_ROUTINE_VARARG isc_start_transaction(ISC_STATUS*, FB_API_HANDLE*,
ISC_STATUS API_ROUTINE isc_transact_request(ISC_STATUS*, FB_API_HANDLE*, FB_API_HANDLE*, ISC_STATUS API_ROUTINE isc_transact_request(ISC_STATUS*, FB_API_HANDLE*, FB_API_HANDLE*,
USHORT, const SCHAR*, USHORT, USHORT, const SCHAR*, USHORT,
SCHAR*, USHORT, SCHAR*); const SCHAR*, USHORT, SCHAR*);
ISC_STATUS API_ROUTINE isc_transaction_info(ISC_STATUS*, FB_API_HANDLE*, SSHORT, ISC_STATUS API_ROUTINE isc_transaction_info(ISC_STATUS*, FB_API_HANDLE*, SSHORT,
const SCHAR*, SSHORT, UCHAR*); const SCHAR*, SSHORT, UCHAR*);