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

-Comment some common.h unused macros

Browse Source 
-Replace VA_START macro with va_start function (it was already some places where it is not used)
This commit is contained in:
brodsom 2004-05-23 23:28:06 +00:00
parent 318e4944ee
commit 75a0483d75
32 changed files with 72 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/burp/burp.cpp
View File

@ -2062,7 +2062,7 @@ static void burp_output( const SCHAR* format, ...)
(UCHAR*)(""));
}
else if (tdgbl->sw_redirect == REDIRECT && tdgbl->output_file != NULL) {
VA_START(arglist, format);
va_start(arglist, format);
vfprintf(tdgbl->output_file, format, arglist);
va_end(arglist);
exit_code =
@ -2070,7 +2070,7 @@ static void burp_output( const SCHAR* format, ...)
(UCHAR*)(""));
}
else {
VA_START(arglist, format);
va_start(arglist, format);
vsprintf((char *) buf, format, arglist);
va_end(arglist);

4
src/dsql/array.epp
View File

@ -397,7 +397,7 @@ static ISC_STATUS error( ISC_STATUS* status, SSHORT count, ...)
ISC_STATUS* stat;
va_list ptr;
VA_START(ptr, count);
va_start(ptr, count);
stat = status;
*stat++ = isc_arg_gds;
@ -622,7 +622,7 @@ static ISC_STATUS stuff_args(gen_t* gen, SSHORT count, ...)
gen->gen_end = new_sdl + new_len;
}
VA_START(ptr, count);
va_start(ptr, count);
for (; count; --count) {
c = va_arg(ptr, int);

2
src/dsql/blob.epp
View File

@ -292,7 +292,7 @@ static ISC_STATUS error( ISC_STATUS* status, SSHORT count, ...)
ISC_STATUS *stat;
va_list ptr;
VA_START(ptr, count);
va_start(ptr, count);
stat = status;
*stat++ = isc_arg_gds;

2
src/dsql/errd.cpp
View File

@ -164,7 +164,7 @@ bool ERRD_post_warning(ISC_STATUS status, ...)
// meaning; if sizeof(long) != sizeof(void*), this code WILL crash something.
VA_START(args, status);
va_start(args, status);
ISC_STATUS* status_vector = ((tsql*) DSQL_get_thread_data())->tsql_status;
int indx = 0;

4
src/dsql/parse.cpp
View File

@ -9244,7 +9244,7 @@ static dsql_nod* make_node (NOD_TYPE type,
node->nod_count = count;
dsql_nod** p = node->nod_arg;
va_list ptr;
VA_START (ptr, count);
va_start (ptr, count);
while (--count >= 0)
*p++ = va_arg (ptr, dsql_nod*);
@ -9278,7 +9278,7 @@ static dsql_nod* make_flag_node (NOD_TYPE type,
node->nod_count = count;
dsql_nod** p = node->nod_arg;
va_list ptr;
VA_START (ptr, count);
va_start (ptr, count);
while (--count >= 0)
*p++ = va_arg (ptr, dsql_nod*);

4
src/dsql/parse.y
View File

@ -4446,7 +4446,7 @@ static dsql_nod* make_node (NOD_TYPE type,
node->nod_count = count;
dsql_nod** p = node->nod_arg;
va_list ptr;
VA_START (ptr, count);
va_start (ptr, count);
while (--count >= 0)
*p++ = va_arg (ptr, dsql_nod*);
@ -4480,7 +4480,7 @@ static dsql_nod* make_flag_node (NOD_TYPE type,
node->nod_count = count;
dsql_nod** p = node->nod_arg;
va_list ptr;
VA_START (ptr, count);
va_start (ptr, count);
while (--count >= 0)
*p++ = va_arg (ptr, dsql_nod*);

2
src/dsql/user_dsql.cpp
View File

@ -1437,7 +1437,7 @@ static void error_post(ISC_STATUS status, ...)
/* Get the addresses of the argument vector and the status vector, and do
word-wise copy. */
VA_START(args, status);
va_start(args, status);
p = UDSQL_error->dsql_status;
// Copy first argument

4
src/gpre/ada.cpp
View File

@ -24,7 +24,7 @@
//
//____________________________________________________________
//
// $Id: ada.cpp,v 1.40 2004-05-13 09:46:00 brodsom Exp $
// $Id: ada.cpp,v 1.41 2004-05-23 23:24:41 brodsom Exp $
//
#include "firebird.h"
@ -3652,7 +3652,7 @@ static void printa( int column, const TEXT* string, ...)
{
va_list ptr;
VA_START(ptr, string);
va_start(ptr, string);
align(column);
vsprintf(output_buffer, string, ptr);
ADA_print_buffer(output_buffer, column);

6
src/gpre/c_cxx.cpp
View File

@ -27,7 +27,7 @@
//
//____________________________________________________________
//
// $Id: c_cxx.cpp,v 1.47 2004-05-13 22:34:27 brodsom Exp $
// $Id: c_cxx.cpp,v 1.48 2004-05-23 23:24:41 brodsom Exp $
//
#include "firebird.h"
@ -3861,7 +3861,7 @@ static void printa( int column, const char* string, ...)
{
va_list ptr;
VA_START(ptr, string);
va_start(ptr, string);
align(column);
vfprintf(out_file, string, ptr);
}
@ -3876,7 +3876,7 @@ static void printb( const TEXT* string, ...)
{
va_list ptr;
VA_START(ptr, string);
va_start(ptr, string);
vfprintf(out_file, string, ptr);
}

6
src/gpre/cob.cpp
View File

@ -27,7 +27,7 @@
//
//____________________________________________________________
//
// $Id: cob.cpp,v 1.42 2004-05-12 19:34:42 brodsom Exp $
// $Id: cob.cpp,v 1.43 2004-05-23 23:24:41 brodsom Exp $
//
// 2002.10.27 Sean Leyne - Completed removal of obsolete "DG_X86" port
// 2002.10.27 Sean Leyne - Code Cleanup, removed obsolete "UNIXWARE" port
@ -4409,7 +4409,7 @@ static void printa(const TEXT* column,
va_list ptr;
TEXT s[256];
VA_START(ptr, string);
va_start(ptr, string);
strcpy(s, column);
strcat(s, string);
strcat(s, "\n");
@ -4428,7 +4428,7 @@ static void printb(const TEXT* string, ...)
{
va_list ptr;
VA_START(ptr, string);
va_start(ptr, string);
vfprintf(out_file, string, ptr);
}
#endif

6
src/gpre/ftn.cpp
View File

@ -24,7 +24,7 @@
//
//____________________________________________________________
//
// $Id: ftn.cpp,v 1.44 2004-05-13 09:46:01 brodsom Exp $
// $Id: ftn.cpp,v 1.45 2004-05-23 23:24:41 brodsom Exp $
//
// 2002.10.28 Sean Leyne - Completed removal of obsolete "DGUX" port
// 2002.10.28 Sean Leyne - Completed removal of obsolete "SGI" port
@ -4001,7 +4001,7 @@ static void printa(const TEXT* column, const TEXT* string, ...)
va_list ptr;
SCHAR s[256];
VA_START(ptr, string);
va_start(ptr, string);
strcpy(s, column);
strcat(s, string);
strcat(s, "\n");
@ -4346,7 +4346,7 @@ static void printb(const TEXT* string, ...)
{
va_list ptr;
VA_START(ptr, string);
va_start(ptr, string);
vfprintf(out_file, string, ptr);
}
#endif

4
src/gpre/int_cxx.cpp
View File

@ -25,7 +25,7 @@
//
//____________________________________________________________
//
// $Id: int_cxx.cpp,v 1.33 2004-05-02 23:04:17 skidder Exp $
// $Id: int_cxx.cpp,v 1.34 2004-05-23 23:24:42 brodsom Exp $
//
#include "firebird.h"
@ -743,7 +743,7 @@ static void printa(const int column, const TEXT* string, ...)
{
va_list ptr;
VA_START(ptr, string);
va_start(ptr, string);
align(column);
vfprintf(out_file, string, ptr);
}

4
src/gpre/pas.cpp
View File

@ -24,7 +24,7 @@
//
//____________________________________________________________
//
// $Id: pas.cpp,v 1.37 2004-05-02 23:04:17 skidder Exp $
// $Id: pas.cpp,v 1.38 2004-05-23 23:24:42 brodsom Exp $
//
#include "firebird.h"
@ -3588,7 +3588,7 @@ static void printa( int column, const char* string, ...)
{
va_list ptr;
VA_START(ptr, string);
va_start(ptr, string);
align(column);
vfprintf(out_file, string, ptr);
}

4
src/gpre/pretty.cpp
View File

@ -25,7 +25,7 @@
//
//____________________________________________________________
//
// $Id: pretty.cpp,v 1.25 2004-05-18 21:54:56 brodsom Exp $
// $Id: pretty.cpp,v 1.26 2004-05-23 23:24:42 brodsom Exp $
//
#include "firebird.h"
@ -273,7 +273,7 @@ static int blr_format(CTL control, const char *string, ...)
{
va_list ptr;
VA_START(ptr, string);
va_start(ptr, string);
vsprintf(control->ctl_ptr, string, ptr);
while (*control->ctl_ptr)
control->ctl_ptr++;

2
src/ipserver/ipclient.cpp
View File

@ -3260,7 +3260,7 @@ ISC_STATUS GDS_START_TRANSACTION(ISC_STATUS * user_status,
// point to communications area
VA_START(args, count);
va_start(args, count);
idb = *(va_arg(args, IDB *));
CHECK_HANDLE(idb, type_idb, isc_bad_db_handle);
GET_OBJECT(idb->idb_thread);

6
src/jrd/alt.cpp
View File

@ -73,7 +73,7 @@ SLONG API_ROUTINE_VARARG isc_event_block(SCHAR** event_buffer,
**************************************/
va_list ptr;
VA_START(ptr, count);
va_start(ptr, count);
/* calculate length of event parameter block,
setting initial length to include version
@ -108,7 +108,7 @@ SLONG API_ROUTINE_VARARG isc_event_block(SCHAR** event_buffer,
*p++ = EPB_version1;
VA_START(ptr, count);
va_start(ptr, count);
i = count;
while (i--) {
@ -261,7 +261,7 @@ struct teb_t {
}
const teb_t* const end = teb + count;
VA_START(ptr, count);
va_start(ptr, count);
for (teb_t* teb_iter = teb; teb_iter < end; ++teb_iter) {
teb_iter->teb_database = va_arg(ptr, FB_API_HANDLE*);

6
src/jrd/btn.h
View File

@ -24,8 +24,8 @@
* Contributor(s): ______________________________________.
*/
#ifndef JRD_BTN_H_
#define JRD_BTN_H_
#ifndef JRD_BTN_H
#define JRD_BTN_H
#include "firebird.h" // needed for get_long
#include "memory_routines.h" // needed for get_long
@ -110,5 +110,5 @@ namespace BTreeNode {
} // namespace BTreeNode
#endif // JRD_BTN_H_
#endif // JRD_BTN_H

38
src/jrd/common.h
View File

@ -49,7 +49,7 @@
*
*/
/*
$Id: common.h,v 1.117 2004-05-20 23:04:44 skidder Exp $
$Id: common.h,v 1.118 2004-05-23 23:26:30 brodsom Exp $
*/
#ifndef JRD_COMMON_H
@ -110,9 +110,8 @@ $Id: common.h,v 1.117 2004-05-20 23:04:44 skidder Exp $
#define SET_TCP_NO_DELAY
#endif
#define KILLER_SIGNALS
//#define KILLER_SIGNALS
#define VA_START(list,parmN) va_start (list, parmN)
#define UNIX
#define IEEE
@ -219,9 +218,8 @@ static inline int sinixz_sigaction(int sig, const struct sinixz_sigaction *act,
#define SET_TCP_NO_DELAY
#endif
#define KILLER_SIGNALS
//#define KILLER_SIGNALS
#define VA_START(list,parmN) va_start (list, parmN)
#define UNIX
#define IEEE
@ -269,7 +267,7 @@ static inline int sinixz_sigaction(int sig, const struct sinixz_sigaction *act,
//#define ALIGNMENT 4
//#define DOUBLE_ALIGN 4
#define BSD_UNIX
//#define BSD_UNIX
#define UNIX
#define IMPLEMENTATION 63
#define IEEE
@ -307,7 +305,7 @@ static inline int sinixz_sigaction(int sig, const struct sinixz_sigaction *act,
#define QUADFORMAT "ll"
#define QUADCONST(n) (n##LL)
#define KILLER_SIGNALS
//#define KILLER_SIGNALS
#define NO_NFS /* no MTAB_OPEN or MTAB_CLOSE in isc_file.c */
#define MEMMOVE(from,to,length) memmove ((void *)to, (void *)from, (size_t) length)
@ -338,7 +336,7 @@ static inline int sinixz_sigaction(int sig, const struct sinixz_sigaction *act,
#define UNIX
#define KILLER_SIGNALS
//#define KILLER_SIGNALS
#define NO_NFS /* no MTAB_OPEN or MTAB_CLOSE in isc_file.c */
#define MEMMOVE(from,to,length) memmove ((void *)(to), (void *)(from), (size_t) length)
@ -359,7 +357,7 @@ static inline int sinixz_sigaction(int sig, const struct sinixz_sigaction *act,
* using pipe server.
* 1995-February-24 David Schnepper
*/
#define KILLER_SIGNALS
//#define KILLER_SIGNALS
#ifdef SOLARIS
@ -421,9 +419,9 @@ static inline int sinixz_sigaction(int sig, const struct sinixz_sigaction *act,
which is too large to fit in a long int. */
#define QUADCONST(n) (n##LL)
#else /* SOLARIS */
//#else /* SOLARIS */
#define BSD_UNIX
//#define BSD_UNIX
#endif /* SOLARIS */
@ -462,9 +460,9 @@ static inline int sinixz_sigaction(int sig, const struct sinixz_sigaction *act,
#define hpux
#endif
#define KILLER_SIGNALS
//#define KILLER_SIGNALS
#define UNIX
#define CURSES_KEYPAD
//#define CURSES_KEYPAD
//#define ALIGNMENT 8
//#define DOUBLE_ALIGN 8
@ -529,9 +527,9 @@ typedef unsigned int64 UATOM;
#ifdef _AIX /* IBM AIX */
#ifndef _POWER /* IBM RS/6000 */
#define AIX
#define KILLER_SIGNALS
//#define KILLER_SIGNALS
#define UNIX
#define CURSES_KEYPAD
//#define CURSES_KEYPAD
//*#define ALIGNMENT 4
#define IMPLEMENTATION isc_info_db_impl_isc_rt_aix /* 35 */
#define IEEE
@ -542,9 +540,9 @@ typedef unsigned int64 UATOM;
#define SYSCALL_INTERRUPTED(err) (((err) == EINTR) || ((err) == ERESTART)) /* pjpg 20001102 */
#else /* AIX PowerPC */
#define AIX_PPC
#define KILLER_SIGNALS
//#define KILLER_SIGNALS
#define UNIX
#define CURSES_KEYPAD
//#define CURSES_KEYPAD
//#define ALIGNMENT 4
#define IMPLEMENTATION isc_info_db_impl_isc_rt_aix /* 35 */
#define IEEE
@ -554,7 +552,6 @@ typedef unsigned int64 UATOM;
#define MOVE_CLEAR(to,length) memset (to, 0, (int) (length))
#define SYSCALL_INTERRUPTED(err) (((err) == EINTR) || ((err) == ERESTART)) /* pjpg 20001102 */
#define VA_START(list,parmN) va_start (list, parmN) /* TMC 081700 */
#define QUADFORMAT "ll" /* TMC 081700 */
#define QUADCONST(n) (n##LL) /* TMC 081700 */
@ -614,7 +611,6 @@ typedef unsigned __int64 UINT64;
#endif
#define IEEE
#define VA_START(list,parmN) va_start (list, parmN)
#define API_ROUTINE __stdcall
#define API_ROUTINE_VARARG __cdecl
#define CLIB_ROUTINE __cdecl
@ -830,10 +826,6 @@ typedef struct
#define LINEFORMAT "ld"
#endif
/* variable argument definitions */
#define VA_START(list,parmN) va_start (list, parmN)
/* conditional compilation macros */

2
src/jrd/err.cpp
View File

@ -314,7 +314,7 @@ bool ERR_post_warning(ISC_STATUS status, ...)
int indx = 0, warning_indx = 0;
ISC_STATUS* status_vector;
VA_START(args, status);
va_start(args, status);
status_vector = ((thread_db*) JRD_get_thread_data())->tdbb_status_vector;
if (status_vector[0] != isc_arg_gds ||

6
src/jrd/gds.cpp
View File

@ -1140,7 +1140,7 @@ void API_ROUTINE gds__log(const TEXT* text, ...)
{
fprintf(file, "\n%s%s\t%.25s\t",
ISC_get_host(name, MAXPATHLEN), gdslogid, ctime(&now));
VA_START(ptr, text);
va_start(ptr, text);
vfprintf(file, text, ptr);
fprintf(file, "\n\n");
fclose(file);
@ -2733,7 +2733,7 @@ static void blr_error(gds_ctl* control, const TEXT* string, ...)
USHORT offset;
va_list args;
VA_START(args, string);
va_start(args, string);
blr_format(control, string, args);
offset = 0;
blr_print_line(control, (SSHORT) offset);
@ -2755,7 +2755,7 @@ static void blr_format(gds_ctl* control, const char* string, ...)
**************************************/
va_list ptr;
VA_START(ptr, string);
va_start(ptr, string);
vsprintf(control->ctl_ptr, string, ptr);
while (*control->ctl_ptr)
control->ctl_ptr++;

2
src/jrd/iberr.h
View File

@ -52,7 +52,7 @@
#define STUFF_STATUS(status_vector,status) \
{ \
va_list args; \
VA_START (args, status); \
va_start (args, status); \
STUFF_STATUS_function(status_vector, status, args); \
}

2
src/jrd/jrd.cpp
View File

@ -3647,7 +3647,7 @@ ISC_STATUS GDS_START_TRANSACTION(ISC_STATUS * user_status,
TEB* teb;
const TEB* end;
va_list ptr;
VA_START(ptr, count);
va_start(ptr, count);
for (teb = tebs, end = teb + count; teb < end; teb++) {
teb->teb_database = va_arg(ptr, Attachment**);

2
src/jrd/log.cpp
View File

@ -210,7 +210,7 @@ void LOG_call(enum log_t call_type, ...)
log_char((SCHAR) call_type);
VA_START(ptr, call_type);
va_start(ptr, call_type);
/* using the argument types described in the table,
pop the arguments off the call stack and put

4
src/jrd/met.epp
View File

@ -37,7 +37,7 @@
* 2004.01.16 Vlad Horsun: added support for default parameters
*/
/*
$Id: met.epp,v 1.124 2004-05-23 03:18:09 brodsom Exp $
$Id: met.epp,v 1.125 2004-05-23 23:26:30 brodsom Exp $
*/
// This MUST be at the top of the file
#ifdef DARWIN
@ -782,7 +782,7 @@ void MET_error(const TEXT* string, ...)
TEXT s[128];
va_list ptr;
VA_START(ptr, string);
va_start(ptr, string);
vsprintf(s, string, ptr);
ERR_post(isc_no_meta_update, isc_arg_gds, isc_random, isc_arg_string,

4
src/jrd/par.cpp
View File

@ -605,7 +605,7 @@ static void error(CompilerScratch* csb, ...)
/* Don't bother to pass tdbb for error handling */
thread_db* tdbb = JRD_get_thread_data();
VA_START(args, csb);
va_start(args, csb);
csb->csb_running--;
offset = csb->csb_running - csb->csb_blr;
@ -2997,7 +2997,7 @@ static void warning(CompilerScratch* csb, ...)
thread_db* tdbb = JRD_get_thread_data();
VA_START(args, csb);
va_start(args, csb);
p = tdbb->tdbb_status_vector;

2
src/jrd/sdl.cpp
View File

@ -569,7 +569,7 @@ static ISC_STATUS error(ISC_STATUS * status_vector, ...)
/* Get the addresses of the argument vector and the status vector, and do
word-wise copy. */
VA_START(args, status_vector);
va_start(args, status_vector);
p = status_vector;
/* Copy first argument */

8
src/jrd/utl.cpp
View File

@ -362,7 +362,7 @@ void API_ROUTINE_VARARG isc_expand_dpb(SCHAR** dpb, SSHORT* dpb_size, ...)
new_dpb_length = 1;
}
VA_START(args, dpb_size);
va_start(args, dpb_size);
while (type = va_arg(args, int))
{
@ -431,7 +431,7 @@ void API_ROUTINE_VARARG isc_expand_dpb(SCHAR** dpb, SSHORT* dpb_size, ...)
/* copy in the new runtime items */
VA_START(args, dpb_size);
va_start(args, dpb_size);
while (type = va_arg(args, int))
{
@ -704,7 +704,7 @@ SLONG API_ROUTINE gds__event_block(SCHAR ** event_buffer,
va_list ptr;
USHORT i;
VA_START(ptr, count);
va_start(ptr, count);
/* calculate length of event parameter block,
setting initial length to include version
@ -741,7 +741,7 @@ SLONG API_ROUTINE gds__event_block(SCHAR ** event_buffer,
*p++ = EPB_version1;
VA_START(ptr, count);
va_start(ptr, count);
i = count;
while (i--) {

2
src/jrd/val.cpp
View File

@ -764,7 +764,7 @@ static RTN corrupt(thread_db* tdbb, VDR control, USHORT err_code, jrd_rel* relat
TEXT s[256];
va_list ptr;
VA_START(ptr, relation);
va_start(ptr, relation);
SET_TDBB(tdbb);
Attachment* att = tdbb->tdbb_attachment;

4
src/jrd/why.cpp
View File

@ -42,7 +42,7 @@
*
*/
/*
$Id: why.cpp,v 1.72 2004-05-21 06:15:42 robocop Exp $
$Id: why.cpp,v 1.73 2004-05-23 23:26:31 brodsom Exp $
*/
#include "firebird.h"
@ -4823,7 +4823,7 @@ ISC_STATUS API_ROUTINE_VARARG GDS_START_TRANSACTION(ISC_STATUS * user_status,
}
end = teb + count;
VA_START(ptr, count);
va_start(ptr, count);
for (; teb < end; teb++) {
teb->teb_database = va_arg(ptr, FB_API_HANDLE*);

2
src/remote/interface.cpp
View File

@ -6129,7 +6129,7 @@ static void move_error( ISC_STATUS status, ...)
have been handed to us, then post the error.
N.B., one of the supplied errors should be a 'isc_arg_end' */
VA_START(ap, status);
va_start(ap, status);
TRDB tdrdb = REM_get_thread_data();
p_args = tdrdb->trdb_status_vector;

2
src/utilities/gsec/gsec.cpp
View File

@ -1177,7 +1177,7 @@ static void util_output( const SCHAR* format, ...)
else {
UCHAR buf[1000];
va_list arglist;
VA_START(arglist, format);
va_start(arglist, format);
vsprintf((char *) buf, format, arglist);
va_end(arglist);
exit_code = tdsec->tsec_output_proc(tdsec->tsec_output_data, buf);

2
src/utilities/install/install_svc.cpp
View File

@ -530,7 +530,7 @@ void API_ROUTINE gds__log(const TEXT* text, ...)
{
va_list ptr;
VA_START(ptr, text);
va_start(ptr, text);
vprintf(text, ptr);
printf("\n\n");
}