Menu
▾
▴
[Firebird-checkins] CVS: firebird2/src/jrd common.h, 1.158.2.10, 1.158.2.11 cvt_proto.h, 1.11, 1.11.26.1 gds.cpp, 1.230, 1.230.2.1 gds_proto.h, 1.46, 1.46.8.1 utl.cpp, 1.105.4.5, 1.105.4.6 utl_proto.h, 1.22, 1.22.8.1
Build Version : T2.5.0.20195 Firebird 2.5 Unstable (writeBuildNum.sh,v 1.20355 2008/06/04 11:18:24 paulbeach E ) Update of /cvsroot/firebird/firebird2/src/jrd In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv7106/src/jrd Modified Files: Tag: B2_1_Release common.h cvt_proto.h gds.cpp gds_proto.h utl.cpp utl_proto.h Log Message: Use Firebird's own delete call rather than system wide delete Index: common.h =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/common.h,v retrieving revision 1.158.2.10 retrieving revision 1.158.2.11 diff -b -U3 -r1.158.2.10 -r1.158.2.11 --- common.h 22 May 2008 15:01:07 -0000 1.158.2.10 +++ common.h 4 Jun 2008 11:18:36 -0000 1.158.2.11 @@ -201,6 +201,9 @@ #define MOVE_FASTER(from, to, length) memcpy (to, from, (int) (length)) #define MOVE_CLEAR(to, length) memset (to, 0, (int) (length)) +#define API_ROUTINE __attribute__((visibility("default"))) +#define API_ROUTINE_VARARG API_ROUTINE +#define INTERNAL_API_ROUTINE API_ROUTINE #endif /* Darwin Platforms */ Index: cvt_proto.h =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/cvt_proto.h,v retrieving revision 1.11 retrieving revision 1.11.26.1 diff -b -U3 -r1.11 -r1.11.26.1 --- cvt_proto.h 5 Nov 2003 09:02:24 -0000 1.11 +++ cvt_proto.h 4 Jun 2008 11:18:36 -0000 1.11.26.1 @@ -39,7 +39,9 @@ GDS_TIMESTAMP CVT_get_timestamp(const dsc*, FPTR_ERROR); USHORT CVT_make_string(const dsc*, USHORT, const char**, vary*, USHORT, FPTR_ERROR); -extern "C" void CVT_move(const dsc*, dsc*, FPTR_ERROR); +extern "C" { +void API_ROUTINE CVT_move(const dsc*, dsc*, FPTR_ERROR); +} #endif // JRD_CVT_PROTO_H Index: gds.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/gds.cpp,v retrieving revision 1.230 retrieving revision 1.230.2.1 diff -b -U3 -r1.230 -r1.230.2.1 --- gds.cpp 19 Nov 2007 00:21:10 -0000 1.230 +++ gds.cpp 4 Jun 2008 11:18:36 -0000 1.230.2.1 @@ -242,7 +242,7 @@ static gds_msg* global_default_msg = NULL; static bool initialized = false; -void* API_ROUTINE gds__alloc_debug(SLONG size_request, +pVoid API_ROUTINE gds__alloc_debug(SLONG size_request, const TEXT* filename, ULONG lineno) { @@ -2411,7 +2411,7 @@ } -void* API_ROUTINE gds__temp_file( +pVoid API_ROUTINE gds__temp_file( BOOLEAN stdio_flag, const TEXT* string, TEXT* expanded_string, TEXT* dir, BOOLEAN unlink_flag) { @@ -3640,7 +3640,7 @@ #undef gds__alloc -void* API_ROUTINE gds__alloc(SLONG size_request) +pVoid API_ROUTINE gds__alloc(SLONG size_request) { return getDefaultMemoryPool()->allocate_nothrow(size_request, 0 #ifdef DEBUG_GDS_ALLOC Index: gds_proto.h =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/gds_proto.h,v retrieving revision 1.46 retrieving revision 1.46.8.1 diff -b -U3 -r1.46 -r1.46.8.1 --- gds_proto.h 23 May 2007 15:29:53 -0000 1.46 +++ gds_proto.h 4 Jun 2008 11:18:36 -0000 1.46.8.1 @@ -45,11 +45,12 @@ extern "C" { #endif -void* API_ROUTINE gds__alloc_debug(SLONG, const TEXT*, ULONG); +typedef void* pVoid; +pVoid API_ROUTINE gds__alloc_debug(SLONG, const TEXT*, ULONG); void API_ROUTINE gds_alloc_flag_unfreed(void*); void API_ROUTINE gds_alloc_report(ULONG, const char*, int); -void* API_ROUTINE gds__alloc(SLONG); +pVoid API_ROUTINE gds__alloc(SLONG); #ifdef DEBUG_GDS_ALLOC #define gds__alloc(s) gds__alloc_debug ((s), (TEXT*)__FILE__, (ULONG)__LINE__) @@ -115,7 +116,7 @@ void API_ROUTINE gds__register_cleanup(FPTR_VOID_PTR, void*); SLONG API_ROUTINE gds__sqlcode(const ISC_STATUS*); void API_ROUTINE gds__sqlcode_s(const ISC_STATUS*, ULONG*); -void* API_ROUTINE gds__temp_file(BOOLEAN, const TEXT*, TEXT*, TEXT* = NULL, +pVoid API_ROUTINE gds__temp_file(BOOLEAN, const TEXT*, TEXT*, TEXT* = NULL, BOOLEAN = FALSE); void API_ROUTINE gds__unregister_cleanup(FPTR_VOID_PTR, void*); BOOLEAN API_ROUTINE gds__validate_lib_path(const TEXT*, const TEXT*, TEXT*, @@ -126,13 +127,13 @@ void API_ROUTINE isc_print_sqlerror(SSHORT, const ISC_STATUS*); void API_ROUTINE isc_sql_interprete(SSHORT, TEXT*, SSHORT); SINT64 API_ROUTINE isc_portable_integer(const UCHAR*, SSHORT); +void API_ROUTINE gds__default_printer(void*, SSHORT, const TEXT*); // 14-June-2004. Nickolay Samofatov. The routines below are not part of the // API and are not exported. Maybe use another prefix like GDS_ for them? void gds__cleanup(void); void gds__ulstr(char* buffer, ULONG value, const int minlen, const char filler); -void gds__default_printer(void*, SSHORT, const TEXT*); void gds__trace_printer(void*, SSHORT, const TEXT*); void gds__print_pool(class JrdMemoryPool*, const TEXT*, ...); Index: utl.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/utl.cpp,v retrieving revision 1.105.4.5 retrieving revision 1.105.4.6 diff -b -U3 -r1.105.4.5 -r1.105.4.6 --- utl.cpp 22 May 2008 15:01:10 -0000 1.105.4.5 +++ utl.cpp 4 Jun 2008 11:18:37 -0000 1.105.4.6 @@ -1749,7 +1749,7 @@ } -BSTREAM* API_ROUTINE Bopen(ISC_QUAD* blob_id, +pStream API_ROUTINE Bopen(ISC_QUAD* blob_id, FB_API_HANDLE database, FB_API_HANDLE transaction, const SCHAR* mode) @@ -1807,7 +1807,7 @@ // CVC: This routine doesn't open a blob really! -BSTREAM* API_ROUTINE BLOB_open(FB_API_HANDLE blob, SCHAR* buffer, int length) +pStream API_ROUTINE BLOB_open(FB_API_HANDLE blob, SCHAR* buffer, int length) { /************************************** * Index: utl_proto.h =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/utl_proto.h,v retrieving revision 1.22 retrieving revision 1.22.8.1 diff -b -U3 -r1.22 -r1.22.8.1 --- utl_proto.h 18 Nov 2006 19:33:25 -0000 1.22 +++ utl_proto.h 4 Jun 2008 11:18:37 -0000 1.22.8.1 @@ -67,8 +67,9 @@ int API_ROUTINE BLOB_load(ISC_QUAD*, FB_API_HANDLE, FB_API_HANDLE, const TEXT*); int API_ROUTINE BLOB_text_dump(ISC_QUAD*, FB_API_HANDLE, FB_API_HANDLE, const SCHAR*); int API_ROUTINE BLOB_text_load(ISC_QUAD*, FB_API_HANDLE, FB_API_HANDLE, const TEXT*); -struct bstream* API_ROUTINE Bopen(ISC_QUAD*, FB_API_HANDLE, FB_API_HANDLE, const SCHAR*); -struct bstream* API_ROUTINE BLOB_open(FB_API_HANDLE, SCHAR*, int); +typedef struct bstream* pStream; +pStream API_ROUTINE Bopen(ISC_QUAD*, FB_API_HANDLE, FB_API_HANDLE, const SCHAR*); +pStream API_ROUTINE BLOB_open(FB_API_HANDLE, SCHAR*, int); int API_ROUTINE BLOB_put(SCHAR, struct bstream*); #ifdef VMS |