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

*** empty log message ***

Browse Source
This commit is contained in:
paulbeach 2009-01-21 15:40:27 +00:00
parent cb8beb5b83
commit 718d5dc5c1
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dsql/keywords.cpp
View File

@ -416,7 +416,7 @@ static const TOK tokens[] =
extern "C" {
int KEYWORD_stringIsAToken(const char* in_str)
int API_ROUTINE KEYWORD_stringIsAToken(const char* in_str)
{
const TOK* tok_ptr = tokens;
while (tok_ptr->tok_string) {
@ -428,7 +428,7 @@ int KEYWORD_stringIsAToken(const char* in_str)
return false;
}
const TOK* KEYWORD_getTokens()
Tokens API_ROUTINE KEYWORD_getTokens()
{
return tokens;
}

7
src/dsql/keywords.h
View File

@ -25,6 +25,8 @@
* MOD 29-Jun-2002
*/
#include "../jrd/common.h"
struct tok
{
USHORT tok_ident;
@ -34,10 +36,11 @@ struct tok
};
typedef tok TOK;
typedef const TOK* Tokens;
// These symbols are exported
extern "C" {
int KEYWORD_stringIsAToken(const char*);
const TOK* KEYWORD_getTokens();
int API_ROUTINE KEYWORD_stringIsAToken(const char*);
Tokens API_ROUTINE KEYWORD_getTokens();
}

8
src/jrd/gds.cpp
View File

@ -229,7 +229,7 @@ static Firebird::GlobalPtr<Firebird::Mutex> global_msg_mutex;
static gds_msg* global_default_msg = NULL;
static bool volatile initialized = false;
void* API_ROUTINE gds__alloc_debug(SLONG size_request, const TEXT* filename, ULONG lineno)
VoidPtr API_ROUTINE gds__alloc_debug(SLONG size_request, const TEXT* filename, ULONG lineno)
{
return getDefaultMemoryPool()->allocate_nothrow(size_request
#ifdef DEBUG_GDS_ALLOC
@ -2323,7 +2323,7 @@ void API_ROUTINE fb_sqlstate(char* sqlstate, const ISC_STATUS* status_vector)
}
void* API_ROUTINE gds__temp_file(BOOLEAN stdio_flag, const TEXT* string, TEXT* expanded_string,
VoidPtr API_ROUTINE gds__temp_file(BOOLEAN stdio_flag, const TEXT* string, TEXT* expanded_string,
TEXT* dir, BOOLEAN unlink_flag)
{
/**************************************
@ -3563,7 +3563,7 @@ static void safe_concat_path(TEXT *resultString, const TEXT *appendString)
}
void gds__default_printer(void* arg, SSHORT offset, const TEXT* line)
void FB_EXPORTED gds__default_printer(void* arg, SSHORT offset, const TEXT* line)
{
printf("%4d %s\n", offset, line);
}
@ -3586,7 +3586,7 @@ void gds__trace_printer(void* arg, SSHORT offset, const TEXT* line)
#undef gds__alloc
void* API_ROUTINE gds__alloc(SLONG size_request)
VoidPtr API_ROUTINE gds__alloc(SLONG size_request)
{
return getDefaultMemoryPool()->allocate_nothrow(size_request
#ifdef DEBUG_GDS_ALLOC

10
src/jrd/gds_proto.h
View File

@ -45,11 +45,13 @@ const ULONG ALLOC_dont_check = 1L << 5; /* Stop checking integrity on each call
extern "C" {
#endif
void* API_ROUTINE gds__alloc_debug(SLONG, const TEXT*, ULONG);
typedef void* VoidPtr;
VoidPtr 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);
VoidPtr API_ROUTINE gds__alloc(SLONG);
#ifdef DEBUG_GDS_ALLOC
#define gds__alloc(s) gds__alloc_debug ((s), (TEXT*)__FILE__, (ULONG)__LINE__)
@ -112,7 +114,7 @@ void API_ROUTINE gds__qtoq(const void*, void*);
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, BOOLEAN = FALSE);
VoidPtr 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*, SLONG);
SLONG API_ROUTINE gds__vax_integer(const UCHAR*, SSHORT);
@ -127,7 +129,7 @@ SINT64 API_ROUTINE isc_portable_integer(const UCHAR*, SSHORT);
void gds__cleanup();
void gds__ulstr(char* buffer, ULONG value, const int minlen, const char filler);
void gds__default_printer(void*, SSHORT, const TEXT*);
void FB_EXPORTED gds__default_printer(void*, SSHORT, const TEXT*);
void gds__trace_printer(void*, SSHORT, const TEXT*);
void gds__print_pool(Firebird::MemoryPool*, const TEXT*, ...);