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

Remove unneeded extern C

Browse Source
This commit is contained in:
brodsom 2003-09-06 00:52:10 +00:00
parent 2d67733abb
commit 69698fc2eb
31 changed files with 27 additions and 243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/dudley/hsh.cpp
View File

@ -29,9 +29,6 @@
#include "../dudley/hsh_proto.h"
extern "C" {
#define HASH_SIZE 101
static USHORT hash(SCHAR *, USHORT);
@ -475,5 +472,3 @@ static bool scompare(SCHAR * string1,
return true;
}
} // extern "C"

8
src/dudley/hsh_proto.h
View File

@ -24,18 +24,10 @@
#ifndef _DUDLEY_HSH_PROTO_H_
#define _DUDLEY_HSH_PROTO_H_
#ifdef __cplusplus
extern "C" {
#endif
extern void HSH_init(void);
extern void HSH_insert(SYM);
extern SYM HSH_lookup(SCHAR *, USHORT);
extern void HSH_remove(SYM);
extern SYM HSH_typed_lookup(TEXT *, USHORT, enum sym_t);
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /* _DUDLEY_HSH_PROTO_H_ */

7
src/gpre/c_cxx.cpp
View File

@ -27,7 +27,7 @@
//
//____________________________________________________________
//
// $Id: c_cxx.cpp,v 1.23 2003-09-05 10:14:07 aafemt Exp $
// $Id: c_cxx.cpp,v 1.24 2003-09-06 00:52:10 brodsom Exp $
//
#include "firebird.h"
@ -47,9 +47,6 @@
#include "../jrd/gds_proto.h"
extern "C" {
extern TEXT *transaction_name;
static void align(int);
@ -4756,5 +4753,3 @@ static void t_start_auto(
END;
}
} // extern "C"

6
src/gpre/cmp.cpp
View File

@ -25,7 +25,7 @@
//
//____________________________________________________________
//
// $Id: cmp.cpp,v 1.14 2003-09-05 14:55:59 brodsom Exp $
// $Id: cmp.cpp,v 1.15 2003-09-06 00:52:10 brodsom Exp $
//
#include "firebird.h"
@ -44,8 +44,6 @@
#include "../gpre/par_proto.h"
extern "C" {
extern TEXT *ident_pattern, *utility_name, *count_name, *slack_name,
*transaction_name;
@ -1977,5 +1975,3 @@ static void update_references( REF references)
}
}
} // extern "C"

8
src/gpre/cmp_proto.h
View File

@ -26,10 +26,6 @@
#include "../gpre/form.h"
#ifdef __cplusplus
extern "C" {
#endif
extern void CMP_check(GPRE_REQ, SSHORT);
extern void CMP_compile_request(GPRE_REQ);
#ifdef PYXIS
@ -41,8 +37,4 @@ extern USHORT CMP_next_ident(void);
extern void CMP_stuff_symbol(GPRE_REQ, SYM);
extern void CMP_t_start(GPRE_TRA);
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /* _GPRE_CMP_PROTO_H_ */

6
src/gpre/ftn.cpp
View File

@ -24,7 +24,7 @@
//
//____________________________________________________________
//
// $Id: ftn.cpp,v 1.22 2003-09-05 10:14:07 aafemt Exp $
// $Id: ftn.cpp,v 1.23 2003-09-06 00:52:10 brodsom Exp $
//
// 2002.10.28 Sean Leyne - Completed removal of obsolete "DGUX" port
// 2002.10.28 Sean Leyne - Completed removal of obsolete "SGI" port
@ -50,9 +50,7 @@
#include <string.h>
#endif
extern "C" {
extern UCHAR fortran_labels[];
} /* extern "C" */
extern UCHAR fortran_labels[];
extern DBB isc_databases;
extern GPRE_REQ requests;
extern IB_FILE *out_file;

8
src/gpre/gpre.cpp
View File

@ -20,7 +20,7 @@
//
// All Rights Reserved.
// Contributor(s): ______________________________________.
// $Id: gpre.cpp,v 1.29 2003-09-05 10:14:07 aafemt Exp $
// $Id: gpre.cpp,v 1.30 2003-09-06 00:52:10 brodsom Exp $
// Revision 1.2 2000/11/16 15:54:29 fsg
// Added new switch -verbose to gpre that will dump
// parsed lines to stderr
@ -42,7 +42,7 @@
//
//____________________________________________________________
//
// $Id: gpre.cpp,v 1.29 2003-09-05 10:14:07 aafemt Exp $
// $Id: gpre.cpp,v 1.30 2003-09-06 00:52:10 brodsom Exp $
//
#define GPRE_MAIN
@ -81,8 +81,6 @@ extern int lib$get_foreign();
#include <io.h>
#endif
extern "C" {
#ifdef SMALL_FILE_NAMES
#define SCRATCH "fb_q"
#else
@ -2868,5 +2866,3 @@ static SSHORT skip_white()
return c;
}
} // extern "C"

23
src/gpre/gpre.h
View File

@ -19,7 +19,7 @@
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
* $Id: gpre.h,v 1.36 2003-09-05 10:14:07 aafemt Exp $
* $Id: gpre.h,v 1.37 2003-09-06 00:52:10 brodsom Exp $
* Revision 1.3 2000/11/27 09:26:13 fsg
* Fixed bugs in gpre to handle PYXIS forms
* and allow edit.e and fred.e to go through
@ -65,10 +65,6 @@
#include "../jrd/common.h"
#include "../jrd/y_ref.h"
#ifdef __cplusplus
extern "C" {
#endif
#ifdef GPRE_FORTRAN
#if defined AIX || defined AIX_PPC || defined sun
#define FTN_BLK_DATA 1
@ -1478,14 +1474,7 @@ typedef struct upd {
#define UPD_LEN sizeof(upd)
#ifdef __cplusplus
} /* extern "C" */
#endif
#include "../jrd/dsc.h"
#ifdef __cplusplus
extern "C" {
#endif
#define dtype_float dtype_real
@ -1538,13 +1527,7 @@ EXTERN USHORT ada_flags;
#undef EXTERN
#ifdef __cplusplus
} /* extern "C" */
#endif
#include "../gpre/msc_proto.h"
#ifdef __cplusplus
extern "C" {
#endif
#ifndef assert
#ifdef DEV_BUILD
@ -1561,9 +1544,5 @@ extern "C" {
#define assert_IS_NOD(x) assert(!(x) || ((x)->nod_type >= 1 && (x)->nod_type < nod_LASTNOD))
#define assert_IS_ACT(x) assert(!(x) || ((x)->act_type >= 0 && (x)->act_type < ACT_LASTACT))
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /* _GPRE_GPRE_H_ */

8
src/gpre/gpre_meta.h
View File

@ -24,10 +24,6 @@
#ifndef GPRE_GPRE_META_H
#define GPRE_GPRE_META_H
#ifdef __cplusplus
//extern "C" {
#endif
extern GPRE_FLD MET_context_field(GPRE_CTX, char *);
extern BOOLEAN MET_database(DBB, BOOLEAN);
extern USHORT MET_domain_lookup(GPRE_REQ, GPRE_FLD, char *);
@ -52,8 +48,4 @@ extern GPRE_REL MET_make_relation(SCHAR *);
extern BOOLEAN MET_type(GPRE_FLD, TEXT *, SSHORT *);
extern BOOLEAN MET_trigger_exists(DBB, TEXT *);
#ifdef __cplusplus
//} /* extern "C" */
#endif
#endif /* GPRE_GPRE_META_H */

10
src/gpre/gpre_meta_boot.cpp
View File

@ -26,7 +26,7 @@
*
*____________________________________________________________
*
* $Id: gpre_meta_boot.cpp,v 1.17 2003-09-05 14:55:59 brodsom Exp $
* $Id: gpre_meta_boot.cpp,v 1.18 2003-09-06 00:52:10 brodsom Exp $
*/
#include "firebird.h"
@ -904,19 +904,21 @@ ISC_STATUS API_ROUTINE isc_print_blr(SCHAR * blr,
(SCHAR *) callback_argument, language);
}
extern "C" void DLL_EXPORT CVT_move(dsc* a, dsc* b, FPTR_VOID c)
extern "C" {
void DLL_EXPORT CVT_move (dsc * a, dsc * b, FPTR_VOID c)
{
assert(0);
/* Not available in boot_gpre */
}
extern "C" {
void DLL_EXPORT ERR_bugcheck(int number)
{
}
BOOLEAN DLL_EXPORT ERR_post(ISC_STATUS status, ...)
{
return TRUE;
}
}
} // extern "C"

8
src/gpre/gpre_proto.h
View File

@ -26,10 +26,6 @@
#include "../gpre/parse.h"
#ifdef __cplusplus
extern "C" {
#endif
extern void CPR_abort(void);
#ifdef DEV_BUILD
extern void CPR_assert(TEXT *, int);
@ -46,8 +42,4 @@ extern void CPR_s_error(TEXT *);
extern TXT CPR_start_text(void);
extern TOK CPR_token(void);
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /* _GPRE_GPRE_PROTO_H_ */

8
src/gpre/hsh.cpp
View File

@ -25,7 +25,7 @@
//
//____________________________________________________________
//
// $Id: hsh.cpp,v 1.11 2003-09-05 10:14:08 aafemt Exp $
// $Id: hsh.cpp,v 1.12 2003-09-06 00:52:10 brodsom Exp $
//
#include "firebird.h"
@ -36,9 +36,6 @@
#include "../gpre/msc_proto.h"
extern "C" {
static int hash(SCHAR *);
static BOOLEAN scompare(SCHAR *, SCHAR *);
static BOOLEAN scompare2(SCHAR *, SCHAR *);
@ -273,6 +270,3 @@ static BOOLEAN scompare2( SCHAR * string1, SCHAR * string2)
return TRUE;
}
} // extern "C"

8
src/gpre/hsh_proto.h
View File

@ -24,10 +24,6 @@
#ifndef _GPRE_HSH_PROTO_H_
#define _GPRE_HSH_PROTO_H_
#ifdef __cplusplus
extern "C" {
#endif
extern void HSH_fini(void);
extern void HSH_init(void);
extern void HSH_insert(SYM);
@ -35,8 +31,4 @@ extern SYM HSH_lookup(SCHAR *);
extern SYM HSH_lookup2(SCHAR *);
extern void HSH_remove(SYM);
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /* _GPRE_HSH_PROTO_H_ */

8
src/gpre/jrdme_proto.h
View File

@ -24,14 +24,6 @@
#ifndef _GPRE_JRDME_PROTO_H_
#define _GPRE_JRDME_PROTO_H_
#ifdef __cplusplus
extern "C" {
#endif
extern void JRDMET_init(DBB);
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /* _GPRE_JRDME_PROTO_H_ */

15
src/gpre/jrdmet.cpp
View File

@ -26,7 +26,7 @@
//
//____________________________________________________________
//
// $Id: jrdmet.cpp,v 1.8 2003-09-05 10:14:08 aafemt Exp $
// $Id: jrdmet.cpp,v 1.9 2003-09-06 00:52:10 brodsom Exp $
//
#include "firebird.h"
@ -34,14 +34,6 @@
#include "../jrd/common.h"
#include "../jrd/ods.h"
extern "C" {
struct blk {
SLONG blk_header;
};
} // extern "C"
#include "../gpre/gpre.h"
#include "../jrd/constants.h"
#define GPRE
@ -51,9 +43,6 @@ struct blk {
#include "../gpre/jrdme_proto.h"
extern "C" {
//____________________________________________________________
//
// Initialize in memory meta data.
@ -153,5 +142,3 @@ void JRDMET_init( DBB db)
}
}
} // extern "C"

8
src/gpre/lang_proto.h
View File

@ -24,10 +24,6 @@
#ifndef _GPRE_LANG_PROTO_H_
#define _GPRE_LANG_PROTO_H_
#ifdef __cplusplus
extern "C" {
#endif
extern void ADA_action(ACT, int);
extern void ADA_print_buffer(TEXT *, int);
extern int BAS_action(ACT, int);
@ -43,8 +39,4 @@ extern void INT_CXX_action(ACT, int);
extern void PAS_action(ACT, int);
extern int PLI_action(ACT, int);
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /* _GPRE_LANG_PROTO_H_ */

9
src/gpre/msc.cpp
View File

@ -25,10 +25,10 @@
//
//____________________________________________________________
//
// $Id: msc.cpp,v 1.8 2003-09-05 14:55:59 brodsom Exp $
// $Id: msc.cpp,v 1.9 2003-09-06 00:52:10 brodsom Exp $
//
//
//$Id: msc.cpp,v 1.8 2003-09-05 14:55:59 brodsom Exp $
//$Id: msc.cpp,v 1.9 2003-09-06 00:52:10 brodsom Exp $
//
// ***************************************************
@ -58,9 +58,6 @@
#include "../jrd/gds_proto.h"
extern "C" {
extern ACT cur_routine;
typedef struct spc {
@ -558,5 +555,3 @@ USN MSC_username(SCHAR * name, USHORT name_dyn)
return username;
}
} // extern "C"

8
src/gpre/msc_proto.h
View File

@ -26,10 +26,6 @@
#include "../gpre/parse.h"
#ifdef __cplusplus
extern "C" {
#endif
extern ACT MSC_action(GPRE_REQ, enum act_t);
extern UCHAR *MSC_alloc(int);
extern UCHAR *MSC_alloc_permanent(int);
@ -56,8 +52,4 @@ extern SYM MSC_symbol(enum sym_t, TEXT *, USHORT, GPRE_CTX);
extern GPRE_NOD MSC_unary(NOD_T, GPRE_NOD);
extern USN MSC_username(SCHAR *, USHORT);
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /* _GPRE_MSC_PROTO_H_ */

9
src/gpre/par.cpp
View File

@ -20,7 +20,7 @@
//
// All Rights Reserved.
// Contributor(s): ______________________________________.
// $Id: par.cpp,v 1.25 2003-09-05 14:55:58 brodsom Exp $
// $Id: par.cpp,v 1.26 2003-09-06 00:52:10 brodsom Exp $
// Revision 1.2 2000/11/27 09:26:13 fsg
// Fixed bugs in gpre to handle PYXIS forms
// and allow edit.e and fred.e to go through
@ -37,7 +37,7 @@
//
//____________________________________________________________
//
// $Id: par.cpp,v 1.25 2003-09-05 14:55:58 brodsom Exp $
// $Id: par.cpp,v 1.26 2003-09-06 00:52:10 brodsom Exp $
//
#include "firebird.h"
@ -59,9 +59,6 @@
#include "../gpre/sql_proto.h"
extern "C" {
ACT cur_routine;
extern TEXT* module_lc_ctype;
@ -3971,5 +3968,3 @@ static BOOLEAN terminator()
return FALSE;
}
} // extern "C"

8
src/gpre/par_proto.h
View File

@ -24,10 +24,6 @@
#ifndef _GPRE_PAR_PROTO_H_
#define _GPRE_PAR_PROTO_H_
#ifdef __cplusplus
extern "C" {
#endif
extern ACT PAR_action(TEXT*);
extern SSHORT PAR_blob_subtype(DBB);
extern ACT PAR_database(USHORT, TEXT*);
@ -46,8 +42,4 @@ extern SYM PAR_symbol(enum sym_t);
extern void PAR_unwind(void);
extern void PAR_using_db(void);
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /* _GPRE_PAR_PROTO_H_ */

7
src/gpre/pat.cpp
View File

@ -24,7 +24,7 @@
//
//____________________________________________________________
//
// $Id: pat.cpp,v 1.9 2003-09-05 10:14:08 aafemt Exp $
// $Id: pat.cpp,v 1.10 2003-09-06 00:52:10 brodsom Exp $
//
#include "firebird.h"
@ -38,9 +38,6 @@
#include "../gpre/lang_proto.h"
extern "C" {
extern TEXT *ident_pattern;
typedef enum {
@ -439,5 +436,3 @@ void PATTERN_expand( USHORT column, TEXT * pattern, PAT * args)
}
}
} // extern "C"

8
src/gpre/pat_proto.h
View File

@ -24,14 +24,6 @@
#ifndef _GPRE_PAT_PROTO_H_
#define _GPRE_PAT_PROTO_H_
#ifdef __cplusplus
extern "C" {
#endif
extern void PATTERN_expand(USHORT, TEXT *, PAT *);
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /* _GPRE_PAT_PROTO_H_ */

7
src/gpre/sqe.cpp
View File

@ -37,7 +37,7 @@
//
//____________________________________________________________
//
// $Id: sqe.cpp,v 1.13 2003-09-05 14:55:58 brodsom Exp $
// $Id: sqe.cpp,v 1.14 2003-09-06 00:52:10 brodsom Exp $
//
#include "firebird.h"
#include <stdio.h>
@ -56,9 +56,6 @@
#include "../gpre/sql_proto.h"
extern "C" {
#define ERROR_LENGTH 256
struct scope {
@ -3678,5 +3675,3 @@ static void dialect1_bad_type(USHORT field_dtype)
PAR_error(buffer);
}
} // extern "C"

8
src/gpre/sqe_proto.h
View File

@ -24,10 +24,6 @@
#ifndef _GPRE_SQE_PROTO_H_
#define _GPRE_SQE_PROTO_H_
#ifdef __cplusplus
extern "C" {
#endif
typedef GPRE_NOD(*pfn_SQE_list_cb) (GPRE_REQ, BOOLEAN, USHORT *, USHORT *);
extern GPRE_NOD SQE_boolean(GPRE_REQ, USHORT *);
@ -42,8 +38,4 @@ extern RSE SQE_select(GPRE_REQ, USHORT);
extern GPRE_NOD SQE_value(GPRE_REQ, BOOLEAN, USHORT *, USHORT *);
extern REF SQE_variable(GPRE_REQ, BOOLEAN);
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /* _GPRE_SQE_PROTO_H_ */

8
src/gpre/sql.cpp
View File

@ -25,7 +25,7 @@
//
//____________________________________________________________
//
// $Id: sql.cpp,v 1.16 2003-09-05 14:55:58 brodsom Exp $
// $Id: sql.cpp,v 1.17 2003-09-06 00:52:10 brodsom Exp $
//
#include "firebird.h"
@ -49,9 +49,6 @@
#include "../gpre/sql_proto.h"
extern "C" {
#define ERROR_LENGTH 128
#ifdef FLINT_CACHE
#define MIN_CACHE_BUFFERS 250
@ -6449,6 +6446,3 @@ static void dialect1_bad_type(USHORT field_dtype)
s);
PAR_error(buffer);
}
} // extern "C"

8
src/gpre/sql_proto.h
View File

@ -24,10 +24,6 @@
#ifndef _GPRE_SQL_PROTO_H_
#define _GPRE_SQL_PROTO_H_
#ifdef __cplusplus
extern "C" {
#endif
extern ACT SQL_action(TEXT*);
extern void SQL_adjust_field_dtype(GPRE_FLD);
extern void SQL_init(void);
@ -40,8 +36,4 @@ extern GPRE_REL SQL_view(GPRE_REQ, TEXT *, TEXT *, TEXT *, BOOLEAN);
extern void SQL_relation_name(TEXT *, TEXT *, TEXT *);
extern TEXT *SQL_var_or_string(BOOLEAN);
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /* _GPRE_SQL_PROTO_H_ */

8
src/qli/hsh_proto.h
View File

@ -24,18 +24,10 @@
#ifndef _QLI_HSH_PROTO_H_
#define _QLI_HSH_PROTO_H_
#ifdef __cplusplus
extern "C" {
#endif
extern void HSH_fini (void);
extern void HSH_init (void);
extern void HSH_insert (struct sym *);
extern struct sym *HSH_lookup (SCHAR *, int);
extern void HSH_remove (struct sym *);
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /* _QLI_HSH_PROTO_H_ */

10
src/wal/wal.cpp
View File

@ -39,6 +39,7 @@
#include "gen/codes.h"
#include "../wal/wal_proto.h"
#include "../wal/walc_proto.h"
#include "../wal/walw_proto.h"
#include "../jrd/gds_proto.h"
#include "../jrd/iberr_proto.h"
#include "../jrd/isc_proto.h"
@ -83,13 +84,6 @@
#endif
extern "C" {
#ifdef SUPERSERVER
extern void main_walw(SCHAR **);
#endif
static SLONG copy_buffer(WALS, WALBLK *, UCHAR *, USHORT, UCHAR *, USHORT);
static SSHORT fork_writer(ISC_STATUS *, WAL);
static SSHORT grpc_do_group_commit(ISC_STATUS *, WAL, SSHORT);
@ -1721,5 +1715,3 @@ USHORT len2, SLONG * log_seqno, SLONG * log_offset, SSHORT ckpt)
}
} // extern "C"

8
src/wal/wal_proto.h
View File

@ -29,10 +29,6 @@
#ifndef _WAL_WAL_PROTO_H_
#define _WAL_WAL_PROTO_H_
#ifdef __cplusplus
extern "C" {
#endif
extern SSHORT WAL_attach (ISC_STATUS *, struct wal **, SCHAR *);
extern SSHORT WAL_checkpoint_finish (ISC_STATUS *, struct wal *, SLONG *, SCHAR *, SLONG *, SLONG *);
extern SSHORT WAL_checkpoint_force (ISC_STATUS *, struct wal *, SLONG *, SCHAR *, SLONG *, SLONG *);
@ -55,8 +51,4 @@ extern SSHORT WAL_shutdown (ISC_STATUS *, struct wal *, SLONG *, SCHAR *, SLONG
extern SSHORT WAL_shutdown_old_writer (ISC_STATUS *, SCHAR *);
extern SSHORT WAL_status (ISC_STATUS *, struct wal *, SLONG *, SCHAR *, SLONG *, SLONG *, SLONG *, SCHAR *, SLONG *, SLONG *);
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /* _WAL_WAL_PROTO_H_ */

10
src/wal/walw.cpp
View File

@ -91,9 +91,6 @@
#endif
extern "C" {
#ifdef SUPERSERVER
#define exit(code) return (code)
#ifdef WIN_NT
@ -166,7 +163,7 @@ static SSHORT write_wal_block(ISC_STATUS *, WALBLK *, SCHAR *, SLONG);
static void write_wal_statistics(WAL);
static WAL_TERMINATOR(log_terminator_block);
static SSHORT WALW_writer(ISC_STATUS * status_vector, WAL WAL_handle);
#ifdef SUPERSERVER
int main_walw( char **argv)
@ -262,7 +259,6 @@ int CLIB_ROUTINE main( int argc, char **argv)
return 0;
}
#ifdef VMS
void ERR_post(stuff)
ISC_STATUS stuff;
@ -332,7 +328,7 @@ void ERR_post(stuff)
#endif
SSHORT WALW_writer(ISC_STATUS * status_vector, WAL WAL_handle)
static SSHORT WALW_writer(ISC_STATUS * status_vector, WAL WAL_handle)
{
/**************************************
*
@ -2331,5 +2327,3 @@ static void write_wal_statistics( WAL WAL_handle)
}
} // extern "C"

10
src/wal/walw_proto.h
View File

@ -24,14 +24,8 @@
#ifndef _WAL_WALW_PROTO_H_
#define _WAL_WALW_PROTO_H_
#ifdef __cplusplus
extern "C" {
#endif
extern SSHORT WALW_writer (ISC_STATUS *, struct wal *);
#ifdef __cplusplus
} /* extern "C" */
#ifdef SUPERSERVER
extern int main_walw(SCHAR **);
#endif
#endif /* _WAL_WALW_PROTO_H_ */