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

Please MSVC14:

Browse Source 
-add space before XXXFORMAT macros to not confuse it with user-defined literals

-use existing snprintf

This should fix part of the issues at CORE-5099 and CORE-5120
This commit is contained in:
hvlad 2016-03-17 12:15:08 +02:00
parent 21b76bf44f
commit 9ae426a757
57 changed files with 421 additions and 417 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/alice/alice.cpp
View File

@ -308,7 +308,7 @@ int alice(Firebird::UtilSvc* uSvc)
ALICE_error(10); // msg 10: transaction number or "all" required
}
ALICE_upper_case(*argv++, string, sizeof(string));
if (!sscanf(string, "%"SQUADFORMAT, &tdgbl->ALICE_data.ua_transaction))
if (!sscanf(string, "%" SQUADFORMAT, &tdgbl->ALICE_data.ua_transaction))
{
if (strcmp(string, "ALL")) {
ALICE_error(10); // msg 10: transaction number or "all" required

4
src/burp/burp.cpp
View File

@ -131,8 +131,8 @@ static const StatFormat STAT_FORMATS[] =
{
{"time", "%4lu.%03u ", 9},
{"delta", "%2lu.%03u ", 7},
{"reads", "%6"UQUADFORMAT" ", 7},
{"writes", "%6"UQUADFORMAT" ", 7}
{"reads", "%6" UQUADFORMAT" ", 7},
{"writes", "%6" UQUADFORMAT" ", 7}
};

2
src/burp/restore.epp
View File

@ -1171,7 +1171,7 @@ void fix_security_class_name(BurpGlobals* tdgbl, TEXT* sec_class, bool is_field)
fb_assert(id);
snprintf(sec_class, MAX_SQL_IDENTIFIER_SIZE, "%s%"SQUADFORMAT, prefix, id);
snprintf(sec_class, MAX_SQL_IDENTIFIER_SIZE, "%s%" SQUADFORMAT, prefix, id);
}
void general_on_error()

2
src/burp/split/spit.cpp
View File

@ -264,7 +264,7 @@ int main( int argc, char* argv[])
if (strlen(string) > MAX_FILE_NM_LEN)
{
fprintf(stderr, "%s: file name %s is too long\n", prog_name, string);
fprintf(stderr, "%s: maximum length of file name is %"SIZEFORMAT" bytes\n",
fprintf(stderr, "%s: maximum length of file name is %" SIZEFORMAT" bytes\n",
prog_name, MAX_FILE_NM_LEN);
print_clo(prog_name);
free_file_list(file_list);

2
src/common/gdsassert.h
View File

@ -37,7 +37,7 @@
inline void fb_assert_impl(const char* msg, const char* file, int line, bool do_abort)
{
const char* const ASSERT_FAILURE_STRING = "Assertion (%s) failure: %s %"LINEFORMAT"\n";
const char* const ASSERT_FAILURE_STRING = "Assertion (%s) failure: %s %" LINEFORMAT"\n";
if (isatty(2))
fprintf(stderr, ASSERT_FAILURE_STRING, msg, file, line);

8
src/common/isc_sync.cpp
View File

@ -1531,7 +1531,7 @@ ULONG ISC_exception_post(ULONG sig_num, const TEXT* err_msg, ISC_STATUS& /*isc_e
break;
default:
sprintf(log_msg, "%s Unknown Exception.\n"
"\t\tException number %"ULONGFORMAT"."
"\t\tException number %" ULONGFORMAT"."
"\tThis exception will cause the Firebird server\n"
"\tto terminate abnormally.", err_msg, sig_num);
break;
@ -1695,7 +1695,7 @@ ULONG ISC_exception_post(ULONG except_code, const TEXT* err_msg, ISC_STATUS& isc
break;
default:
sprintf (log_msg, "%s An exception occurred that does\n"
"\t\tnot have a description. Exception number %"XLONGFORMAT".\n"
"\t\tnot have a description. Exception number %" XLONGFORMAT".\n"
"\tThis exception will cause the Firebird server\n"
"\tto terminate abnormally.", err_msg, except_code);
break;
@ -2351,7 +2351,7 @@ SharedMemoryBase::SharedMemoryBase(const TEXT* filename, ULONG length, IpcObject
// Create the real file mapping object.
TEXT mapping_name[64]; // enough for int32 as text
sprintf(mapping_name, "_mapping_%"ULONGFORMAT, header_address[1]);
sprintf(mapping_name, "_mapping_%" ULONGFORMAT, header_address[1]);
if (!make_object_name(object_name, sizeof(object_name), filename, mapping_name))
{
@ -3153,7 +3153,7 @@ bool SharedMemoryBase::remapFile(CheckStatusWrapper* statusVector,
while (true)
{
TEXT mapping_name[64]; // enough for int32 as text
sprintf(mapping_name, "_mapping_%"ULONGFORMAT, sh_mem_hdr_address[1] + 1);
sprintf(mapping_name, "_mapping_%" ULONGFORMAT, sh_mem_hdr_address[1] + 1);
TEXT object_name[MAXPATHLEN];
if (!make_object_name(object_name, sizeof(object_name), sh_mem_name, mapping_name))

4
src/common/os/win32/mod_loader.cpp
View File

@ -100,7 +100,9 @@ public:
#elif _MSC_VER == 1700
"msvcr110.dll",
#elif _MSC_VER == 1800
"msvcr120.dll",
"msvcr120.dll",
#elif _MSC_VER == 1900
"msvcr140.dll",
#else
#error Specify CRT DLL name here !
#endif

2
src/dsql/NodePrinter.h
View File

@ -124,7 +124,7 @@ public:
printIndent();
Firebird::string temp;
temp.printf("<%s>%"QUADFORMAT"d</%s>\n", s.c_str(), value, s.c_str());
temp.printf("<%s>%" QUADFORMAT"d</%s>\n", s.c_str(), value, s.c_str());
text += temp;
}

10
src/gpre/c_cxx.cpp
View File

@ -875,7 +875,7 @@ static void gen_based( const act* action, int column)
if (based_on->bas_flags & BAS_segment)
{
if (*variable != '*')
fprintf(gpreGlob.out_file, "[%"SLONGFORMAT"]", length);
fprintf(gpreGlob.out_file, "[%" SLONGFORMAT"]", length);
}
else if (field->fld_array_info)
{
@ -884,7 +884,7 @@ static void gen_based( const act* action, int column)
for (const dim* dimension = field->fld_array_info->ary_dimension;
dimension; dimension = dimension->dim_next)
{
fprintf(gpreGlob.out_file, " [%"SLONGFORMAT"]", dimension->dim_upper - dimension->dim_lower + 1);
fprintf(gpreGlob.out_file, " [%" SLONGFORMAT"]", dimension->dim_upper - dimension->dim_lower + 1);
}
if (field->fld_array_info->ary_dtype <= dtype_varying && field->fld_length > 1)
@ -1576,7 +1576,7 @@ static void gen_drop_database( const act* action, int column)
const gpre_dbb* db = (gpre_dbb*) action->act_object;
align(column);
fprintf(gpreGlob.out_file, "isc_drop_database (%s, %"SIZEFORMAT", \"%s\", rdb$k_db_type_gds);",
fprintf(gpreGlob.out_file, "isc_drop_database (%s, %" SIZEFORMAT", \"%s\", rdb$k_db_type_gds);",
status_vector(action),
strlen(db->dbb_filename), db->dbb_filename);
set_sqlcode(action, column);
@ -3459,7 +3459,7 @@ static void gen_trans( const act* action, int column)
static void gen_type( const act* action, int column)
{
printa(column, "%"SLONGFORMAT, (SLONG)(IPTR)action->act_object);
printa(column, "%" SLONGFORMAT, (SLONG)(IPTR)action->act_object);
}
@ -3615,7 +3615,7 @@ static void make_array_declaration(ref* reference)
for (const dim* dimension = field->fld_array_info->ary_dimension; dimension;
dimension = dimension->dim_next)
{
fprintf(gpreGlob.out_file, " [%"SLONGFORMAT"]", dimension->dim_upper - dimension->dim_lower + 1);
fprintf(gpreGlob.out_file, " [%" SLONGFORMAT"]", dimension->dim_upper - dimension->dim_lower + 1);
}
if (field->fld_array_info->ary_dtype <= dtype_varying)

6
src/gpre/exp.cpp
View File

@ -397,7 +397,7 @@ SINT64 EXP_SINT64_ordinal(bool advance_flag)
if (gpreGlob.token_global.tok_type != tok_number)
CPR_s_error("<number>");
const char format[8] = "%"SQUADFORMAT;
const char format[8] = "%" SQUADFORMAT;
SINT64 n;
sscanf(gpreGlob.token_global.tok_string, format, &n);
@ -427,7 +427,7 @@ SLONG EXP_SLONG_ordinal(bool advance_flag)
const SLONG n = atoi(gpreGlob.token_global.tok_string);
char buffer[32];
sprintf(buffer, "%"SLONGFORMAT, n);
sprintf(buffer, "%" SLONGFORMAT, n);
if (strcmp(buffer, gpreGlob.token_global.tok_string) != 0)
PAR_error("Numeric value out of range");
@ -477,7 +477,7 @@ ULONG EXP_ULONG_ordinal(bool advance_flag)
const ULONG n = atoi(gpreGlob.token_global.tok_string);
char buffer[32];
sprintf(buffer, "%"ULONGFORMAT, n);
sprintf(buffer, "%" ULONGFORMAT, n);
if (strcmp(buffer, gpreGlob.token_global.tok_string) != 0)
PAR_error("Numeric value out of range");

6
src/gpre/gpre.cpp
View File

@ -2506,9 +2506,9 @@ static void pass2( SLONG start_position)
if (line_pending)
{
if (line == 1)
fprintf(gpreGlob.out_file, "#line %"SLONGFORMAT" \"%s\"\n", line, backlash_fixed_file_name);
fprintf(gpreGlob.out_file, "#line %" SLONGFORMAT" \"%s\"\n", line, backlash_fixed_file_name);
else
fprintf(gpreGlob.out_file, "\n#line %"SLONGFORMAT" \"%s\"", line, backlash_fixed_file_name);
fprintf(gpreGlob.out_file, "\n#line %" SLONGFORMAT" \"%s\"", line, backlash_fixed_file_name);
line_pending = false;
}
@ -2649,7 +2649,7 @@ static void pass2( SLONG start_position)
{
if (c == '\n' && line_pending)
{
fprintf(gpreGlob.out_file, "\n#line %"SLONGFORMAT" \"%s\"", line + 1, backlash_fixed_file_name);
fprintf(gpreGlob.out_file, "\n#line %" SLONGFORMAT" \"%s\"", line + 1, backlash_fixed_file_name);
line_pending = false;
}
if (c == EOF)

10
src/gpre/int_cxx.cpp
View File

@ -288,7 +288,7 @@ static void gen_compile( const gpre_req* request, int column)
//const gpre_sym* symbol = db->dbb_name;
//align(column);
fprintf(gpreGlob.out_file,
"%s.compile(tdbb, (UCHAR*) jrd_%"ULONGFORMAT", sizeof(jrd_%"ULONGFORMAT"));",
"%s.compile(tdbb, (UCHAR*) jrd_%" ULONGFORMAT", sizeof(jrd_%" ULONGFORMAT"));",
request->req_handle, request->req_ident, request->req_ident);
}
@ -476,7 +476,7 @@ static void gen_receive( const gpre_req* request, const gpre_port* port)
{
fprintf(gpreGlob.out_file,
"EXE_receive (tdbb, %s, %d, %d, (UCHAR*) &jrd_%"ULONGFORMAT");",
"EXE_receive (tdbb, %s, %d, %d, (UCHAR*) &jrd_%" ULONGFORMAT");",
request->req_handle, port->por_msg_number, port->por_length,
port->por_ident);
}
@ -493,7 +493,7 @@ static void gen_request( const gpre_req* request)
if (!(request->req_flags & REQ_exp_hand))
fprintf(gpreGlob.out_file, "static void\t*%s;\t// request handle \n", request->req_handle);
fprintf(gpreGlob.out_file, "static const UCHAR\tjrd_%"ULONGFORMAT" [%d] =",
fprintf(gpreGlob.out_file, "static const UCHAR\tjrd_%" ULONGFORMAT" [%d] =",
request->req_ident, request->req_length);
align(INDENT);
fprintf(gpreGlob.out_file, "{\t// blr string \n");
@ -586,7 +586,7 @@ static void gen_send( const gpre_req* request, const gpre_port* port, int column
}
align(column);
fprintf(gpreGlob.out_file, "EXE_send (tdbb, %s, %d, %d, (UCHAR*) &jrd_%"ULONGFORMAT");",
fprintf(gpreGlob.out_file, "EXE_send (tdbb, %s, %d, %d, (UCHAR*) &jrd_%" ULONGFORMAT");",
request->req_handle, port->por_msg_number, port->por_length, port->por_ident);
}
@ -718,7 +718,7 @@ static void make_port( const gpre_port* port, int column)
fprintf(gpreGlob.out_file, fmtstr, reference->ref_ident, name);
}
align(column);
fprintf(gpreGlob.out_file, "} jrd_%"ULONGFORMAT";", port->por_ident);
fprintf(gpreGlob.out_file, "} jrd_%" ULONGFORMAT";", port->por_ident);
}

8
src/gpre/languages/ada.cpp
View File

@ -661,13 +661,13 @@ static void gen_based( const act* action, int column)
for (SSHORT i = 1; i < field->fld_array_info->ary_dimension_count;
dimension = dimension->dim_next, i++)
{
sprintf(s2, "%s range %"SLONGFORMAT"..%"SLONGFORMAT",\n ",
sprintf(s2, "%s range %" SLONGFORMAT"..%" SLONGFORMAT",\n ",
LONG_DCL, dimension->dim_lower, dimension->dim_upper);
for (p = s2; *p; p++, q++)
*q = *p;
}
sprintf(s2, "%s range %"SLONGFORMAT"..%"SLONGFORMAT") of ",
sprintf(s2, "%s range %" SLONGFORMAT"..%" SLONGFORMAT") of ",
LONG_DCL, dimension->dim_lower, dimension->dim_upper);
for (p = s2; *p; p++, q++)
*q = *p;
@ -3217,11 +3217,11 @@ static void make_array_declaration( ref* reference, int column)
i < field->fld_array_info->ary_dimension_count;
dimension = dimension->dim_next, ++i)
{
fprintf(gpreGlob.out_file, "%s range %"SLONGFORMAT"..%"SLONGFORMAT",\n ",
fprintf(gpreGlob.out_file, "%s range %" SLONGFORMAT"..%" SLONGFORMAT",\n ",
LONG_DCL, dimension->dim_lower, dimension->dim_upper);
}
fprintf(gpreGlob.out_file, "%s range %"SLONGFORMAT"..%"SLONGFORMAT") of ",
fprintf(gpreGlob.out_file, "%s range %" SLONGFORMAT"..%" SLONGFORMAT") of ",
LONG_DCL, dimension->dim_lower, dimension->dim_upper);
switch (field->fld_array_info->ary_dtype)

4
src/gpre/languages/cob.cpp
View File

@ -66,8 +66,8 @@ static const char* const BY_VALUE = "BY VALUE ";
static const char* const END_VALUE = "";
static const char* const BY_REF = "BY REFERENCE ";
static const char* const BY_DESC = "BY REFERENCE ";
static const char* const RAW_BLR_TEMPLATE = "03 %s%d%s%d PIC XXXX USAGE COMP-X VALUE IS %"ULONGFORMAT".";
static const char* const RAW_TPB_TEMPLATE = "03 %s%d%s%d PIC XXXX USAGE COMP-X VALUE IS %"ULONGFORMAT".";
static const char* const RAW_BLR_TEMPLATE = "03 %s%d%s%d PIC XXXX USAGE COMP-X VALUE IS %" ULONGFORMAT".";
static const char* const RAW_TPB_TEMPLATE = "03 %s%d%s%d PIC XXXX USAGE COMP-X VALUE IS %" ULONGFORMAT".";
static const char* const COMP_VALUE = "COMP-5";
#else
static const char* const COMP_VALUE = "COMP";

24
src/gpre/languages/ftn.cpp
View File

@ -838,7 +838,7 @@ static void gen_based(const act* action)
break;
case dtype_text:
fprintf(gpreGlob.out_file, "%sCHARACTER*%"SLONGFORMAT"%s", COLUMN,
fprintf(gpreGlob.out_file, "%sCHARACTER*%" SLONGFORMAT"%s", COLUMN,
(based_on->bas_flags & BAS_segment) ? length : ((field->fld_array_info) ?
field->fld_array->fld_length : field->fld_length),
COLUMN);
@ -881,9 +881,9 @@ static void gen_based(const act* action)
dimension = dimension->dim_next)
{
if (dimension->dim_lower != 1)
fprintf(gpreGlob.out_file, "%"SLONGFORMAT":", dimension->dim_lower);
fprintf(gpreGlob.out_file, "%" SLONGFORMAT":", dimension->dim_lower);
fprintf(gpreGlob.out_file, "%"SLONGFORMAT, dimension->dim_upper);
fprintf(gpreGlob.out_file, "%" SLONGFORMAT, dimension->dim_upper);
if (dimension->dim_next)
fprintf(gpreGlob.out_file, ", ");
}
@ -1202,14 +1202,14 @@ static void gen_create_database(const act* action)
if (request->req_length || request->req_flags & REQ_extend_dpb)
sprintf(output_buffer,
"%sCALL ISC_CREATE_DATABASE (%s, %s%"SIZEFORMAT"%s, %s'%s'%s, %s, %s%s%s, %s, 0)\n",
"%sCALL ISC_CREATE_DATABASE (%s, %s%" SIZEFORMAT"%s, %s'%s'%s, %s, %s%s%s, %s, 0)\n",
COLUMN,
status_vector(),
I2CONST_1, strlen(db->dbb_filename), I2CONST_2,
REF_1, db->dbb_filename, REF_2,
db->dbb_name->sym_string, I2CONST_1, s1, I2CONST_2, s2);
else
sprintf(output_buffer, "%sCALL ISC_CREATE_DATABASE (%s, %s%"SIZEFORMAT"%s, %s'%s'%s, %s, %s0%s, 0, 0)\n",
sprintf(output_buffer, "%sCALL ISC_CREATE_DATABASE (%s, %s%" SIZEFORMAT"%s, %s'%s'%s, %s, %s0%s, 0, 0)\n",
COLUMN,
status_vector(),
I2CONST_1, strlen(db->dbb_filename), I2CONST_2,
@ -1599,7 +1599,7 @@ static void gen_drop_database(const act* action)
{
const gpre_dbb* db = (gpre_dbb*) action->act_object;
sprintf(output_buffer, "%s CALL ISC_DROP_DATABASE (%s, %s%"SIZEFORMAT"%s, %s\'%s\'%s, RDB_K_DB_TYPE_GDS)\n",
sprintf(output_buffer, "%s CALL ISC_DROP_DATABASE (%s, %s%" SIZEFORMAT"%s, %s\'%s\'%s, RDB_K_DB_TYPE_GDS)\n",
COLUMN,
status_vector(),
I2_1, strlen(db->dbb_filename), I2_2,
@ -2690,9 +2690,9 @@ static void gen_raw(const UCHAR* blr, req_t request_type, int request_length, in
}
}
if (blr_length)
sprintf(p, "%"SLONGFORMAT",", blr_hunk.longword_blr);
sprintf(p, "%" SLONGFORMAT",", blr_hunk.longword_blr);
else
sprintf(p, "%"SLONGFORMAT, blr_hunk.longword_blr);
sprintf(p, "%" SLONGFORMAT, blr_hunk.longword_blr);
while (*p)
p++;
if (p - buffer > 50)
@ -3457,9 +3457,9 @@ static void gen_tpb_data(const tpb* tpb_buffer)
break;
}
if (length)
sprintf(p, "%"SLONGFORMAT",", tpb_hunk.longword_tpb);
sprintf(p, "%" SLONGFORMAT",", tpb_hunk.longword_tpb);
else
sprintf(p, "%"SLONGFORMAT"/\n", tpb_hunk.longword_tpb);
sprintf(p, "%" SLONGFORMAT"/\n", tpb_hunk.longword_tpb);
p += 12; // ???
}
@ -3655,9 +3655,9 @@ static void make_array_declaration( const ref* reference)
dimension = dimension->dim_next)
{
if (dimension->dim_lower != 1)
fprintf(gpreGlob.out_file, "%"SLONGFORMAT":", dimension->dim_lower);
fprintf(gpreGlob.out_file, "%" SLONGFORMAT":", dimension->dim_lower);
fprintf(gpreGlob.out_file, "%"SLONGFORMAT, dimension->dim_upper);
fprintf(gpreGlob.out_file, "%" SLONGFORMAT, dimension->dim_upper);
if (dimension->dim_next)
fprintf(gpreGlob.out_file, ", ");
}

6
src/gpre/languages/pas.cpp
View File

@ -692,7 +692,7 @@ static void gen_based( const act* action, int column)
SLONG length = field->fld_seg_length;
if (!length)
length = 256;
fprintf(gpreGlob.out_file, "%s [1..%"SLONGFORMAT"] of ", PACKED_ARRAY, length);
fprintf(gpreGlob.out_file, "%s [1..%" SLONGFORMAT"] of ", PACKED_ARRAY, length);
}
else if (field->fld_array_info)
{
@ -705,7 +705,7 @@ static void gen_based( const act* action, int column)
for (dim* dimension = field->fld_array_info->ary_dimension; dimension;
dimension = dimension->dim_next)
{
fprintf(gpreGlob.out_file, "%"SLONGFORMAT"..%"SLONGFORMAT, dimension->dim_lower,
fprintf(gpreGlob.out_file, "%" SLONGFORMAT"..%" SLONGFORMAT, dimension->dim_lower,
dimension->dim_upper);
if (dimension->dim_next)
fprintf(gpreGlob.out_file, ", ");
@ -3172,7 +3172,7 @@ static void make_array_declaration( const ref* reference)
for (const dim* dimension = field->fld_array_info->ary_dimension; dimension;
dimension = dimension->dim_next)
{
fprintf(gpreGlob.out_file, "%"SLONGFORMAT"..%"SLONGFORMAT, dimension->dim_lower,
fprintf(gpreGlob.out_file, "%" SLONGFORMAT"..%" SLONGFORMAT, dimension->dim_lower,
dimension->dim_upper);
if (dimension->dim_next)
fprintf(gpreGlob.out_file, ", ");

16
src/gpre/languages/rmc.cpp
View File

@ -1101,7 +1101,7 @@ static void gen_based( const act* action)
if (strlen(gpreGlob.sw_cob_dformat) == 0)
fprintf(gpreGlob.out_file, "%sPIC S9(19)%s", names[COLUMN], USAGE_BINARY8);
else
fprintf(gpreGlob.out_file, "%sPIC X(%"SIZEFORMAT")", names[COLUMN], strlen(gpreGlob.sw_cob_dformat));
fprintf(gpreGlob.out_file, "%sPIC X(%" SIZEFORMAT")", names[COLUMN], strlen(gpreGlob.sw_cob_dformat));
break;
case dtype_sql_date:
@ -1109,7 +1109,7 @@ static void gen_based( const act* action)
if (strlen(gpreGlob.sw_cob_dformat) == 0)
fprintf(gpreGlob.out_file, "%sPIC S9(10)%s", names[COLUMN], USAGE_BINARY4);
else
fprintf(gpreGlob.out_file, "%sPIC X(%"SIZEFORMAT")", names[COLUMN], strlen(gpreGlob.sw_cob_dformat));
fprintf(gpreGlob.out_file, "%sPIC X(%" SIZEFORMAT")", names[COLUMN], strlen(gpreGlob.sw_cob_dformat));
break;
case dtype_blob:
@ -1554,7 +1554,7 @@ static void gen_create_database( const act* action)
sprintf(dbname, "%s%ddb", names[isc_b_pos], db->dbb_id);
sprintf(output_buffer, "%sCALL \"%s\" USING %s, %"SIZEFORMAT", %s, %s, %s, %s, 0\n",
sprintf(output_buffer, "%sCALL \"%s\" USING %s, %" SIZEFORMAT", %s, %s, %s, %s, 0\n",
names[COLUMN],
ISC_CREATE_DATABASE,
status_vector(action),
@ -1716,12 +1716,12 @@ static void gen_database( const act* action)
db->dbb_id = ++count;
if (db->dbb_runtime)
{
printa(COLUMN8, false, "01 %s%ddb PIC X(%"SIZEFORMAT") VALUE IS \"%s\".",
printa(COLUMN8, false, "01 %s%ddb PIC X(%" SIZEFORMAT") VALUE IS \"%s\".",
names[isc_b_pos], db->dbb_id, strlen(db->dbb_runtime), db->dbb_runtime);
}
else if (db->dbb_filename)
{
printa(COLUMN8, false, "01 %s%ddb PIC X(%"SIZEFORMAT") VALUE IS \"%s\".",
printa(COLUMN8, false, "01 %s%ddb PIC X(%" SIZEFORMAT") VALUE IS \"%s\".",
names[isc_b_pos], db->dbb_id, strlen(db->dbb_filename), db->dbb_filename);
}
@ -1756,7 +1756,7 @@ static void gen_database( const act* action)
strncpy(fname, s, len);
fname[len - 1] = 0;
ready->rdy_id = ++count;
printa(COLUMN8, false, "01 %s%ddb PIC X(%"SIZEFORMAT") VALUE IS \"%s\".",
printa(COLUMN8, false, "01 %s%ddb PIC X(%" SIZEFORMAT") VALUE IS \"%s\".",
names[isc_b_pos], ready->rdy_id, strlen(fname), fname);
}
}
@ -1808,7 +1808,7 @@ static void gen_database( const act* action)
if (!chck_dups)
{
make_name(s1, cur_stmt);
printa(COLUMN8, false, "01 ISC-CONST-%s PIC X(%"SIZEFORMAT") VALUE IS \"%s \".",
printa(COLUMN8, false, "01 ISC-CONST-%s PIC X(%" SIZEFORMAT") VALUE IS \"%s \".",
s1, strlen(s1) + 1, s1);
printa(COLUMN8, false, "01 ISC-CONST-%sL PIC S9(5) %s.", s1, USAGE_BINARY2);
}
@ -1827,7 +1827,7 @@ static void gen_database( const act* action)
const gpre_prc* procedure = (gpre_prc*) local_act->act_object;
const gpre_sym* symbol = procedure->prc_symbol;
const char* sname = symbol->sym_string;
printa(COLUMN8, false, "01 %s%dprc PIC X(%"SIZEFORMAT") VALUE IS \"%s\".",
printa(COLUMN8, false, "01 %s%dprc PIC X(%" SIZEFORMAT") VALUE IS \"%s\".",
names[isc_b_pos], request->req_ident, strlen(sname), sname);
}
}

10
src/gpre/obj_cxx.cpp
View File

@ -887,7 +887,7 @@ static void gen_based( const act* action, int column)
if (based_on->bas_flags & BAS_segment)
{
if (*variable != '*')
fprintf(gpreGlob.out_file, "[%"SLONGFORMAT"]", length);
fprintf(gpreGlob.out_file, "[%" SLONGFORMAT"]", length);
}
else if (field->fld_array_info)
{
@ -896,7 +896,7 @@ static void gen_based( const act* action, int column)
for (const dim* dimension = field->fld_array_info->ary_dimension;
dimension; dimension = dimension->dim_next)
{
fprintf(gpreGlob.out_file, " [%"SLONGFORMAT"]", dimension->dim_upper - dimension->dim_lower + 1);
fprintf(gpreGlob.out_file, " [%" SLONGFORMAT"]", dimension->dim_upper - dimension->dim_lower + 1);
}
if (field->fld_array_info->ary_dtype <= dtype_varying && field->fld_length > 1)
@ -1596,7 +1596,7 @@ static void gen_drop_database( const act* action, int column)
const gpre_dbb* db = (gpre_dbb*) action->act_object;
align(column);
fprintf(gpreGlob.out_file, "isc_drop_database (%s, %"SIZEFORMAT", \"%s\", rdb$k_db_type_gds);",
fprintf(gpreGlob.out_file, "isc_drop_database (%s, %" SIZEFORMAT", \"%s\", rdb$k_db_type_gds);",
status_vector(action),
strlen(db->dbb_filename), db->dbb_filename);
set_sqlcode(action, column);
@ -3448,7 +3448,7 @@ static void gen_trans( const act* action, int column)
static void gen_type( const act* action, int column)
{
printa(column, "%"SLONGFORMAT, (SLONG)(IPTR)action->act_object);
printa(column, "%" SLONGFORMAT, (SLONG)(IPTR)action->act_object);
}
@ -3604,7 +3604,7 @@ static void make_array_declaration(ref* reference)
for (const dim* dimension = field->fld_array_info->ary_dimension; dimension;
dimension = dimension->dim_next)
{
fprintf(gpreGlob.out_file, " [%"SLONGFORMAT"]", dimension->dim_upper - dimension->dim_lower + 1);
fprintf(gpreGlob.out_file, " [%" SLONGFORMAT"]", dimension->dim_upper - dimension->dim_lower + 1);
}
if (field->fld_array_info->ary_dtype <= dtype_varying)

2
src/gpre/pat.cpp
View File

@ -417,7 +417,7 @@ void PATTERN_expand( USHORT column, const TEXT* pattern, PAT* args)
}
}
else if (long_flag) {
sprintf(p, "%"SLONGFORMAT, long_value);
sprintf(p, "%" SLONGFORMAT, long_value);
}
else {
sprintf(p, "%d", value);

2
src/include/gen/autoconfig_msvc.h
View File

@ -252,7 +252,9 @@
#undef HAVE_STRUCT_XDR_OPS
/* Functions */
#if defined(_MSC_VER) && (_MSC_VER < 1900)
#define snprintf _snprintf
#endif
/* Is the platform big endian? */
#undef WORDS_BIGENDIAN

22
src/isql/isql.epp
View File

@ -2499,7 +2499,7 @@ static processing_state blobedit(const TEXT* action, const TEXT* const* cmd)
// Find the high and low values of the blob id
ISC_QUAD blobid;
sscanf(p, "%"xLONGFORMAT":%"xLONGFORMAT, &blobid.gds_quad_high, &blobid.gds_quad_low);
sscanf(p, "%" xLONGFORMAT":%" xLONGFORMAT, &blobid.gds_quad_high, &blobid.gds_quad_low);
// If it isn't an explicit blobedit, then do a dump. Since this is a
// user operation, put it on the M__trans handle.
@ -3807,7 +3807,7 @@ static void do_isql()
M__trans = 0;
#if defined(_MSC_VER) && _MSC_VER >= 1400
#if defined(_MSC_VER) && _MSC_VER >= 1400 && _MSC_VER < 1900
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif
@ -6988,7 +6988,7 @@ static unsigned print_item(TEXT** s, const IsqlVar* var, const unsigned length)
// Print blob-ids only here
blobid = var->value.blobid;
sprintf(blobbuf, "%"xLONGFORMAT":%"xLONGFORMAT, blobid->gds_quad_high,
sprintf(blobbuf, "%" xLONGFORMAT":%" xLONGFORMAT, blobid->gds_quad_high,
blobid->gds_quad_low);
sprintf(p, "%*s ", MAX(17, length), blobbuf);
break;
@ -6998,7 +6998,7 @@ static unsigned print_item(TEXT** s, const IsqlVar* var, const unsigned length)
// Print blob-ids only here
blobid = var->value.blobid;
sprintf(blobbuf, "%"xLONGFORMAT":%"xLONGFORMAT, blobid->gds_quad_high,
sprintf(blobbuf, "%" xLONGFORMAT":%" xLONGFORMAT, blobid->gds_quad_high,
blobid->gds_quad_low);
sprintf(p, "%*s ", MAX(17, length), blobbuf);
if (setValues.List)
@ -7229,7 +7229,7 @@ static unsigned print_item(TEXT** s, const IsqlVar* var, const unsigned length)
if (isqlGlob.SQL_dialect > SQL_DIALECT_V5)
{
sprintf(d, "%4.4d-%2.2d-%2.2d %2.2d:%2.2d:%2.2d.%4.4"ULONGFORMAT,
sprintf(d, "%4.4d-%2.2d-%2.2d %2.2d:%2.2d:%2.2d.%4.4" ULONGFORMAT,
times.tm_year + 1900, (times.tm_mon + 1),
times.tm_mday, times.tm_hour, times.tm_min,
times.tm_sec,
@ -7238,7 +7238,7 @@ static unsigned print_item(TEXT** s, const IsqlVar* var, const unsigned length)
else
{
if (setValues.Time_display)
sprintf(d, "%2d-%s-%4d %2.2d:%2.2d:%2.2d.%4.4"ULONGFORMAT,
sprintf(d, "%2d-%s-%4d %2.2d:%2.2d:%2.2d.%4.4" ULONGFORMAT,
times.tm_mday, alpha_months[times.tm_mon],
times.tm_year + 1900, times.tm_hour, times.tm_min,
times.tm_sec,
@ -7256,7 +7256,7 @@ static unsigned print_item(TEXT** s, const IsqlVar* var, const unsigned length)
case SQL_TYPE_TIME:
isc_decode_sql_time(var->value.asTime, &times);
sprintf(d, "%2.2d:%2.2d:%2.2d.%4.4"ULONGFORMAT,
sprintf(d, "%2.2d:%2.2d:%2.2d.%4.4" ULONGFORMAT,
times.tm_hour, times.tm_min, times.tm_sec,
(*var->value.asTime) % ISC_TIME_SECONDS_PRECISION);
sprintf(p, "%-*.*s ", length, length, d);
@ -7602,9 +7602,9 @@ static processing_state print_performance(const SINT64* perf_before)
Firebird::string::size_type p;
while ((p = diag->find('!')) != Firebird::string::npos)
diag->replace(p, 1, "%"SQUADFORMAT);
diag->replace(p, 1, "%" SQUADFORMAT);
while ((p = diag->find('~')) != Firebird::string::npos)
diag->replace(p, 1, "%"SQUADFORMAT".%.3"SQUADFORMAT);
diag->replace(p, 1, "%" SQUADFORMAT".%.3" SQUADFORMAT);
have_report = true;
}
@ -7633,8 +7633,8 @@ static processing_state print_performance(const SINT64* perf_before)
IsqlStatist iStat(perf_before, perf_after);
// counters: "%"SQUADFORMAT
// time: "%"SQUADFORMAT".%.3"SQUADFORMAT
// counters: "%" SQUADFORMAT
// time: "%" SQUADFORMAT".%.3" SQUADFORMAT
IUTILS_printf2(Diag, diag->c_str(), iStat.curMem, iStat.deltaMem, iStat.maxMem,
iStat.realTime / 1000, iStat.realTime % 1000,
#ifndef WIN_NT

24
src/isql/show.epp
View File

@ -420,7 +420,7 @@ bool SHOW_dbb_parameters(Firebird::IAttachment* db_handle,
case isc_info_page_size:
value_out = ISQL_vax_integer(d, length);
sprintf(info, "PAGE_SIZE %"SLONGFORMAT"%s", value_out, separator);
sprintf(info, "PAGE_SIZE %" SLONGFORMAT"%s", value_out, separator);
break;
case isc_info_db_size_in_pages:
@ -431,7 +431,7 @@ bool SHOW_dbb_parameters(Firebird::IAttachment* db_handle,
sprintf(info, "%s%s", msg, separator);
}
else
sprintf(info, "Number of DB pages allocated = %"SLONGFORMAT"%s", value_out, separator);
sprintf(info, "Number of DB pages allocated = %" SLONGFORMAT"%s", value_out, separator);
break;
case fb_info_pages_used:
@ -442,7 +442,7 @@ bool SHOW_dbb_parameters(Firebird::IAttachment* db_handle,
sprintf(info, "%s%s", msg, separator);
}
else
sprintf(info, "Number of DB pages used = %"SLONGFORMAT"%s", value_out, separator);
sprintf(info, "Number of DB pages used = %" SLONGFORMAT"%s", value_out, separator);
break;
case fb_info_pages_free:
@ -453,7 +453,7 @@ bool SHOW_dbb_parameters(Firebird::IAttachment* db_handle,
sprintf(info, "%s%s", msg, separator);
}
else
sprintf(info, "Number of DB pages free = %"SLONGFORMAT"%s", value_out, separator);
sprintf(info, "Number of DB pages free = %" SLONGFORMAT"%s", value_out, separator);
break;
case fb_info_crypt_state:
@ -495,7 +495,7 @@ bool SHOW_dbb_parameters(Firebird::IAttachment* db_handle,
sprintf(info, "%s%s", msg, separator);
}
else
sprintf(info, "Sweep interval = %"SLONGFORMAT"%s", value_out, separator);
sprintf(info, "Sweep interval = %" SLONGFORMAT"%s", value_out, separator);
break;
case isc_info_forced_writes:
@ -505,22 +505,22 @@ bool SHOW_dbb_parameters(Firebird::IAttachment* db_handle,
case isc_info_oldest_transaction :
value_out = ISQL_vax_integer (d, length);
sprintf(info, "Transaction - oldest = %"SLONGFORMAT"%s", value_out, separator);
sprintf(info, "Transaction - oldest = %" SLONGFORMAT"%s", value_out, separator);
break;
case isc_info_oldest_active :
value_out = ISQL_vax_integer (d, length);
sprintf(info, "Transaction - oldest active = %"SLONGFORMAT"%s", value_out, separator);
sprintf(info, "Transaction - oldest active = %" SLONGFORMAT"%s", value_out, separator);
break;
case isc_info_oldest_snapshot :
value_out = ISQL_vax_integer (d, length);
sprintf(info, "Transaction - oldest snapshot = %"SLONGFORMAT"%s", value_out, separator);
sprintf(info, "Transaction - oldest snapshot = %" SLONGFORMAT"%s", value_out, separator);
break;
case isc_info_next_transaction :
value_out = ISQL_vax_integer (d, length);
sprintf (info, "Transaction - Next = %"SLONGFORMAT"%s", value_out, separator);
sprintf (info, "Transaction - Next = %" SLONGFORMAT"%s", value_out, separator);
break;
case isc_info_base_level:
@ -531,7 +531,7 @@ bool SHOW_dbb_parameters(Firebird::IAttachment* db_handle,
sprintf(info, "%s%s", msg, separator);
}
else
sprintf(info, "Base level = %"SLONGFORMAT"%s", value_out, separator);
sprintf(info, "Base level = %" SLONGFORMAT"%s", value_out, separator);
break;
case isc_info_limbo:
@ -542,7 +542,7 @@ bool SHOW_dbb_parameters(Firebird::IAttachment* db_handle,
sprintf(info, "%s%s", msg, separator);
}
else
sprintf(info, "Transaction in limbo = %"SLONGFORMAT"%s", value_out, separator);
sprintf(info, "Transaction in limbo = %" SLONGFORMAT"%s", value_out, separator);
break;
case isc_info_ods_version:
@ -550,7 +550,7 @@ bool SHOW_dbb_parameters(Firebird::IAttachment* db_handle,
break;
case isc_info_ods_minor_version:
value_out = ISQL_vax_integer(d, length);
sprintf(info, "ODS = %"SLONGFORMAT".%"SLONGFORMAT"%s",
sprintf(info, "ODS = %" SLONGFORMAT".%" SLONGFORMAT"%s",
(SLONG) isqlGlob.major_ods, value_out, separator);
break;

6
src/jrd/Relation.cpp
View File

@ -102,7 +102,7 @@ RelationPages* jrd_rel::getPagesInternal(thread_db* tdbb, TraNumber tran, bool a
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES,
"jrd_rel::getPages inst %"ULONGFORMAT", ppp %"SLONGFORMAT", irp %"SLONGFORMAT", addr 0x%x\n",
"jrd_rel::getPages inst %" ULONGFORMAT", ppp %" SLONGFORMAT", irp %" SLONGFORMAT", addr 0x%x\n",
newPages->rel_instance_id,
newPages->rel_pages ? (*newPages->rel_pages)[0] : 0,
newPages->rel_index_root,
@ -137,7 +137,7 @@ RelationPages* jrd_rel::getPagesInternal(thread_db* tdbb, TraNumber tran, bool a
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES,
"jrd_rel::getPages inst %"SQUADFORMAT", irp %"SLONGFORMAT", idx %u, idx_root %"SLONGFORMAT", addr 0x%x\n",
"jrd_rel::getPages inst %" SQUADFORMAT", irp %" SLONGFORMAT", idx %u, idx_root %" SLONGFORMAT", addr 0x%x\n",
newPages->rel_instance_id,
newPages->rel_index_root,
idx->idx_id,
@ -175,7 +175,7 @@ bool jrd_rel::delPages(thread_db* tdbb, TraNumber tran, RelationPages* aPages)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES,
"jrd_rel::delPages inst %"ULONGFORMAT", ppp %"SLONGFORMAT", irp %"SLONGFORMAT", addr 0x%x\n",
"jrd_rel::delPages inst %" ULONGFORMAT", ppp %" SLONGFORMAT", irp %" SLONGFORMAT", addr 0x%x\n",
pages->rel_instance_id,
pages->rel_pages ? (*pages->rel_pages)[0] : 0,
pages->rel_index_root,

8
src/jrd/SysFunction.cpp
View File

@ -2180,7 +2180,7 @@ dsc* evlGetContext(thread_db* tdbb, const SysFunction*, const NestValueArray& ar
else if (nameStr == DATABASE_NAME)
resultStr = dbb->dbb_database_name.ToString();
else if (nameStr == SESSION_ID_NAME)
resultStr.printf("%"SQUADFORMAT, PAG_attachment_id(tdbb));
resultStr.printf("%" SQUADFORMAT, PAG_attachment_id(tdbb));
else if (nameStr == NETWORK_PROTOCOL_NAME)
{
if (attachment->att_network_protocol.isEmpty())
@ -2200,7 +2200,7 @@ dsc* evlGetContext(thread_db* tdbb, const SysFunction*, const NestValueArray& ar
if (!attachment->att_remote_pid)
return NULL;
resultStr.printf("%"SLONGFORMAT, attachment->att_remote_pid);
resultStr.printf("%" SLONGFORMAT, attachment->att_remote_pid);
}
else if (nameStr == CLIENT_PROCESS_NAME)
{
@ -2224,7 +2224,7 @@ dsc* evlGetContext(thread_db* tdbb, const SysFunction*, const NestValueArray& ar
resultStr = attachment->att_user->usr_sql_role_name;
}
else if (nameStr == TRANSACTION_ID_NAME)
resultStr.printf("%"SQUADFORMAT, transaction->tra_number);
resultStr.printf("%" SQUADFORMAT, transaction->tra_number);
else if (nameStr == ISOLATION_LEVEL_NAME)
{
if (transaction->tra_flags & TRA_read_committed)
@ -2235,7 +2235,7 @@ dsc* evlGetContext(thread_db* tdbb, const SysFunction*, const NestValueArray& ar
resultStr = SNAPSHOT_VALUE;
}
else if (nameStr == LOCK_TIMEOUT_NAME)
resultStr.printf("%"SLONGFORMAT, transaction->tra_lock_timeout);
resultStr.printf("%" SLONGFORMAT, transaction->tra_lock_timeout);
else if (nameStr == READ_ONLY_NAME)
resultStr = (transaction->tra_flags & TRA_readonly) ? TRUE_VALUE : FALSE_VALUE;
else

142
src/jrd/dpm.epp
View File

@ -131,7 +131,7 @@ PAG DPM_allocate(thread_db* tdbb, WIN* window)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES_INFO,
"DPM_allocate (window page %"ULONGFORMAT")\n",
"DPM_allocate (window page %" ULONGFORMAT")\n",
window ? window->win_page.getPageNum() : 0);
#endif
@ -160,11 +160,11 @@ void DPM_backout( thread_db* tdbb, record_param* rpb)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES,
"DPM_backout (record_param %"QUADFORMAT"d)\n", rpb->rpb_number.getValue());
"DPM_backout (record_param %" QUADFORMAT"d)\n", rpb->rpb_number.getValue());
VIO_trace(DEBUG_WRITES_INFO,
" record %"ULONGFORMAT":%d transaction %"ULONGFORMAT" back %"
ULONGFORMAT":%d fragment %"ULONGFORMAT":%d flags %d\n",
" record %" ULONGFORMAT":%d transaction %" ULONGFORMAT" back %"
ULONGFORMAT":%d fragment %" ULONGFORMAT":%d flags %d\n",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_transaction_nr,
rpb->rpb_b_page, rpb->rpb_b_line, rpb->rpb_f_page,
rpb->rpb_f_line, rpb->rpb_flags);
@ -182,7 +182,7 @@ void DPM_backout( thread_db* tdbb, record_param* rpb)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES_INFO,
" old record %"ULONGFORMAT":%d, new record %"ULONGFORMAT
" old record %" ULONGFORMAT":%d, new record %" ULONGFORMAT
":%d, old dpg_count %d, ",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_b_page,
rpb->rpb_b_line, page->dpg_count);
@ -320,13 +320,13 @@ bool DPM_chain( thread_db* tdbb, record_param* org_rpb, record_param* new_rpb)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES,
"DPM_chain (org_rpb %"QUADFORMAT"d, new_rpb %"
"DPM_chain (org_rpb %" QUADFORMAT"d, new_rpb %"
QUADFORMAT"d)\n", org_rpb->rpb_number.getValue(),
new_rpb ? new_rpb->rpb_number.getValue() : 0);
VIO_trace(DEBUG_WRITES_INFO,
" org record %"ULONGFORMAT":%d transaction %"ULONGFORMAT
" back %"ULONGFORMAT":%d fragment %"ULONGFORMAT":%d flags %d\n",
" org record %" ULONGFORMAT":%d transaction %" ULONGFORMAT
" back %" ULONGFORMAT":%d fragment %" ULONGFORMAT":%d flags %d\n",
org_rpb->rpb_page, org_rpb->rpb_line, org_rpb->rpb_transaction_nr,
org_rpb->rpb_b_page, org_rpb->rpb_b_line, org_rpb->rpb_f_page,
org_rpb->rpb_f_line, org_rpb->rpb_flags);
@ -334,7 +334,7 @@ bool DPM_chain( thread_db* tdbb, record_param* org_rpb, record_param* new_rpb)
if (new_rpb)
{
VIO_trace(DEBUG_WRITES_INFO,
" new record length %d transaction %"ULONGFORMAT
" new record length %d transaction %" ULONGFORMAT
" flags %d\n",
new_rpb->rpb_length, new_rpb->rpb_transaction_nr,
new_rpb->rpb_flags);
@ -637,7 +637,7 @@ ULONG DPM_data_pages(thread_db* tdbb, jrd_rel* relation)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_TRACE_ALL,
" returned pages: %"ULONGFORMAT"\n", pages);
" returned pages: %" ULONGFORMAT"\n", pages);
#endif
return pages;
@ -666,12 +666,12 @@ void DPM_delete( thread_db* tdbb, record_param* rpb, ULONG prior_page)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES,
"DPM_delete (record_param %"QUADFORMAT", prior_page %"ULONGFORMAT")\n",
"DPM_delete (record_param %" QUADFORMAT", prior_page %" ULONGFORMAT")\n",
rpb->rpb_number.getValue(), prior_page);
VIO_trace(DEBUG_WRITES_INFO,
" record %"ULONGFORMAT":%d transaction %"ULONGFORMAT" back %"
ULONGFORMAT":%d fragment %"ULONGFORMAT":%d flags %d\n",
" record %" ULONGFORMAT":%d transaction %" ULONGFORMAT" back %"
ULONGFORMAT":%d fragment %" ULONGFORMAT":%d flags %d\n",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_transaction_nr,
rpb->rpb_b_page, rpb->rpb_b_line, rpb->rpb_f_page,
rpb->rpb_f_line, rpb->rpb_flags);
@ -901,7 +901,7 @@ void DPM_delete( thread_db* tdbb, record_param* rpb, ULONG prior_page)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES_INFO,
"\tDPM_delete: page %"ULONGFORMAT
"\tDPM_delete: page %" ULONGFORMAT
" is empty and about to be released from relation %d\n",
window->win_page.getPageNum(), rpb->rpb_relation->rel_id);
#endif
@ -1086,11 +1086,11 @@ bool DPM_fetch(thread_db* tdbb, record_param* rpb, USHORT lock)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_READS,
"DPM_fetch (record_param %"QUADFORMAT"d, lock %d)\n",
"DPM_fetch (record_param %" QUADFORMAT"d, lock %d)\n",
rpb->rpb_number.getValue(), lock);
VIO_trace(DEBUG_READS_INFO,
" record %"ULONGFORMAT":%d\n", rpb->rpb_page, rpb->rpb_line);
" record %" ULONGFORMAT":%d\n", rpb->rpb_page, rpb->rpb_line);
#endif
const RecordNumber number = rpb->rpb_number;
@ -1106,8 +1106,8 @@ bool DPM_fetch(thread_db* tdbb, record_param* rpb, USHORT lock)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_READS_INFO,
" record %"ULONGFORMAT":%d transaction %"ULONGFORMAT" back %"
ULONGFORMAT":%d fragment %"ULONGFORMAT":%d flags %d\n",
" record %" ULONGFORMAT":%d transaction %" ULONGFORMAT" back %"
ULONGFORMAT":%d fragment %" ULONGFORMAT":%d flags %d\n",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_transaction_nr,
rpb->rpb_b_page, rpb->rpb_b_line, rpb->rpb_f_page,
rpb->rpb_f_line, rpb->rpb_flags);
@ -1148,12 +1148,12 @@ bool DPM_fetch_back(thread_db* tdbb, record_param* rpb, USHORT lock, SSHORT latc
#ifdef VIO_DEBUG
VIO_trace(DEBUG_READS,
"DPM_fetch_back (record_param %"QUADFORMAT"d, lock %d)\n",
"DPM_fetch_back (record_param %" QUADFORMAT"d, lock %d)\n",
rpb->rpb_number.getValue(), lock);
VIO_trace(DEBUG_READS_INFO,
" record %"ULONGFORMAT":%d transaction %"ULONGFORMAT
" back %"ULONGFORMAT":%d\n",
" record %" ULONGFORMAT":%d transaction %" ULONGFORMAT
" back %" ULONGFORMAT":%d\n",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_transaction_nr,
rpb->rpb_b_page, rpb->rpb_b_line);
#endif
@ -1181,8 +1181,8 @@ bool DPM_fetch_back(thread_db* tdbb, record_param* rpb, USHORT lock, SSHORT latc
#ifdef VIO_DEBUG
VIO_trace(DEBUG_READS_INFO,
" record fetched %"ULONGFORMAT":%d transaction %"
ULONGFORMAT" back %"ULONGFORMAT":%d fragment %"ULONGFORMAT
" record fetched %" ULONGFORMAT":%d transaction %"
ULONGFORMAT" back %" ULONGFORMAT":%d fragment %" ULONGFORMAT
":%d flags %d\n",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_transaction_nr,
rpb->rpb_b_page, rpb->rpb_b_line, rpb->rpb_f_page,
@ -1212,12 +1212,12 @@ void DPM_fetch_fragment( thread_db* tdbb, record_param* rpb, USHORT lock)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_READS,
"DPM_fetch_fragment (record_param %"QUADFORMAT"d, lock %d)\n",
"DPM_fetch_fragment (record_param %" QUADFORMAT"d, lock %d)\n",
rpb->rpb_number.getValue(), lock);
VIO_trace(DEBUG_READS_INFO,
" record %"ULONGFORMAT":%d transaction %"ULONGFORMAT
" back %"ULONGFORMAT":%d\n",
" record %" ULONGFORMAT":%d transaction %" ULONGFORMAT
" back %" ULONGFORMAT":%d\n",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_transaction_nr,
rpb->rpb_b_page, rpb->rpb_b_line);
#endif
@ -1235,8 +1235,8 @@ void DPM_fetch_fragment( thread_db* tdbb, record_param* rpb, USHORT lock)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_READS_INFO,
" record fetched %"ULONGFORMAT":%d transaction %"ULONGFORMAT
" back %"ULONGFORMAT":%d fragment %"ULONGFORMAT":%d flags %d\n",
" record fetched %" ULONGFORMAT":%d transaction %" ULONGFORMAT
" back %" ULONGFORMAT":%d fragment %" ULONGFORMAT":%d flags %d\n",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_transaction_nr,
rpb->rpb_b_page, rpb->rpb_b_line, rpb->rpb_f_page,
rpb->rpb_f_line, rpb->rpb_flags);
@ -1265,7 +1265,7 @@ SINT64 DPM_gen_id(thread_db* tdbb, SLONG generator, bool initialize, SINT64 val)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_TRACE_ALL,
"DPM_gen_id (generator %"SLONGFORMAT", val %" QUADFORMAT "d)\n", generator, val);
"DPM_gen_id (generator %" SLONGFORMAT", val %" QUADFORMAT "d)\n", generator, val);
#endif
// For the uncommited transaction, values are stored in the transaction-level cache,
@ -1373,7 +1373,7 @@ bool DPM_get(thread_db* tdbb, record_param* rpb, SSHORT lock_type)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_READS,
"DPM_get (record_param %"QUADFORMAT"d, lock type %d)\n",
"DPM_get (record_param %" QUADFORMAT"d, lock type %d)\n",
rpb->rpb_number.getValue(), lock_type);
#endif
@ -1398,7 +1398,7 @@ bool DPM_get(thread_db* tdbb, record_param* rpb, SSHORT lock_type)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_READS_INFO,
" record %"ULONGFORMAT":%d\n", page->ppg_page[slot], line);
" record %" ULONGFORMAT":%d\n", page->ppg_page[slot], line);
#endif
const ULONG page_number = page->ppg_page[slot];
@ -1447,8 +1447,8 @@ ULONG DPM_get_blob(thread_db* tdbb,
#ifdef VIO_DEBUG
VIO_trace(DEBUG_READS,
"DPM_get_blob (blob, record_number %"QUADFORMAT
"d, delete_flag %d, prior_page %"ULONGFORMAT")\n",
"DPM_get_blob (blob, record_number %" QUADFORMAT
"d, delete_flag %d, prior_page %" ULONGFORMAT")\n",
record_number.getValue(), (int) delete_flag, prior_page);
#endif
@ -1566,7 +1566,7 @@ bool DPM_next(thread_db* tdbb, record_param* rpb, USHORT lock_type, bool onepage
#ifdef VIO_DEBUG
VIO_trace(DEBUG_READS,
"DPM_next (record_param %"QUADFORMAT"d)\n", rpb->rpb_number.getValue());
"DPM_next (record_param %" QUADFORMAT"d)\n", rpb->rpb_number.getValue());
#endif
WIN* window = &rpb->getWindow(tdbb);
@ -1752,7 +1752,7 @@ void DPM_pages(thread_db* tdbb, SSHORT rel_id, int type, ULONG sequence, ULONG p
#ifdef VIO_DEBUG
VIO_trace(DEBUG_TRACE_ALL,
"DPM_pages (rel_id %d, type %d, sequence %"ULONGFORMAT", page %"ULONGFORMAT")\n",
"DPM_pages (rel_id %d, type %d, sequence %" ULONGFORMAT", page %" ULONGFORMAT")\n",
rel_id, type, sequence, page);
#endif
@ -1933,12 +1933,12 @@ void DPM_store( thread_db* tdbb, record_param* rpb, PageStack& stack, const Jrd:
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES,
"DPM_store (record_param %"QUADFORMAT"d, stack, type %d)\n",
"DPM_store (record_param %" QUADFORMAT"d, stack, type %d)\n",
rpb->rpb_number.getValue(), type);
VIO_trace(DEBUG_WRITES_INFO,
" record to store %"ULONGFORMAT":%d transaction %"ULONGFORMAT
" back %"ULONGFORMAT":%d fragment %"ULONGFORMAT":%d flags %d\n",
" record to store %" ULONGFORMAT":%d transaction %" ULONGFORMAT
" back %" ULONGFORMAT":%d fragment %" ULONGFORMAT":%d flags %d\n",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_transaction_nr,
rpb->rpb_b_page, rpb->rpb_b_line, rpb->rpb_f_page,
rpb->rpb_f_line, rpb->rpb_flags);
@ -1978,8 +1978,8 @@ void DPM_store( thread_db* tdbb, record_param* rpb, PageStack& stack, const Jrd:
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES_INFO,
" record %"ULONGFORMAT":%d, length %"SLONGFORMAT
", rpb_flags %d, f_page %"ULONGFORMAT":%d, b_page %"ULONGFORMAT
" record %" ULONGFORMAT":%d, length %" SLONGFORMAT
", rpb_flags %d, f_page %" ULONGFORMAT":%d, b_page %" ULONGFORMAT
":%d\n",
rpb->rpb_page, rpb->rpb_line, length, rpb->rpb_flags,
rpb->rpb_f_page, rpb->rpb_f_line, rpb->rpb_b_page,
@ -2086,10 +2086,10 @@ void DPM_rewrite_header( thread_db* tdbb, record_param* rpb)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES,
"DPM_rewrite_header (record_param %"QUADFORMAT"d)\n", rpb->rpb_number.getValue());
"DPM_rewrite_header (record_param %" QUADFORMAT"d)\n", rpb->rpb_number.getValue());
VIO_trace(DEBUG_WRITES_INFO,
" record %"ULONGFORMAT":%d\n", rpb->rpb_page, rpb->rpb_line);
" record %" ULONGFORMAT":%d\n", rpb->rpb_page, rpb->rpb_line);
#endif
WIN* window = &rpb->getWindow(tdbb);
@ -2098,14 +2098,14 @@ void DPM_rewrite_header( thread_db* tdbb, record_param* rpb)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES_INFO,
" old flags %d, old transaction %"SQUADFORMAT
", old format %d, old back record %"ULONGFORMAT":%d\n",
" old flags %d, old transaction %" SQUADFORMAT
", old format %d, old back record %" ULONGFORMAT":%d\n",
header->rhd_flags, Ods::getTraNum(header), (int) header->rhd_format,
header->rhd_b_page, header->rhd_b_line);
VIO_trace(DEBUG_WRITES_INFO,
" new flags %d, new transaction %"SQUADFORMAT
", new format %d, new back record %"ULONGFORMAT":%d\n",
" new flags %d, new transaction %" SQUADFORMAT
", new format %d, new back record %" ULONGFORMAT":%d\n",
rpb->rpb_flags, rpb->rpb_transaction_nr, rpb->rpb_format_number,
rpb->rpb_b_page, rpb->rpb_b_line);
#endif
@ -2139,12 +2139,12 @@ void DPM_update( thread_db* tdbb, record_param* rpb, PageStack* stack, const jrd
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES,
"DPM_update (record_param %"QUADFORMAT"d, stack, transaction %"ULONGFORMAT")\n",
"DPM_update (record_param %" QUADFORMAT"d, stack, transaction %" ULONGFORMAT")\n",
rpb->rpb_number.getValue(), transaction ? transaction->tra_number : 0);
VIO_trace(DEBUG_WRITES_INFO,
" record %"ULONGFORMAT":%d transaction %"ULONGFORMAT" back %"
ULONGFORMAT":%d fragment %"ULONGFORMAT":%d flags %d\n",
" record %" ULONGFORMAT":%d transaction %" ULONGFORMAT" back %"
ULONGFORMAT":%d fragment %" ULONGFORMAT":%d flags %d\n",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_transaction_nr,
rpb->rpb_b_page, rpb->rpb_b_line, rpb->rpb_f_page,
rpb->rpb_f_line, rpb->rpb_flags);
@ -2225,9 +2225,9 @@ void DPM_update( thread_db* tdbb, record_param* rpb, PageStack* stack, const jrd
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES_INFO,
" record %"ULONGFORMAT
":%d, dpg_length %d, rpb_flags %d, rpb_f record %"ULONGFORMAT
":%d, rpb_b record %"ULONGFORMAT":%d\n",
" record %" ULONGFORMAT
":%d, dpg_length %d, rpb_flags %d, rpb_f record %" ULONGFORMAT
":%d, rpb_b record %" ULONGFORMAT":%d\n",
rpb->rpb_page, rpb->rpb_line, page->dpg_rpt[slot].dpg_length,
rpb->rpb_flags, rpb->rpb_f_page, rpb->rpb_f_line,
rpb->rpb_b_page, rpb->rpb_b_line);
@ -2329,7 +2329,7 @@ static USHORT compress(thread_db* tdbb, data_page* page)
"compress (page)\n");
VIO_trace(DEBUG_TRACE_ALL_INFO,
" sequence %"ULONGFORMAT"\n", page->dpg_sequence);
" sequence %" ULONGFORMAT"\n", page->dpg_sequence);
#endif
UCHAR temp_page[MAX_PAGE_SIZE];
@ -2383,8 +2383,8 @@ static void delete_tail(thread_db* tdbb, rhdf* header, const USHORT page_space,
"delete_tail (header, length)\n");
VIO_trace(DEBUG_WRITES_INFO,
" transaction %"SQUADFORMAT" flags %d fragment %"
ULONGFORMAT":%d back %"ULONGFORMAT":%d\n",
" transaction %" SQUADFORMAT" flags %d fragment %"
ULONGFORMAT":%d back %" ULONGFORMAT":%d\n",
Ods::getTraNum(header), header->rhdf_flags,
header->rhdf_f_page, header->rhdf_f_line,
header->rhdf_b_page, header->rhdf_b_line);
@ -2510,14 +2510,14 @@ static void fragment(thread_db* tdbb,
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES,
"fragment (record_param %"QUADFORMAT
"d, available_space %d, dcc, length %d, transaction %"ULONGFORMAT")\n",
"fragment (record_param %" QUADFORMAT
"d, available_space %d, dcc, length %d, transaction %" ULONGFORMAT")\n",
rpb->rpb_number.getValue(), available_space, length,
transaction ? transaction->tra_number : 0);
VIO_trace(DEBUG_WRITES_INFO,
" record %"ULONGFORMAT":%d transaction %"ULONGFORMAT" back %"
ULONGFORMAT":%d fragment %"ULONGFORMAT":%d flags %d\n",
" record %" ULONGFORMAT":%d transaction %" ULONGFORMAT" back %"
ULONGFORMAT":%d fragment %" ULONGFORMAT":%d flags %d\n",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_transaction_nr,
rpb->rpb_b_page, rpb->rpb_b_line, rpb->rpb_f_page,
rpb->rpb_f_line, rpb->rpb_flags);
@ -2569,9 +2569,9 @@ static void fragment(thread_db* tdbb,
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES_INFO,
" rhdf_transaction %"SQUADFORMAT", window record %"ULONGFORMAT
" rhdf_transaction %" SQUADFORMAT", window record %" ULONGFORMAT
":%d, available_space %d, rhdf_flags %d, rhdf_f record %"
ULONGFORMAT":%d, rhdf_b record %"ULONGFORMAT":%d\n",
ULONGFORMAT":%d, rhdf_b record %" ULONGFORMAT":%d\n",
Ods::getTraNum(header), window->win_page.getPageNum(), line,
available_space, header->rhdf_flags, header->rhdf_f_page,
header->rhdf_f_line, header->rhdf_b_page, header->rhdf_b_line);
@ -2634,9 +2634,9 @@ static void fragment(thread_db* tdbb,
" fragment head \n");
VIO_trace(DEBUG_WRITES_INFO,
" rhdf_trans %"SQUADFORMAT", window record %"ULONGFORMAT
":%d, dpg_length %d\n\trhdf_flags %d, rhdf_f record %"ULONGFORMAT
":%d, rhdf_b record %"ULONGFORMAT":%d\n",
" rhdf_trans %" SQUADFORMAT", window record %" ULONGFORMAT
":%d, dpg_length %d\n\trhdf_flags %d, rhdf_f record %" ULONGFORMAT
":%d, rhdf_b record %" ULONGFORMAT":%d\n",
Ods::getTraNum(header), window->win_page.getPageNum(), line,
page->dpg_rpt[line].dpg_length, header->rhdf_flags,
header->rhdf_f_page, header->rhdf_f_line, header->rhdf_b_page,
@ -2836,7 +2836,7 @@ static void extend_relation(thread_db* tdbb, jrd_rel* relation, WIN* window, con
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES_INFO,
" extended_relation (relation %d, window_page %"ULONGFORMAT")\n",
" extended_relation (relation %d, window_page %" ULONGFORMAT")\n",
relation->rel_id, window->win_page.getPageNum());
#endif
}
@ -3267,7 +3267,7 @@ static rhd* locate_space(thread_db* tdbb,
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES_INFO,
" extended relation %d with page %"ULONGFORMAT" to get %d bytes\n",
" extended relation %d with page %" ULONGFORMAT" to get %d bytes\n",
relation->rel_id, window->win_page.getPageNum(), size);
#endif
@ -3529,8 +3529,8 @@ static void store_big_record(thread_db* tdbb,
" back portion\n");
VIO_trace(DEBUG_WRITES_INFO,
" getWindow(tdbb) page %"ULONGFORMAT
", max_data %d, \n\trhdf_flags %d, prior %"ULONGFORMAT"\n",
" getWindow(tdbb) page %" ULONGFORMAT
", max_data %d, \n\trhdf_flags %d, prior %" ULONGFORMAT"\n",
rpb->getWindow(tdbb).win_page.getPageNum(), max_data, header->rhdf_flags,
prior.getPageNum());
#endif
@ -3561,9 +3561,9 @@ static void store_big_record(thread_db* tdbb,
" front part\n");
VIO_trace(DEBUG_WRITES_INFO,
" rhdf_trans %"SQUADFORMAT", rpb_window record %"ULONGFORMAT
":%d, dpg_length %d \n\trhdf_flags %d, rhdf_f record %"ULONGFORMAT
":%d, rhdf_b record %"ULONGFORMAT":%d\n",
" rhdf_trans %" SQUADFORMAT", rpb_window record %" ULONGFORMAT
":%d, dpg_length %d \n\trhdf_flags %d, rhdf_f record %" ULONGFORMAT
":%d, rhdf_b record %" ULONGFORMAT":%d\n",
Ods::getTraNum(header), rpb->getWindow(tdbb).win_page.getPageNum(),
rpb->rpb_line, page->dpg_rpt[rpb->rpb_line].dpg_length,
header->rhdf_flags, header->rhdf_f_page, header->rhdf_f_line,

2
src/jrd/exe.cpp
View File

@ -1233,7 +1233,7 @@ static void stuff_stack_trace(const jrd_req* request)
if (req->req_src_line)
{
Firebird::string src_info;
src_info.printf(" line: %"ULONGFORMAT", col: %"ULONGFORMAT,
src_info.printf(" line: %" ULONGFORMAT", col: %" ULONGFORMAT,
req->req_src_line, req->req_src_column);
if (sTrace.length() + src_info.length() > MAX_STACK_TRACE)

2
src/jrd/filters.cpp
View File

@ -1110,7 +1110,7 @@ ISC_STATUS filter_trans(USHORT action, BlobControl* control)
break;
case TDR_TRANSACTION_ID:
sprintf(out, " Transaction id: %"SQUADFORMAT, isc_portable_integer(p, length));
sprintf(out, " Transaction id: %" SQUADFORMAT, isc_portable_integer(p, length));
break;
default:

2
src/jrd/ini.epp
View File

@ -1100,7 +1100,7 @@ static void add_security_to_sys_obj(thread_db* tdbb,
ByteChunk(acl, acl_length));
Firebird::MetaName security_class;
security_class.printf("%s%"SQUADFORMAT, SQL_SECCLASS_PREFIX,
security_class.printf("%s%" SQUADFORMAT, SQL_SECCLASS_PREFIX,
DPM_gen_id(tdbb, MET_lookup_generator(tdbb, SQL_SECCLASS_GENERATOR), false, 1));
AutoRequest handle;

6
src/jrd/pag.cpp
View File

@ -647,7 +647,7 @@ PAG PAG_allocate_pages(thread_db* tdbb, WIN* window, int cntAlloc, bool aligned)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES_INFO,
"\tPAG_allocate: allocated page %"SLONGFORMAT"\n",
"\tPAG_allocate: allocated page %" SLONGFORMAT"\n",
i + sequence * pageMgr.pagesPerPIP);
#endif
}
@ -718,7 +718,7 @@ PAG PAG_allocate_pages(thread_db* tdbb, WIN* window, int cntAlloc, bool aligned)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES_INFO,
"\tPAG_allocate: allocated page %"SLONGFORMAT"\n",
"\tPAG_allocate: allocated page %" SLONGFORMAT"\n",
bit + sequence * pageMgr.pagesPerPIP);
#endif
}
@ -1590,7 +1590,7 @@ void PAG_release_pages(thread_db* tdbb, USHORT pageSpaceID, int cntRelease,
{
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES_INFO,
"\tPAG_release_pages: about to release page %"SLONGFORMAT"\n", pgNums[i]);
"\tPAG_release_pages: about to release page %" SLONGFORMAT"\n", pgNums[i]);
#endif
const ULONG seq = pgNums[i] / pageMgr.pagesPerPIP;

2
src/jrd/recsrc/BufferedStream.cpp
View File

@ -304,7 +304,7 @@ void BufferedStream::print(thread_db* tdbb, string& plan, bool detailed, unsigne
if (detailed)
{
string extras;
extras.printf(" (record length: %"ULONGFORMAT")", m_format->fmt_length);
extras.printf(" (record length: %" ULONGFORMAT")", m_format->fmt_length);
plan += printIndent(++level) + "Record Buffer" + extras;
}

2
src/jrd/recsrc/SortedStream.cpp
View File

@ -118,7 +118,7 @@ void SortedStream::print(thread_db* tdbb, string& plan,
if (detailed)
{
string extras;
extras.printf(" (record length: %"ULONGFORMAT", key length: %"ULONGFORMAT")",
extras.printf(" (record length: %" ULONGFORMAT", key length: %" ULONGFORMAT")",
m_map->length, m_map->keyLength);
plan += printIndent(++level) +

2
src/jrd/svc.cpp
View File

@ -3055,7 +3055,7 @@ void Service::get_action_svc_string_pos(const ClumpletReader& spb, string& switc
void Service::get_action_svc_data(const ClumpletReader& spb, string& switches)
{
string s;
s.printf("%"SLONGFORMAT" ", spb.getInt());
s.printf("%" SLONGFORMAT" ", spb.getInt());
switches += s;
}

4
src/jrd/tra.cpp
View File

@ -3617,7 +3617,7 @@ TraceSweepEvent::TraceSweepEvent(thread_db* tdbb)
gds__log("Sweep is started by %s\n"
"\tDatabase \"%s\" \n"
"\tOIT %"SQUADFORMAT", OAT %"SQUADFORMAT", OST %"SQUADFORMAT", Next %"SQUADFORMAT,
"\tOIT %" SQUADFORMAT", OAT %" SQUADFORMAT", OST %" SQUADFORMAT", Next %" SQUADFORMAT,
att->att_user->usr_user_name.c_str(),
att->att_filename.c_str(),
m_sweep_info.getOIT(),
@ -3706,7 +3706,7 @@ void TraceSweepEvent::report(ntrace_process_state_t state)
{
gds__log("Sweep is finished\n"
"\tDatabase \"%s\" \n"
"\tOIT %"SQUADFORMAT", OAT %"SQUADFORMAT", OST %"SQUADFORMAT", Next %"SQUADFORMAT,
"\tOIT %" SQUADFORMAT", OAT %" SQUADFORMAT", OST %" SQUADFORMAT", Next %" SQUADFORMAT,
att->att_filename.c_str(),
m_sweep_info.getOIT(),
m_sweep_info.getOAT(),

76
src/jrd/validation.cpp
View File

@ -809,45 +809,45 @@ namespace Jrd
const Validation::MSG_ENTRY Validation::vdr_msg_table[VAL_MAX_ERROR] =
{
{true, isc_info_page_errors, "Page %"ULONGFORMAT" wrong type (expected %s encountered %s)"}, // 0
{true, isc_info_page_errors, "Checksum error on page %"ULONGFORMAT},
{true, isc_info_page_errors, "Page %"ULONGFORMAT" doubly allocated"},
{true, isc_info_page_errors, "Page %"ULONGFORMAT" is used but marked free"},
{false, fb_info_page_warns, "Page %"ULONGFORMAT" is an orphan"},
{false, fb_info_bpage_warns, "Blob %"SQUADFORMAT" appears inconsistent"}, // 5
{true, isc_info_bpage_errors, "Blob %"SQUADFORMAT" is corrupt"},
{true, isc_info_bpage_errors, "Blob %"SQUADFORMAT" is truncated"},
{true, isc_info_record_errors, "Chain for record %"SQUADFORMAT" is broken"},
{true, isc_info_dpage_errors, "Data page %"ULONGFORMAT" {sequence %"ULONGFORMAT"} is confused"},
{true, isc_info_dpage_errors, "Data page %"ULONGFORMAT" {sequence %"ULONGFORMAT"}, line %"ULONGFORMAT" is bad"}, // 10
{true, isc_info_ipage_errors, "Index %d is corrupt on page %"ULONGFORMAT" level %d at offset %"ULONGFORMAT". File: %s, line: %d\n\t"},
{true, isc_info_ppage_errors, "Pointer page {sequence %"ULONGFORMAT"} lost"},
{true, isc_info_ppage_errors, "Pointer page %"ULONGFORMAT" {sequence %"ULONGFORMAT"} inconsistent"},
{true, isc_info_record_errors, "Record %"SQUADFORMAT" is marked as damaged"},
{true, isc_info_record_errors, "Record %"SQUADFORMAT" has bad transaction %"ULONGFORMAT}, // 15
{true, isc_info_record_errors, "Fragmented record %"SQUADFORMAT" is corrupt"},
{true, isc_info_record_errors, "Record %"SQUADFORMAT" is wrong length"},
{true, isc_info_page_errors, "Page %" ULONGFORMAT" wrong type (expected %s encountered %s)"}, // 0
{true, isc_info_page_errors, "Checksum error on page %" ULONGFORMAT},
{true, isc_info_page_errors, "Page %" ULONGFORMAT" doubly allocated"},
{true, isc_info_page_errors, "Page %" ULONGFORMAT" is used but marked free"},
{false, fb_info_page_warns, "Page %" ULONGFORMAT" is an orphan"},
{false, fb_info_bpage_warns, "Blob %" SQUADFORMAT" appears inconsistent"}, // 5
{true, isc_info_bpage_errors, "Blob %" SQUADFORMAT" is corrupt"},
{true, isc_info_bpage_errors, "Blob %" SQUADFORMAT" is truncated"},
{true, isc_info_record_errors, "Chain for record %" SQUADFORMAT" is broken"},
{true, isc_info_dpage_errors, "Data page %" ULONGFORMAT" {sequence %" ULONGFORMAT"} is confused"},
{true, isc_info_dpage_errors, "Data page %" ULONGFORMAT" {sequence %" ULONGFORMAT"}, line %" ULONGFORMAT" is bad"}, // 10
{true, isc_info_ipage_errors, "Index %d is corrupt on page %" ULONGFORMAT" level %d at offset %" ULONGFORMAT". File: %s, line: %d\n\t"},
{true, isc_info_ppage_errors, "Pointer page {sequence %" ULONGFORMAT"} lost"},
{true, isc_info_ppage_errors, "Pointer page %" ULONGFORMAT" {sequence %" ULONGFORMAT"} inconsistent"},
{true, isc_info_record_errors, "Record %" SQUADFORMAT" is marked as damaged"},
{true, isc_info_record_errors, "Record %" SQUADFORMAT" has bad transaction %" ULONGFORMAT}, // 15
{true, isc_info_record_errors, "Fragmented record %" SQUADFORMAT" is corrupt"},
{true, isc_info_record_errors, "Record %" SQUADFORMAT" is wrong length"},
{true, isc_info_ipage_errors, "Missing index root page"},
{true, isc_info_tpage_errors, "Transaction inventory pages lost"},
{true, isc_info_tpage_errors, "Transaction inventory page lost, sequence %"ULONGFORMAT}, // 20
{true, isc_info_tpage_errors, "Transaction inventory pages confused, sequence %"ULONGFORMAT},
{false, fb_info_record_warns, "Relation has %"UQUADFORMAT" orphan backversions {%"UQUADFORMAT" in use}"},
{true, isc_info_ipage_errors, "Index %d is corrupt {missing entries for record %"SQUADFORMAT"}"},
{false, fb_info_ipage_warns, "Index %d has orphan child page at page %"ULONGFORMAT},
{true, isc_info_ipage_errors, "Index %d has a circular reference at page %"ULONGFORMAT}, // 25
{true, isc_info_page_errors, "SCN's page %"ULONGFORMAT" {sequence %"ULONGFORMAT"} inconsistent"},
{false, fb_info_page_warns, "Page %"ULONGFORMAT" has SCN %"ULONGFORMAT" while at SCN's page it is %"ULONGFORMAT},
{true, isc_info_bpage_errors, "Blob %"SQUADFORMAT" has unknown level %d instead of {0, 1, 2}"},
{false, fb_info_ipage_warns, "Index %d has inconsistent left sibling pointer, page %"ULONGFORMAT" level %d at offset %"ULONGFORMAT},
{false, fb_info_ipage_warns, "Index %d misses node on page %"ULONGFORMAT" level %d at offset %"ULONGFORMAT}, // 30
{false, fb_info_pip_warns, "PIP %"ULONGFORMAT" (seq %d) have wrong pip_min (%"ULONGFORMAT"). Correct is %"ULONGFORMAT},
{false, fb_info_pip_warns, "PIP %"ULONGFORMAT" (seq %d) have wrong pip_extent (%"ULONGFORMAT"). Correct is %"ULONGFORMAT},
{false, fb_info_pip_warns, "PIP %"ULONGFORMAT" (seq %d) have wrong pip_used (%"ULONGFORMAT"). Correct is %"ULONGFORMAT},
{false, fb_info_ppage_warns, "Pointer page %"ULONGFORMAT" {sequence %"ULONGFORMAT"} bits {0x%02X %s} are not consistent with data page %"ULONGFORMAT" {sequence %"ULONGFORMAT"} state {0x%02X %s}"},
{true, fb_info_pip_errors, "Data page %"ULONGFORMAT" marked as free in PIP (%"ULONGFORMAT":%"ULONGFORMAT")"},
{true, isc_info_ppage_errors, "Data page %"ULONGFORMAT" is not in PP (%"ULONGFORMAT"). Slot (%d) is not found"},
{true, isc_info_ppage_errors, "Data page %"ULONGFORMAT" is not in PP (%"ULONGFORMAT"). Slot (%d) has value %"ULONGFORMAT},
{true, isc_info_ppage_errors, "Pointer page is not found for data page %"ULONGFORMAT". dpg_sequence (%"ULONGFORMAT") is invalid"}
{true, isc_info_tpage_errors, "Transaction inventory page lost, sequence %" ULONGFORMAT}, // 20
{true, isc_info_tpage_errors, "Transaction inventory pages confused, sequence %" ULONGFORMAT},
{false, fb_info_record_warns, "Relation has %" UQUADFORMAT" orphan backversions {%" UQUADFORMAT" in use}"},
{true, isc_info_ipage_errors, "Index %d is corrupt {missing entries for record %" SQUADFORMAT"}"},
{false, fb_info_ipage_warns, "Index %d has orphan child page at page %" ULONGFORMAT},
{true, isc_info_ipage_errors, "Index %d has a circular reference at page %" ULONGFORMAT}, // 25
{true, isc_info_page_errors, "SCN's page %" ULONGFORMAT" {sequence %" ULONGFORMAT"} inconsistent"},
{false, fb_info_page_warns, "Page %" ULONGFORMAT" has SCN %" ULONGFORMAT" while at SCN's page it is %" ULONGFORMAT},
{true, isc_info_bpage_errors, "Blob %" SQUADFORMAT" has unknown level %d instead of {0, 1, 2}"},
{false, fb_info_ipage_warns, "Index %d has inconsistent left sibling pointer, page %" ULONGFORMAT" level %d at offset %" ULONGFORMAT},
{false, fb_info_ipage_warns, "Index %d misses node on page %" ULONGFORMAT" level %d at offset %" ULONGFORMAT}, // 30
{false, fb_info_pip_warns, "PIP %" ULONGFORMAT" (seq %d) have wrong pip_min (%" ULONGFORMAT"). Correct is %" ULONGFORMAT},
{false, fb_info_pip_warns, "PIP %" ULONGFORMAT" (seq %d) have wrong pip_extent (%" ULONGFORMAT"). Correct is %" ULONGFORMAT},
{false, fb_info_pip_warns, "PIP %" ULONGFORMAT" (seq %d) have wrong pip_used (%" ULONGFORMAT"). Correct is %" ULONGFORMAT},
{false, fb_info_ppage_warns, "Pointer page %" ULONGFORMAT" {sequence %" ULONGFORMAT"} bits {0x%02X %s} are not consistent with data page %" ULONGFORMAT" {sequence %" ULONGFORMAT"} state {0x%02X %s}"},
{true, fb_info_pip_errors, "Data page %" ULONGFORMAT" marked as free in PIP (%" ULONGFORMAT":%" ULONGFORMAT")"},
{true, isc_info_ppage_errors, "Data page %" ULONGFORMAT" is not in PP (%" ULONGFORMAT"). Slot (%d) is not found"},
{true, isc_info_ppage_errors, "Data page %" ULONGFORMAT" is not in PP (%" ULONGFORMAT"). Slot (%d) has value %" ULONGFORMAT},
{true, isc_info_ppage_errors, "Pointer page is not found for data page %" ULONGFORMAT". dpg_sequence (%" ULONGFORMAT") is invalid"}
};
Validation::Validation(thread_db* tdbb, UtilSvc* uSvc) :
@ -1411,7 +1411,7 @@ static void print_rhd(USHORT length, const rhd* header)
**************************************/
if (VAL_debug_level)
{
fprintf(stdout, "rhd: len %d TX %"SQUADFORMAT" format %d ",
fprintf(stdout, "rhd: len %d TX %" SQUADFORMAT" format %d ",
length, Ods::getTraNum(header), (int) header->rhd_format);
fprintf(stdout, "BP %d/%d flags 0x%x ",
header->rhd_b_page, header->rhd_b_line, header->rhd_flags);

170
src/jrd/vio.cpp
View File

@ -387,7 +387,7 @@ void VIO_backout(thread_db* tdbb, record_param* rpb, const jrd_tra* transaction)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES,
"VIO_backout (record_param %"QUADFORMAT"d, transaction %"SQUADFORMAT")\n",
"VIO_backout (record_param %" QUADFORMAT"d, transaction %" SQUADFORMAT")\n",
rpb->rpb_number.getValue(), transaction ? transaction->tra_number : 0);
#endif
@ -404,8 +404,8 @@ void VIO_backout(thread_db* tdbb, record_param* rpb, const jrd_tra* transaction)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES_INFO,
" record %"SLONGFORMAT":%d, rpb_trans %"SQUADFORMAT
", flags %d, back %"SLONGFORMAT":%d, fragment %"SLONGFORMAT":%d\n",
" record %" SLONGFORMAT":%d, rpb_trans %" SQUADFORMAT
", flags %d, back %" SLONGFORMAT":%d, fragment %" SLONGFORMAT":%d\n",
temp.rpb_page, temp.rpb_line, temp.rpb_transaction_nr,
temp.rpb_flags, temp.rpb_b_page, temp.rpb_b_line,
temp.rpb_f_page, temp.rpb_f_line);
@ -696,14 +696,14 @@ bool VIO_chase_record_version(thread_db* tdbb, record_param* rpb,
#ifdef VIO_DEBUG
VIO_trace(DEBUG_TRACE_ALL,
"VIO_chase_record_version (record_param %"QUADFORMAT"d, transaction %"
"VIO_chase_record_version (record_param %" QUADFORMAT"d, transaction %"
SQUADFORMAT", pool %p)\n",
rpb->rpb_number.getValue(), transaction ? transaction->tra_number : 0,
(void*) pool);
VIO_trace(DEBUG_TRACE_ALL_INFO,
" record %"SLONGFORMAT":%d, rpb_trans %"SQUADFORMAT
", flags %d, back %"SLONGFORMAT":%d, fragment %"SLONGFORMAT":%d\n",
" record %" SLONGFORMAT":%d, rpb_trans %" SQUADFORMAT
", flags %d, back %" SLONGFORMAT":%d, fragment %" SLONGFORMAT":%d\n",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_transaction_nr,
rpb->rpb_flags, rpb->rpb_b_page, rpb->rpb_b_line,
rpb->rpb_f_page, rpb->rpb_f_line);
@ -765,8 +765,8 @@ bool VIO_chase_record_version(thread_db* tdbb, record_param* rpb,
{
#ifdef VIO_DEBUG
VIO_trace(DEBUG_READS_INFO,
" chase record %"SLONGFORMAT":%d, rpb_trans %"SQUADFORMAT
", flags %d, back %"SLONGFORMAT":%d, fragment %"SLONGFORMAT":%d\n",
" chase record %" SLONGFORMAT":%d, rpb_trans %" SQUADFORMAT
", flags %d, back %" SLONGFORMAT":%d, fragment %" SLONGFORMAT":%d\n",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_transaction_nr,
rpb->rpb_flags, rpb->rpb_b_page, rpb->rpb_b_line,
rpb->rpb_f_page, rpb->rpb_f_line);
@ -868,7 +868,7 @@ bool VIO_chase_record_version(thread_db* tdbb, record_param* rpb,
case tra_dead:
#ifdef VIO_DEBUG
VIO_trace(DEBUG_READS_INFO,
" record's transaction (%"SQUADFORMAT") is dead (my TID - %"SQUADFORMAT")\n",
" record's transaction (%" SQUADFORMAT") is dead (my TID - %" SQUADFORMAT")\n",
rpb->rpb_transaction_nr, transaction->tra_number);
#endif
if (gcPolicyBackground && !(rpb->rpb_flags & rpb_chained) &&
@ -956,7 +956,7 @@ bool VIO_chase_record_version(thread_db* tdbb, record_param* rpb,
case tra_limbo:
#ifdef VIO_DEBUG
VIO_trace(DEBUG_READS_INFO,
" record's transaction (%"SQUADFORMAT") is in limbo (my TID - %"SQUADFORMAT")\n",
" record's transaction (%" SQUADFORMAT") is in limbo (my TID - %" SQUADFORMAT")\n",
rpb->rpb_transaction_nr, transaction->tra_number);
#endif
@ -971,7 +971,7 @@ bool VIO_chase_record_version(thread_db* tdbb, record_param* rpb,
if (state == tra_active)
{
VIO_trace(DEBUG_READS_INFO,
" record's transaction (%"SQUADFORMAT") is active (my TID - %"SQUADFORMAT")\n",
" record's transaction (%" SQUADFORMAT") is active (my TID - %" SQUADFORMAT")\n",
rpb->rpb_transaction_nr, transaction->tra_number);
}
#endif
@ -1079,7 +1079,7 @@ bool VIO_chase_record_version(thread_db* tdbb, record_param* rpb,
case tra_us:
#ifdef VIO_DEBUG
VIO_trace(DEBUG_READS_INFO,
" record's transaction (%"SQUADFORMAT") is us (my TID - %"SQUADFORMAT")\n",
" record's transaction (%" SQUADFORMAT") is us (my TID - %" SQUADFORMAT")\n",
rpb->rpb_transaction_nr, transaction->tra_number);
#endif
@ -1117,7 +1117,7 @@ bool VIO_chase_record_version(thread_db* tdbb, record_param* rpb,
case tra_committed:
#ifdef VIO_DEBUG
VIO_trace(DEBUG_READS_INFO,
" record's transaction (%"SQUADFORMAT") is committed (my TID - %"SQUADFORMAT")\n",
" record's transaction (%" SQUADFORMAT") is committed (my TID - %" SQUADFORMAT")\n",
rpb->rpb_transaction_nr, transaction->tra_number);
#endif
if (rpb->rpb_flags & rpb_deleted)
@ -1274,13 +1274,13 @@ void VIO_data(thread_db* tdbb, record_param* rpb, MemoryPool* pool)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_READS,
"VIO_data (record_param %"QUADFORMAT"d, pool %p)\n",
"VIO_data (record_param %" QUADFORMAT"d, pool %p)\n",
rpb->rpb_number.getValue(), (void*) pool);
VIO_trace(DEBUG_READS_INFO,
" record %"SLONGFORMAT":%d, rpb_trans %"SQUADFORMAT
", flags %d, back %"SLONGFORMAT":%d, fragment %"SLONGFORMAT":%d\n",
" record %" SLONGFORMAT":%d, rpb_trans %" SQUADFORMAT
", flags %d, back %" SLONGFORMAT":%d, fragment %" SLONGFORMAT":%d\n",
rpb->rpb_page, rpb->rpb_line,
rpb->rpb_transaction_nr, rpb->rpb_flags,
rpb->rpb_b_page, rpb->rpb_b_line,
@ -1360,12 +1360,12 @@ void VIO_data(thread_db* tdbb, record_param* rpb, MemoryPool* pool)
{
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES,
"VIO_data (record_param %"QUADFORMAT"d, length %d expected %d)\n",
"VIO_data (record_param %" QUADFORMAT"d, length %d expected %d)\n",
rpb->rpb_number.getValue(), length, format->fmt_length);
VIO_trace(DEBUG_WRITES_INFO,
" record %"SLONGFORMAT"d:%d, rpb_trans %"SQUADFORMAT
"d, flags %d, back %"SLONGFORMAT"d:%d, fragment %"SLONGFORMAT"d:%d\n",
" record %" SLONGFORMAT"d:%d, rpb_trans %" SQUADFORMAT
"d, flags %d, back %" SLONGFORMAT"d:%d, fragment %" SLONGFORMAT"d:%d\n",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_transaction_nr, rpb->rpb_flags,
rpb->rpb_b_page, rpb->rpb_b_line, rpb->rpb_f_page, rpb->rpb_f_line);
#endif
@ -1400,12 +1400,12 @@ void VIO_erase(thread_db* tdbb, record_param* rpb, jrd_tra* transaction)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES,
"VIO_erase (record_param %"QUADFORMAT"d, transaction %"SQUADFORMAT")\n",
"VIO_erase (record_param %" QUADFORMAT"d, transaction %" SQUADFORMAT")\n",
rpb->rpb_number.getValue(), transaction->tra_number);
VIO_trace(DEBUG_WRITES_INFO,
" record %"SLONGFORMAT":%d, rpb_trans %"SQUADFORMAT
", flags %d, back %"SLONGFORMAT":%d, fragment %"SLONGFORMAT":%d\n",
" record %" SLONGFORMAT":%d, rpb_trans %" SQUADFORMAT
", flags %d, back %" SLONGFORMAT":%d, fragment %" SLONGFORMAT":%d\n",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_transaction_nr,
rpb->rpb_flags, rpb->rpb_b_page, rpb->rpb_b_line,
rpb->rpb_f_page, rpb->rpb_f_line);
@ -1946,13 +1946,13 @@ bool VIO_garbage_collect(thread_db* tdbb, record_param* rpb, const jrd_tra* tran
#ifdef VIO_DEBUG
VIO_trace(DEBUG_TRACE,
"VIO_garbage_collect (record_param %"QUADFORMAT"d, transaction %"
"VIO_garbage_collect (record_param %" QUADFORMAT"d, transaction %"
SQUADFORMAT")\n",
rpb->rpb_number.getValue(), transaction ? transaction->tra_number : 0);
VIO_trace(DEBUG_TRACE_INFO,
" record %"SLONGFORMAT":%d, rpb_trans %"SQUADFORMAT
", flags %d, back %"SLONGFORMAT":%d, fragment %"SLONGFORMAT":%d\n",
" record %" SLONGFORMAT":%d, rpb_trans %" SQUADFORMAT
", flags %d, back %" SLONGFORMAT":%d, fragment %" SLONGFORMAT":%d\n",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_transaction_nr,
rpb->rpb_flags, rpb->rpb_b_page, rpb->rpb_b_line,
rpb->rpb_f_page, rpb->rpb_f_line);
@ -2081,7 +2081,7 @@ bool VIO_get(thread_db* tdbb, record_param* rpb, jrd_tra* transaction, MemoryPoo
#ifdef VIO_DEBUG
VIO_trace(DEBUG_READS,
"VIO_get (record_param %"QUADFORMAT"d, transaction %"SQUADFORMAT", pool %p)\n",
"VIO_get (record_param %" QUADFORMAT"d, transaction %" SQUADFORMAT", pool %p)\n",
rpb->rpb_number.getValue(), transaction ? transaction->tra_number : 0,
(void*) pool);
#endif
@ -2100,8 +2100,8 @@ bool VIO_get(thread_db* tdbb, record_param* rpb, jrd_tra* transaction, MemoryPoo
#ifdef VIO_DEBUG
VIO_trace(DEBUG_READS_INFO,
" record %"SLONGFORMAT":%d, rpb_trans %"SQUADFORMAT
", flags %d, back %"SLONGFORMAT":%d, fragment %"SLONGFORMAT":%d\n",
" record %" SLONGFORMAT":%d, rpb_trans %" SQUADFORMAT
", flags %d, back %" SLONGFORMAT":%d, fragment %" SLONGFORMAT":%d\n",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_transaction_nr,
rpb->rpb_flags, rpb->rpb_b_page, rpb->rpb_b_line,
rpb->rpb_f_page, rpb->rpb_f_line);
@ -2160,7 +2160,7 @@ bool VIO_get_current(thread_db* tdbb,
#ifdef VIO_DEBUG
VIO_trace(DEBUG_TRACE,
"VIO_get_current (record_param %"QUADFORMAT"d, transaction %"SQUADFORMAT", pool %p)\n",
"VIO_get_current (record_param %" QUADFORMAT"d, transaction %" SQUADFORMAT", pool %p)\n",
rpb->rpb_number.getValue(), transaction ? transaction->tra_number : 0,
(void*) pool);
#endif
@ -2178,8 +2178,8 @@ bool VIO_get_current(thread_db* tdbb,
#ifdef VIO_DEBUG
VIO_trace(DEBUG_TRACE_INFO,
" record %"SLONGFORMAT":%d, rpb_trans %"SQUADFORMAT
", flags %d, back %"SLONGFORMAT":%d, fragment %"SLONGFORMAT":%d\n",
" record %" SLONGFORMAT":%d, rpb_trans %" SQUADFORMAT
", flags %d, back %" SLONGFORMAT":%d, fragment %" SLONGFORMAT":%d\n",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_transaction_nr,
rpb->rpb_flags, rpb->rpb_b_page, rpb->rpb_b_line,
rpb->rpb_f_page, rpb->rpb_f_line);
@ -2426,14 +2426,14 @@ void VIO_modify(thread_db* tdbb, record_param* org_rpb, record_param* new_rpb, j
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES,
"VIO_modify (org_rpb %"QUADFORMAT"d, new_rpb %"QUADFORMAT"d, "
"transaction %"SQUADFORMAT")\n",
"VIO_modify (org_rpb %" QUADFORMAT"d, new_rpb %" QUADFORMAT"d, "
"transaction %" SQUADFORMAT")\n",
org_rpb->rpb_number.getValue(), new_rpb->rpb_number.getValue(),
transaction ? transaction->tra_number : 0);
VIO_trace(DEBUG_WRITES_INFO,
" old record %"SLONGFORMAT":%d, rpb_trans %"SQUADFORMAT
", flags %d, back %"SLONGFORMAT":%d, fragment %"SLONGFORMAT":%d\n",
" old record %" SLONGFORMAT":%d, rpb_trans %" SQUADFORMAT
", flags %d, back %" SLONGFORMAT":%d, fragment %" SLONGFORMAT":%d\n",
org_rpb->rpb_page, org_rpb->rpb_line, org_rpb->rpb_transaction_nr,
org_rpb->rpb_flags, org_rpb->rpb_b_page, org_rpb->rpb_b_line,
org_rpb->rpb_f_page, org_rpb->rpb_f_line);
@ -2898,13 +2898,13 @@ bool VIO_next_record(thread_db* tdbb,
#ifdef VIO_DEBUG
VIO_trace(DEBUG_TRACE,
"VIO_next_record (record_param %"QUADFORMAT"d, transaction %"SQUADFORMAT", pool %p)\n",
"VIO_next_record (record_param %" QUADFORMAT"d, transaction %" SQUADFORMAT", pool %p)\n",
rpb->rpb_number.getValue(), transaction ? transaction->tra_number : 0,
(void*) pool);
VIO_trace(DEBUG_TRACE_INFO,
" record %"SLONGFORMAT":%d, rpb_trans %"SQUADFORMAT
", flags %d, back %"SLONGFORMAT":%d, fragment %"SLONGFORMAT":%d\n",
" record %" SLONGFORMAT":%d, rpb_trans %" SQUADFORMAT
", flags %d, back %" SLONGFORMAT":%d, fragment %" SLONGFORMAT":%d\n",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_transaction_nr,
rpb->rpb_flags, rpb->rpb_b_page, rpb->rpb_b_line,
rpb->rpb_f_page, rpb->rpb_f_line);
@ -2936,8 +2936,8 @@ bool VIO_next_record(thread_db* tdbb,
#ifdef VIO_DEBUG
VIO_trace(DEBUG_READS_INFO,
"VIO_next_record got record %"SLONGFORMAT":%d, rpb_trans %"
SQUADFORMAT", flags %d, back %"SLONGFORMAT":%d, fragment %"
"VIO_next_record got record %" SLONGFORMAT":%d, rpb_trans %"
SQUADFORMAT", flags %d, back %" SLONGFORMAT":%d, fragment %"
SLONGFORMAT":%d\n",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_transaction_nr,
rpb->rpb_flags, rpb->rpb_b_page, rpb->rpb_b_line,
@ -2965,7 +2965,7 @@ Record* VIO_record(thread_db* tdbb, record_param* rpb, const Format* format, Mem
#ifdef VIO_DEBUG
VIO_trace(DEBUG_TRACE,
"VIO_record (record_param %"QUADFORMAT"d, format %d, pool %p)\n",
"VIO_record (record_param %" QUADFORMAT"d, format %d, pool %p)\n",
rpb->rpb_number.getValue(), format ? format->fmt_version : 0,
(void*) pool);
#endif
@ -3006,7 +3006,7 @@ bool VIO_refetch_record(thread_db* tdbb, record_param* rpb, jrd_tra* transaction
**************************************/
#ifdef VIO_DEBUG
VIO_trace(DEBUG_READS,
"VIO_refetch_record (record_param %"QUADFORMAT"d, transaction %"SQUADFORMAT")\n",
"VIO_refetch_record (record_param %" QUADFORMAT"d, transaction %" SQUADFORMAT")\n",
rpb->rpb_number.getValue(), transaction ? transaction->tra_number : 0);
#endif
@ -3107,7 +3107,7 @@ void VIO_store(thread_db* tdbb, record_param* rpb, jrd_tra* transaction)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES,
"VIO_store (record_param %"QUADFORMAT"d, transaction %"SQUADFORMAT
"VIO_store (record_param %" QUADFORMAT"d, transaction %" SQUADFORMAT
")\n", rpb->rpb_number.getValue(),
transaction ? transaction->tra_number : 0);
#endif
@ -3459,8 +3459,8 @@ void VIO_store(thread_db* tdbb, record_param* rpb, jrd_tra* transaction)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES_INFO,
" record %"SLONGFORMAT":%d, rpb_trans %"SQUADFORMAT
", flags %d, back %"SLONGFORMAT":%d, fragment %"SLONGFORMAT":%d\n",
" record %" SLONGFORMAT":%d, rpb_trans %" SQUADFORMAT
", flags %d, back %" SLONGFORMAT":%d, fragment %" SLONGFORMAT":%d\n",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_transaction_nr,
rpb->rpb_flags, rpb->rpb_b_page, rpb->rpb_b_line,
rpb->rpb_f_page, rpb->rpb_f_line);
@ -3499,7 +3499,7 @@ bool VIO_sweep(thread_db* tdbb, jrd_tra* transaction, TraceSweepEvent* traceSwee
#ifdef VIO_DEBUG
VIO_trace(DEBUG_TRACE,
"VIO_sweep (transaction %"SQUADFORMAT")\n", transaction ? transaction->tra_number : 0);
"VIO_sweep (transaction %" SQUADFORMAT")\n", transaction ? transaction->tra_number : 0);
#endif
if (transaction->tra_attachment->att_flags & ATT_NO_CLEANUP)
@ -3660,7 +3660,7 @@ void VIO_verb_cleanup(thread_db* tdbb, jrd_tra* transaction)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_TRACE,
"VIO_verb_cleanup (transaction %"SQUADFORMAT")\n",
"VIO_verb_cleanup (transaction %" SQUADFORMAT")\n",
transaction ? transaction->tra_number : 0);
#endif
@ -3691,12 +3691,12 @@ bool VIO_writelock(thread_db* tdbb, record_param* org_rpb, jrd_tra* transaction)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES,
"VIO_writelock (org_rpb %"QUADFORMAT"d, transaction %"SQUADFORMAT")\n",
"VIO_writelock (org_rpb %" QUADFORMAT"d, transaction %" SQUADFORMAT")\n",
org_rpb->rpb_number.getValue(), transaction ? transaction->tra_number : 0);
VIO_trace(DEBUG_WRITES_INFO,
" old record %"SLONGFORMAT":%d, rpb_trans %"SQUADFORMAT
", flags %d, back %"SLONGFORMAT":%d, fragment %"SLONGFORMAT":%d\n",
" old record %" SLONGFORMAT":%d, rpb_trans %" SQUADFORMAT
", flags %d, back %" SLONGFORMAT":%d, fragment %" SLONGFORMAT":%d\n",
org_rpb->rpb_page, org_rpb->rpb_line, org_rpb->rpb_transaction_nr,
org_rpb->rpb_flags, org_rpb->rpb_b_page, org_rpb->rpb_b_line,
org_rpb->rpb_f_page, org_rpb->rpb_f_line);
@ -4051,12 +4051,12 @@ static void delete_record(thread_db* tdbb, record_param* rpb, ULONG prior_page,
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES,
"delete_record (record_param %"QUADFORMAT"d, prior_page %"SLONGFORMAT", pool %p)\n",
"delete_record (record_param %" QUADFORMAT"d, prior_page %" SLONGFORMAT", pool %p)\n",
rpb->rpb_number.getValue(), prior_page, (void*) pool);
VIO_trace(DEBUG_WRITES_INFO,
" delete_record record %"SLONGFORMAT":%d, rpb_trans %"SQUADFORMAT
", flags %d, back %"SLONGFORMAT":%d, fragment %"SLONGFORMAT":%d\n",
" delete_record record %" SLONGFORMAT":%d, rpb_trans %" SQUADFORMAT
", flags %d, back %" SLONGFORMAT":%d, fragment %" SLONGFORMAT":%d\n",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_transaction_nr,
rpb->rpb_flags, rpb->rpb_b_page, rpb->rpb_b_line,
rpb->rpb_f_page, rpb->rpb_f_line);
@ -4128,12 +4128,12 @@ static UCHAR* delete_tail(thread_db* tdbb,
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES,
"delete_tail (record_param %"QUADFORMAT"d, prior_page %"SLONGFORMAT", tail %p, tail_end %p)\n",
"delete_tail (record_param %" QUADFORMAT"d, prior_page %" SLONGFORMAT", tail %p, tail_end %p)\n",
rpb->rpb_number.getValue(), prior_page, tail, tail_end);
VIO_trace(DEBUG_WRITES_INFO,
" tail of record %"SLONGFORMAT":%d, rpb_trans %"SQUADFORMAT
", flags %d, back %"SLONGFORMAT":%d, fragment %"SLONGFORMAT":%d\n",
" tail of record %" SLONGFORMAT":%d, rpb_trans %" SQUADFORMAT
", flags %d, back %" SLONGFORMAT":%d, fragment %" SLONGFORMAT":%d\n",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_transaction_nr,
rpb->rpb_flags, rpb->rpb_b_page, rpb->rpb_b_line,
rpb->rpb_f_page, rpb->rpb_f_line);
@ -4216,8 +4216,8 @@ static void expunge(thread_db* tdbb, record_param* rpb, const jrd_tra* transacti
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES,
"expunge (record_param %"QUADFORMAT"d, transaction %"SQUADFORMAT
", prior_page %"SLONGFORMAT")\n",
"expunge (record_param %" QUADFORMAT"d, transaction %" SQUADFORMAT
", prior_page %" SLONGFORMAT")\n",
rpb->rpb_number.getValue(), transaction ? transaction->tra_number : 0,
prior_page);
#endif
@ -4238,8 +4238,8 @@ static void expunge(thread_db* tdbb, record_param* rpb, const jrd_tra* transacti
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES_INFO,
" expunge record %"SLONGFORMAT":%d, rpb_trans %"SQUADFORMAT
", flags %d, back %"SLONGFORMAT":%d, fragment %"SLONGFORMAT":%d\n",
" expunge record %" SLONGFORMAT":%d, rpb_trans %" SQUADFORMAT
", flags %d, back %" SLONGFORMAT":%d, fragment %" SLONGFORMAT":%d\n",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_transaction_nr,
rpb->rpb_flags, rpb->rpb_b_page, rpb->rpb_b_line,
rpb->rpb_f_page, rpb->rpb_f_line);
@ -4301,12 +4301,12 @@ static void garbage_collect(thread_db* tdbb, record_param* rpb, ULONG prior_page
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES,
"garbage_collect (record_param %"QUADFORMAT"d, prior_page %"SLONGFORMAT", staying)\n",
"garbage_collect (record_param %" QUADFORMAT"d, prior_page %" SLONGFORMAT", staying)\n",
rpb->rpb_number.getValue(), prior_page);
VIO_trace(DEBUG_WRITES_INFO,
" record %"SLONGFORMAT":%d, rpb_trans %"SQUADFORMAT
", flags %d, back %"SLONGFORMAT":%d, fragment %"SLONGFORMAT":%d\n",
" record %" SLONGFORMAT":%d, rpb_trans %" SQUADFORMAT
", flags %d, back %" SLONGFORMAT":%d, fragment %" SLONGFORMAT":%d\n",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_transaction_nr,
rpb->rpb_flags, rpb->rpb_b_page, rpb->rpb_b_line,
rpb->rpb_f_page, rpb->rpb_f_line);
@ -5145,19 +5145,19 @@ static int prepare_update( thread_db* tdbb,
#ifdef VIO_DEBUG
VIO_trace(DEBUG_TRACE_ALL,
"prepare_update (transaction %"SQUADFORMAT
", commit_tid read %"SQUADFORMAT", record_param %"QUADFORMAT"d, ",
"prepare_update (transaction %" SQUADFORMAT
", commit_tid read %" SQUADFORMAT", record_param %" QUADFORMAT"d, ",
transaction ? transaction->tra_number : 0, commit_tid_read,
rpb ? rpb->rpb_number.getValue() : 0);
VIO_trace(DEBUG_TRACE_ALL,
" temp_rpb %"QUADFORMAT"d, new_rpb %"QUADFORMAT"d, stack)\n",
" temp_rpb %" QUADFORMAT"d, new_rpb %" QUADFORMAT"d, stack)\n",
temp ? temp->rpb_number.getValue() : 0,
new_rpb ? new_rpb->rpb_number.getValue() : 0);
VIO_trace(DEBUG_TRACE_ALL_INFO,
" old record %"SLONGFORMAT":%d, rpb_trans %"SQUADFORMAT
", flags %d, back %"SLONGFORMAT":%d, fragment %"SLONGFORMAT
" old record %" SLONGFORMAT":%d, rpb_trans %" SQUADFORMAT
", flags %d, back %" SLONGFORMAT":%d, fragment %" SLONGFORMAT
":%d, prior %p\n",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_transaction_nr,
rpb->rpb_flags, rpb->rpb_b_page, rpb->rpb_b_line,
@ -5293,8 +5293,8 @@ static int prepare_update( thread_db* tdbb,
case tra_committed:
#ifdef VIO_DEBUG
VIO_trace(DEBUG_READS_INFO,
" record's transaction (%"SQUADFORMAT
") is committed (my TID - %"SQUADFORMAT")\n",
" record's transaction (%" SQUADFORMAT
") is committed (my TID - %" SQUADFORMAT")\n",
rpb->rpb_transaction_nr, transaction->tra_number);
#endif
if (rpb->rpb_flags & rpb_deleted)
@ -5353,8 +5353,8 @@ static int prepare_update( thread_db* tdbb,
if (state == tra_us)
{
VIO_trace(DEBUG_READS_INFO,
" record's transaction (%"SQUADFORMAT
") is us (my TID - %"SQUADFORMAT")\n",
" record's transaction (%" SQUADFORMAT
") is us (my TID - %" SQUADFORMAT")\n",
rpb->rpb_transaction_nr, transaction->tra_number);
}
#endif
@ -5400,7 +5400,7 @@ static int prepare_update( thread_db* tdbb,
case tra_limbo:
#ifdef VIO_DEBUG
VIO_trace(DEBUG_READS_INFO,
" record's transaction (%"SQUADFORMAT") is %s (my TID - %"SQUADFORMAT")\n",
" record's transaction (%" SQUADFORMAT") is %s (my TID - %" SQUADFORMAT")\n",
rpb->rpb_transaction_nr, (state == tra_active) ? "active" : "limbo",
transaction->tra_number);
#endif
@ -5463,7 +5463,7 @@ static int prepare_update( thread_db* tdbb,
case tra_dead:
#ifdef VIO_DEBUG
VIO_trace(DEBUG_READS_INFO,
" record's transaction (%"SQUADFORMAT") is dead (my TID - %"SQUADFORMAT")\n",
" record's transaction (%" SQUADFORMAT") is dead (my TID - %" SQUADFORMAT")\n",
rpb->rpb_transaction_nr, transaction->tra_number);
#endif
CCH_RELEASE(tdbb, &rpb->getWindow(tdbb));
@ -5563,11 +5563,11 @@ static void purge(thread_db* tdbb, record_param* rpb)
#ifdef VIO_DEBUG
VIO_trace(DEBUG_TRACE_ALL,
"purge (record_param %"QUADFORMAT"d)\n", rpb->rpb_number.getValue());
"purge (record_param %" QUADFORMAT"d)\n", rpb->rpb_number.getValue());
VIO_trace(DEBUG_TRACE_ALL_INFO,
" record %"SLONGFORMAT":%d, rpb_trans %"SQUADFORMAT
", flags %d, back %"SLONGFORMAT":%d, fragment %"SLONGFORMAT":%d\n",
" record %" SLONGFORMAT":%d, rpb_trans %" SQUADFORMAT
", flags %d, back %" SLONGFORMAT":%d, fragment %" SLONGFORMAT":%d\n",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_transaction_nr,
rpb->rpb_flags, rpb->rpb_b_page, rpb->rpb_b_line,
rpb->rpb_f_page, rpb->rpb_f_line);
@ -5641,12 +5641,12 @@ static void replace_record(thread_db* tdbb,
#ifdef VIO_DEBUG
VIO_trace(DEBUG_TRACE_ALL,
"replace_record (record_param %"QUADFORMAT"d, transaction %"SQUADFORMAT")\n",
"replace_record (record_param %" QUADFORMAT"d, transaction %" SQUADFORMAT")\n",
rpb->rpb_number.getValue(), transaction ? transaction->tra_number : 0);
VIO_trace(DEBUG_TRACE_ALL_INFO,
" record %"SLONGFORMAT":%d, rpb_trans %"SQUADFORMAT
", flags %d, back %"SLONGFORMAT":%d, fragment %"SLONGFORMAT
" record %" SLONGFORMAT":%d, rpb_trans %" SQUADFORMAT
", flags %d, back %" SLONGFORMAT":%d, fragment %" SLONGFORMAT
":%d, prior %p\n",
rpb->rpb_page, rpb->rpb_line, rpb->rpb_transaction_nr,
rpb->rpb_flags, rpb->rpb_b_page, rpb->rpb_b_line,
@ -5735,7 +5735,7 @@ static bool set_security_class(thread_db* tdbb, Record* record, USHORT field_id)
{
const SINT64 value = DYN_UTIL_gen_unique_id(tdbb, drq_g_nxt_sec_id, SQL_SECCLASS_GENERATOR);
Firebird::MetaName name;
name.printf("%s%"SQUADFORMAT, SQL_SECCLASS_PREFIX, value);
name.printf("%s%" SQUADFORMAT, SQL_SECCLASS_PREFIX, value);
dsc desc2;
desc2.makeText((USHORT) name.length(), CS_ASCII, (UCHAR*) name.c_str());
MOV_move(tdbb, &desc2, &desc1);
@ -5793,14 +5793,14 @@ void update_in_place(thread_db* tdbb,
#ifdef VIO_DEBUG
VIO_trace(DEBUG_TRACE_ALL,
"update_in_place (transaction %"SQUADFORMAT", org_rpb %"QUADFORMAT"d, "
"new_rpb %"QUADFORMAT"d)\n",
"update_in_place (transaction %" SQUADFORMAT", org_rpb %" QUADFORMAT"d, "
"new_rpb %" QUADFORMAT"d)\n",
transaction ? transaction->tra_number : 0, org_rpb->rpb_number.getValue(),
new_rpb ? new_rpb->rpb_number.getValue() : 0);
VIO_trace(DEBUG_TRACE_ALL_INFO,
" old record %"SLONGFORMAT":%d, rpb_trans %"SQUADFORMAT
", flags %d, back %"SLONGFORMAT":%d, fragment %"SLONGFORMAT":%d\n",
" old record %" SLONGFORMAT":%d, rpb_trans %" SQUADFORMAT
", flags %d, back %" SLONGFORMAT":%d, fragment %" SLONGFORMAT":%d\n",
org_rpb->rpb_page, org_rpb->rpb_line, org_rpb->rpb_transaction_nr,
org_rpb->rpb_flags, org_rpb->rpb_b_page, org_rpb->rpb_b_line,
org_rpb->rpb_f_page, org_rpb->rpb_f_line);

10
src/lock/lock.cpp
View File

@ -1576,7 +1576,7 @@ void LockManager::bug_assert(const TEXT* string, ULONG line)
TEXT buffer[MAXPATHLEN + 100];
lhb LOCK_header_copy;
sprintf((char*) buffer, "%s %"ULONGFORMAT": lock assertion failure: %.60s\n",
sprintf((char*) buffer, "%s %" ULONGFORMAT": lock assertion failure: %.60s\n",
__FILE__, line, string);
// Copy the shared memory so we can examine its state when we crashed
@ -1931,7 +1931,7 @@ lrq* LockManager::deadlock_walk(lrq* request, bool* maybe_deadlock)
#ifdef DEBUG_TRACE_DEADLOCKS
const own* owner = (own*) SRQ_ABS_PTR(request->lrq_owner);
const prc* proc = (prc*) SRQ_ABS_PTR(owner->own_process);
gds__log("deadlock chain: OWNER BLOCK %6"SLONGFORMAT"\tProcess id: %6d\tFlags: 0x%02X ",
gds__log("deadlock chain: OWNER BLOCK %6" SLONGFORMAT"\tProcess id: %6d\tFlags: 0x%02X ",
request->lrq_owner, proc->prc_process_id, owner->own_flags);
#endif
return request;
@ -2032,7 +2032,7 @@ lrq* LockManager::deadlock_walk(lrq* request, bool* maybe_deadlock)
#ifdef DEBUG_TRACE_DEADLOCKS
const own* const owner2 = (own*) SRQ_ABS_PTR(request->lrq_owner);
const prc* const proc = (prc*) SRQ_ABS_PTR(owner2->own_process);
gds__log("deadlock chain: OWNER BLOCK %6"SLONGFORMAT"\tProcess id: %6d\tFlags: 0x%02X ",
gds__log("deadlock chain: OWNER BLOCK %6" SLONGFORMAT"\tProcess id: %6d\tFlags: 0x%02X ",
request->lrq_owner, proc->prc_process_id, owner2->own_flags);
#endif
return target;
@ -2149,14 +2149,14 @@ lrq* LockManager::get_request(SRQ_PTR offset)
lrq* request = (lrq*) SRQ_ABS_PTR(offset);
if (offset == -1 || request->lrq_type != type_lrq)
{
sprintf(s, "invalid lock id (%"SLONGFORMAT")", offset);
sprintf(s, "invalid lock id (%" SLONGFORMAT")", offset);
bug(NULL, s);
}
const lbl* lock = (lbl*) SRQ_ABS_PTR(request->lrq_lock);
if (lock->lbl_type != type_lbl)
{
sprintf(s, "invalid lock (%"SLONGFORMAT")", offset);
sprintf(s, "invalid lock (%" SLONGFORMAT")", offset);
bug(NULL, s);
}

90
src/lock/print.cpp
View File

@ -192,9 +192,9 @@ public:
HtmlLink(const TEXT* prefix, const SLONG value)
{
if (sw_html_format && value && prefix)
sprintf(strBuffer, "<a href=\"#%s%"SLONGFORMAT"\">%6"SLONGFORMAT"</a>", prefix, value, value);
sprintf(strBuffer, "<a href=\"#%s%" SLONGFORMAT"\">%6" SLONGFORMAT"</a>", prefix, value, value);
else
sprintf(strBuffer, "%6"SLONGFORMAT, value);
sprintf(strBuffer, "%6" SLONGFORMAT, value);
}
operator const TEXT*()
{
@ -816,25 +816,25 @@ int CLIB_ROUTINE main( int argc, char *argv[])
times.tm_hour, times.tm_min, times.tm_sec);
FPRINTF(outfile,
"\tActive owner: %s, Length: %6"SLONGFORMAT", Used: %6"SLONGFORMAT"\n",
"\tActive owner: %s, Length: %6" SLONGFORMAT", Used: %6" SLONGFORMAT"\n",
(const TEXT*)HtmlLink(preOwn, LOCK_header->lhb_active_owner),
LOCK_header->lhb_length, LOCK_header->lhb_used);
FPRINTF(outfile,
"\tEnqs: %6"UQUADFORMAT", Converts: %6"UQUADFORMAT
", Rejects: %6"UQUADFORMAT", Blocks: %6"UQUADFORMAT"\n",
"\tEnqs: %6" UQUADFORMAT", Converts: %6" UQUADFORMAT
", Rejects: %6" UQUADFORMAT", Blocks: %6" UQUADFORMAT"\n",
LOCK_header->lhb_enqs, LOCK_header->lhb_converts,
LOCK_header->lhb_denies, LOCK_header->lhb_blocks);
FPRINTF(outfile,
"\tDeadlock scans: %6"UQUADFORMAT", Deadlocks: %6"UQUADFORMAT
", Scan interval: %3"ULONGFORMAT"\n",
"\tDeadlock scans: %6" UQUADFORMAT", Deadlocks: %6" UQUADFORMAT
", Scan interval: %3" ULONGFORMAT"\n",
LOCK_header->lhb_scans, LOCK_header->lhb_deadlocks,
LOCK_header->lhb_scan_interval);
FPRINTF(outfile,
"\tAcquires: %6"UQUADFORMAT", Acquire blocks: %6"UQUADFORMAT
", Spin count: %3"ULONGFORMAT"\n",
"\tAcquires: %6" UQUADFORMAT", Acquire blocks: %6" UQUADFORMAT
", Spin count: %3" ULONGFORMAT"\n",
LOCK_header->lhb_acquires, LOCK_header->lhb_acquire_blocks,
LOCK_header->lhb_acquire_spins);
@ -872,7 +872,7 @@ int CLIB_ROUTINE main( int argc, char *argv[])
FPRINTF(outfile, "\tHash slots: %4d, ", LOCK_header->lhb_hash_slots);
FPRINTF(outfile, "Hash lengths (min/avg/max): %4"SLONGFORMAT"/%4"SLONGFORMAT"/%4"SLONGFORMAT"\n",
FPRINTF(outfile, "Hash lengths (min/avg/max): %4" SLONGFORMAT"/%4" SLONGFORMAT"/%4" SLONGFORMAT"\n",
hash_min_count, (hash_total_count / LOCK_header->lhb_hash_slots),
hash_max_count);
@ -888,8 +888,8 @@ int CLIB_ROUTINE main( int argc, char *argv[])
const shb* a_shb = (shb*) SRQ_ABS_PTR(LOCK_header->lhb_secondary);
FPRINTF(outfile,
"\tRemove node: %6"SLONGFORMAT", Insert queue: %6"SLONGFORMAT
", Insert prior: %6"SLONGFORMAT"\n",
"\tRemove node: %6" SLONGFORMAT", Insert queue: %6" SLONGFORMAT
", Insert prior: %6" SLONGFORMAT"\n",
a_shb->shb_remove_node, a_shb->shb_insert_que,
a_shb->shb_insert_prior);
@ -1004,8 +1004,8 @@ static void prt_lock_activity(OUTFILE outfile,
if (flag & SW_I_ACQUIRE)
{
FPRINTF(outfile, "%9"UQUADFORMAT" %9"UQUADFORMAT" %9"UQUADFORMAT
" %9"UQUADFORMAT" %9"UQUADFORMAT" ",
FPRINTF(outfile, "%9" UQUADFORMAT" %9" UQUADFORMAT" %9" UQUADFORMAT
" %9" UQUADFORMAT" %9" UQUADFORMAT" ",
(header->lhb_acquires - prior.lhb_acquires) / seconds,
(header->lhb_acquire_blocks - prior.lhb_acquire_blocks) / seconds,
(header->lhb_acquires - prior.lhb_acquires) ?
@ -1024,9 +1024,9 @@ static void prt_lock_activity(OUTFILE outfile,
if (flag & SW_I_OPERATION)
{
FPRINTF(outfile, "%9"UQUADFORMAT" %9"UQUADFORMAT" %9"UQUADFORMAT
" %9"UQUADFORMAT" %9"UQUADFORMAT" %9"UQUADFORMAT
" %9"UQUADFORMAT" ",
FPRINTF(outfile, "%9" UQUADFORMAT" %9" UQUADFORMAT" %9" UQUADFORMAT
" %9" UQUADFORMAT" %9" UQUADFORMAT" %9" UQUADFORMAT
" %9" UQUADFORMAT" ",
(header->lhb_enqs - prior.lhb_enqs) / seconds,
(header->lhb_converts - prior.lhb_converts) / seconds,
(header->lhb_downgrades - prior.lhb_downgrades) / seconds,
@ -1046,9 +1046,9 @@ static void prt_lock_activity(OUTFILE outfile,
if (flag & SW_I_TYPE)
{
FPRINTF(outfile, "%9"UQUADFORMAT" %9"UQUADFORMAT" %9"UQUADFORMAT
" %9"UQUADFORMAT" %9"UQUADFORMAT" %9"UQUADFORMAT
" %9"UQUADFORMAT" ",
FPRINTF(outfile, "%9" UQUADFORMAT" %9" UQUADFORMAT" %9" UQUADFORMAT
" %9" UQUADFORMAT" %9" UQUADFORMAT" %9" UQUADFORMAT
" %9" UQUADFORMAT" ",
(header->lhb_operations[Jrd::LCK_database] -
prior.lhb_operations[Jrd::LCK_database]) / seconds,
(header->lhb_operations[Jrd::LCK_relation] -
@ -1074,9 +1074,9 @@ static void prt_lock_activity(OUTFILE outfile,
if (flag & SW_I_WAIT)
{
FPRINTF(outfile, "%9"UQUADFORMAT" %9"UQUADFORMAT" %9"UQUADFORMAT
" %9"UQUADFORMAT" %9"UQUADFORMAT" %9"UQUADFORMAT
" %9"UQUADFORMAT" ",
FPRINTF(outfile, "%9" UQUADFORMAT" %9" UQUADFORMAT" %9" UQUADFORMAT
" %9" UQUADFORMAT" %9" UQUADFORMAT" %9" UQUADFORMAT
" %9" UQUADFORMAT" ",
(header->lhb_waits - prior.lhb_waits) / seconds,
(header->lhb_denies - prior.lhb_denies) / seconds,
(header->lhb_timeouts - prior.lhb_timeouts) / seconds,
@ -1105,8 +1105,8 @@ static void prt_lock_activity(OUTFILE outfile,
FPRINTF(outfile, "\nAverage: ");
if (flag & SW_I_ACQUIRE)
{
FPRINTF(outfile, "%9"UQUADFORMAT" %9"UQUADFORMAT" %9"UQUADFORMAT
" %9"UQUADFORMAT" %9"UQUADFORMAT" ",
FPRINTF(outfile, "%9" UQUADFORMAT" %9" UQUADFORMAT" %9" UQUADFORMAT
" %9" UQUADFORMAT" %9" UQUADFORMAT" ",
(header->lhb_acquires - base.lhb_acquires) / factor,
(header->lhb_acquire_blocks - base.lhb_acquire_blocks) / factor,
(header->lhb_acquires - base.lhb_acquires) ?
@ -1118,8 +1118,8 @@ static void prt_lock_activity(OUTFILE outfile,
if (flag & SW_I_OPERATION)
{
FPRINTF(outfile, "%9"UQUADFORMAT" %9"UQUADFORMAT" %9"UQUADFORMAT
" %9"UQUADFORMAT" %9"UQUADFORMAT" %9"UQUADFORMAT" %9"
FPRINTF(outfile, "%9" UQUADFORMAT" %9" UQUADFORMAT" %9" UQUADFORMAT
" %9" UQUADFORMAT" %9" UQUADFORMAT" %9" UQUADFORMAT" %9"
UQUADFORMAT" ",
(header->lhb_enqs - base.lhb_enqs) / factor,
(header->lhb_converts - base.lhb_converts) / factor,
@ -1132,9 +1132,9 @@ static void prt_lock_activity(OUTFILE outfile,
if (flag & SW_I_TYPE)
{
FPRINTF(outfile, "%9"UQUADFORMAT" %9"UQUADFORMAT" %9"UQUADFORMAT
" %9"UQUADFORMAT" %9"UQUADFORMAT" %9"UQUADFORMAT
" %9"UQUADFORMAT" ",
FPRINTF(outfile, "%9" UQUADFORMAT" %9" UQUADFORMAT" %9" UQUADFORMAT
" %9" UQUADFORMAT" %9" UQUADFORMAT" %9" UQUADFORMAT
" %9" UQUADFORMAT" ",
(header->lhb_operations[Jrd::LCK_database] -
base.lhb_operations[Jrd::LCK_database]) / factor,
(header->lhb_operations[Jrd::LCK_relation] -
@ -1152,9 +1152,9 @@ static void prt_lock_activity(OUTFILE outfile,
if (flag & SW_I_WAIT)
{
FPRINTF(outfile, "%9"UQUADFORMAT" %9"UQUADFORMAT" %9"UQUADFORMAT
" %9"UQUADFORMAT" %9"UQUADFORMAT" %9"UQUADFORMAT
" %9"UQUADFORMAT" ",
FPRINTF(outfile, "%9" UQUADFORMAT" %9" UQUADFORMAT" %9" UQUADFORMAT
" %9" UQUADFORMAT" %9" UQUADFORMAT" %9" UQUADFORMAT
" %9" UQUADFORMAT" ",
(header->lhb_waits - base.lhb_waits) / factor,
(header->lhb_denies - base.lhb_denies) / factor,
(header->lhb_timeouts - base.lhb_timeouts) / factor,
@ -1217,15 +1217,15 @@ static void prt_lock(OUTFILE outfile, const lhb* LOCK_header, const lbl* lock, U
return;
if (!sw_html_format)
FPRINTF(outfile, "LOCK BLOCK %6"SLONGFORMAT"\n", SRQ_REL_PTR(lock));
FPRINTF(outfile, "LOCK BLOCK %6" SLONGFORMAT"\n", SRQ_REL_PTR(lock));
else
{
const SLONG rel_lock = SRQ_REL_PTR(lock);
FPRINTF(outfile, "<a name=\"%s%"SLONGFORMAT"\">LOCK BLOCK %6"SLONGFORMAT"</a>\n",
FPRINTF(outfile, "<a name=\"%s%" SLONGFORMAT"\">LOCK BLOCK %6" SLONGFORMAT"</a>\n",
preLock, rel_lock, rel_lock);
}
FPRINTF(outfile,
"\tSeries: %d, State: %d, Size: %d, Length: %d, Data: %"SQUADFORMAT"\n",
"\tSeries: %d, State: %d, Size: %d, Length: %d, Data: %" SQUADFORMAT"\n",
lock->lbl_series, lock->lbl_state, lock->lbl_size, lock->lbl_length, lock->lbl_data);
if ((lock->lbl_series == Jrd::LCK_bdb || lock->lbl_series == Jrd::LCK_btr_dont_gc) &&
@ -1243,14 +1243,14 @@ static void prt_lock(OUTFILE outfile, const lhb* LOCK_header, const lbl* lock, U
ULONG pg_space;
memcpy(&pg_space, q, sizeof(SLONG));
FPRINTF(outfile, "\tKey: %04"ULONGFORMAT":%06"SLONGFORMAT",", pg_space, key);
FPRINTF(outfile, "\tKey: %04" ULONGFORMAT":%06" SLONGFORMAT",", pg_space, key);
}
else if (lock->lbl_length == 4)
{
SLONG key;
memcpy(&key, lock->lbl_key, 4);
FPRINTF(outfile, "\tKey: %06"SLONGFORMAT",", key);
FPRINTF(outfile, "\tKey: %06" SLONGFORMAT",", key);
}
else
{
@ -1329,17 +1329,17 @@ static void prt_owner(OUTFILE outfile,
const prc* process = (prc*) SRQ_ABS_PTR(owner->own_process);
if (!sw_html_format)
FPRINTF(outfile, "OWNER BLOCK %6"SLONGFORMAT"\n", SRQ_REL_PTR(owner));
FPRINTF(outfile, "OWNER BLOCK %6" SLONGFORMAT"\n", SRQ_REL_PTR(owner));
else
{
const SLONG rel_owner = SRQ_REL_PTR(owner);
FPRINTF(outfile, "<a name=\"%s%"SLONGFORMAT"\">OWNER BLOCK %6"SLONGFORMAT"</a>\n",
FPRINTF(outfile, "<a name=\"%s%" SLONGFORMAT"\">OWNER BLOCK %6" SLONGFORMAT"</a>\n",
preOwn, rel_owner, rel_owner);
}
FPRINTF(outfile, "\tOwner id: %6"QUADFORMAT"d, Type: %1d\n",
FPRINTF(outfile, "\tOwner id: %6" QUADFORMAT"d, Type: %1d\n",
owner->own_owner_id, owner->own_owner_type);
FPRINTF(outfile, "\tProcess id: %6d (%s), Thread id: %6"SIZEFORMAT"\n",
FPRINTF(outfile, "\tProcess id: %6d (%s), Thread id: %6" SIZEFORMAT"\n",
process->prc_process_id,
ISC_check_process_existence(process->prc_process_id) ? "Alive" : "Dead",
// please keep C-cast here - own_thread_id type varies great from OS to OS
@ -1510,11 +1510,11 @@ static void prt_request(OUTFILE outfile, const lhb* LOCK_header, const lrq* requ
**************************************/
if (!sw_html_format)
FPRINTF(outfile, "REQUEST BLOCK %6"SLONGFORMAT"\n", SRQ_REL_PTR(request));
FPRINTF(outfile, "REQUEST BLOCK %6" SLONGFORMAT"\n", SRQ_REL_PTR(request));
else
{
const SLONG rel_request = SRQ_REL_PTR(request);
FPRINTF(outfile, "<a name=\"%s%"SLONGFORMAT"\">REQUEST BLOCK %6"SLONGFORMAT"</a>\n",
FPRINTF(outfile, "<a name=\"%s%" SLONGFORMAT"\">REQUEST BLOCK %6" SLONGFORMAT"</a>\n",
preRequest, rel_request, rel_request);
}
FPRINTF(outfile, "\tOwner: %s, Lock: %s, State: %d, Mode: %d, Flags: 0x%02X\n",
@ -1563,7 +1563,7 @@ static void prt_que(OUTFILE outfile,
SRQ_LOOP((*que_inst), next)
++count;
FPRINTF(outfile, "%s (%"SLONGFORMAT"):\tforward: %s, backward: %s\n", string, count,
FPRINTF(outfile, "%s (%" SLONGFORMAT"):\tforward: %s, backward: %s\n", string, count,
(const TEXT*) HtmlLink(prefix, que_inst->srq_forward - que_offset),
(const TEXT*) HtmlLink(prefix, que_inst->srq_backward - que_offset));
}

8
src/misc/codes.epp
View File

@ -409,9 +409,9 @@ static void build_iberror_h()
fprintf(iberror,
"const ISC_STATUS isc_facility = %d;\n", isc_facility_local);
fprintf(iberror,
"const ISC_STATUS isc_base = %"SLONGFORMAT"L;\n", isc_base_local);
"const ISC_STATUS isc_base = %" SLONGFORMAT"L;\n", isc_base_local);
fprintf(iberror,
"const ISC_STATUS isc_factor = %"SLONGFORMAT";\n", isc_factor_local);
"const ISC_STATUS isc_factor = %" SLONGFORMAT";\n", isc_factor_local);
// Append the ISC C++ boiler plate
@ -453,8 +453,8 @@ static void build_iberror_h()
new_code = 0L;
fprintf(iberror, "#define isc_facility %d\n", isc_facility_local);
fprintf(iberror, "#define isc_base %"SLONGFORMAT"L\n", isc_base_local);
fprintf(iberror, "#define isc_factor %"SLONGFORMAT"\n", isc_factor_local);
fprintf(iberror, "#define isc_base %" SLONGFORMAT"L\n", isc_base_local);
fprintf(iberror, "#define isc_factor %" SLONGFORMAT"\n", isc_factor_local);
fprintf(iberror, "\n");
// Append the ISC C boiler plate

4
src/msgs/build_file.epp
View File

@ -386,11 +386,11 @@ static USHORT do_msgs( const TEXT* filename, const TEXT* locale, bool sw_warning
END_FOR;
if (!found_one && sw_warning)
printf
("build_file: Warning - no %s translation of msg# %"QUADFORMAT"d\n",
("build_file: Warning - no %s translation of msg# %" QUADFORMAT"d\n",
locale, X.CODE);
if (found_one > 1 && sw_warning)
printf
("build_file: Warning - multiple %s translations of msg# %"QUADFORMAT"d\n",
("build_file: Warning - multiple %s translations of msg# %" QUADFORMAT"d\n",
locale, X.CODE);
if (found_one != 1)
warning_counter++;

2
src/qli/dtr.cpp
View File

@ -309,7 +309,7 @@ int CLIB_ROUTINE main(int argc, char** argv)
if (startup_file.length())
LEX_push_file(startup_file.c_str(), false);
#if defined(_MSC_VER) && _MSC_VER >= 1400
#if defined(_MSC_VER) && _MSC_VER >= 1400 && _MSC_VER < 1900
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif

8
src/qli/exe.cpp
View File

@ -1114,19 +1114,19 @@ static void print_counts( qli_req* request)
switch (item)
{
case isc_info_req_select_count:
printf("\nrecords selected: %"ULONGFORMAT"\n", number);
printf("\nrecords selected: %" ULONGFORMAT"\n", number);
break;
case isc_info_req_insert_count:
printf("records inserted: %"ULONGFORMAT"\n", number);
printf("records inserted: %" ULONGFORMAT"\n", number);
break;
case isc_info_req_update_count:
printf("records updated: %"ULONGFORMAT"\n", number);
printf("records updated: %" ULONGFORMAT"\n", number);
break;
case isc_info_req_delete_count:
printf("records deleted: %"ULONGFORMAT"\n", number);
printf("records deleted: %" ULONGFORMAT"\n", number);
break;
default:

2
src/qli/format.cpp
View File

@ -826,7 +826,7 @@ static void format_index( qli_print_item* item, qli_nod* field, const bool print
switch (subscript->nod_type)
{
case nod_constant:
sprintf(s, "%"SLONGFORMAT, MOVQ_get_long(&subscript->nod_desc, 0));
sprintf(s, "%" SLONGFORMAT, MOVQ_get_long(&subscript->nod_desc, 0));
q = s;
l = static_cast<USHORT>(strlen(s));
break;

4
src/qli/mov.cpp
View File

@ -1081,7 +1081,7 @@ static void sql_time_to_text( const ULONG date[1], DSC* to)
isc_decode_date((const ISC_QUAD*) date2, &times);
TEXT temp[35];
sprintf(temp, " %2d:%.2d:%.2d.%.4"SLONGFORMAT, times.tm_hour, times.tm_min,
sprintf(temp, " %2d:%.2d:%.2d.%.4" SLONGFORMAT, times.tm_hour, times.tm_min,
times.tm_sec, date2[1] % PRECISION);
const TEXT* p = temp;
@ -1122,7 +1122,7 @@ static void timestamp_to_text( const SLONG date[2], DSC* to)
if (times.tm_hour || times.tm_min || times.tm_sec || date[1])
{
TEXT time[15];
sprintf(time, " %2d:%.2d:%.2d.%.4"SLONGFORMAT, times.tm_hour, times.tm_min,
sprintf(time, " %2d:%.2d:%.2d.%.4" SLONGFORMAT, times.tm_hour, times.tm_min,
times.tm_sec, date[1] % PRECISION);
strcat(temp, time);
}

4
src/qli/show.epp
View File

@ -439,11 +439,11 @@ static void array_dimensions( qli_dbb* database, const TEXT* field_name)
if (D.RDB$LOWER_BOUND != 1)
{
sprintf(p, "%"SLONGFORMAT":", D.RDB$LOWER_BOUND);
sprintf(p, "%" SLONGFORMAT":", D.RDB$LOWER_BOUND);
while (*++p);
}
sprintf(p, "%"SLONGFORMAT", ", D.RDB$UPPER_BOUND);
sprintf(p, "%" SLONGFORMAT", ", D.RDB$UPPER_BOUND);
while (*++p);
END_FOR;

4
src/remote/inet.cpp
View File

@ -1756,7 +1756,7 @@ static int fork(SOCKET old_handle, USHORT flag)
}
string cmdLine;
cmdLine.printf("%s -i -h %"HANDLEFORMAT"@%"ULONGFORMAT, name, new_handle, GetCurrentProcessId());
cmdLine.printf("%s -i -h %" HANDLEFORMAT"@%" ULONGFORMAT, name, new_handle, GetCurrentProcessId());
STARTUPINFO start_crud;
start_crud.cb = sizeof(STARTUPINFO);
@ -2114,7 +2114,7 @@ static bool select_wait( rem_port* main_port, Select* selct)
if (badSocket || INET_ERRNO == NOTASOCKET)
{
// not a socket, strange !
gds__log("INET/select_wait: found \"not a socket\" socket : %"HANDLEFORMAT,
gds__log("INET/select_wait: found \"not a socket\" socket : %" HANDLEFORMAT,
port->port_handle);
// this will lead to receive() which will break bad connection

2
src/remote/os/win32/wnet.cpp
View File

@ -364,7 +364,7 @@ rem_port* WNET_connect(const TEXT* name, PACKET* packet, USHORT flag, Firebird::
GetModuleFileName(NULL, name, sizeof(name));
string cmdLine;
cmdLine.printf("%s -w -h %"HANDLEFORMAT"@%"ULONGFORMAT, name, port->port_pipe, GetCurrentProcessId());
cmdLine.printf("%s -w -h %" HANDLEFORMAT"@%" ULONGFORMAT, name, port->port_pipe, GetCurrentProcessId());
STARTUPINFO start_crud;
PROCESS_INFORMATION pi;

2
src/remote/os/win32/xnet.cpp
View File

@ -2367,7 +2367,7 @@ bool XnetServerEndPoint::fork(ULONG client_pid, USHORT flag, ULONG* forked_pid)
GetModuleFileName(NULL, name, sizeof(name));
string cmdLine;
cmdLine.printf("%s -x -h %"ULONGFORMAT, name, client_pid);
cmdLine.printf("%s -x -h %" ULONGFORMAT, name, client_pid);
STARTUPINFO start_crud;
start_crud.cb = sizeof(STARTUPINFO);

18
src/remote/os/win32/xnet.h
View File

@ -184,21 +184,21 @@ const size_t XNET_CONNECT_RESPONZE_SIZE = sizeof(XNET_RESPONSE);
// Windows names used to identify various named objects
const char* const XNET_MAPPED_FILE_NAME = "%s_MAP_%"ULONGFORMAT"_%"ULONGFORMAT;
const char* const XNET_MAPPED_FILE_NAME = "%s_MAP_%" ULONGFORMAT"_%" ULONGFORMAT;
const char* const XNET_CONNECT_MAP = "%s_CONNECT_MAP";
const char* const XNET_CONNECT_MUTEX = "%s_CONNECT_MUTEX";
const char* const XNET_CONNECT_EVENT = "%s_CONNECT_EVENT";
const char* const XNET_RESPONSE_EVENT = "%s_RESPONSE_EVENT";
const char* const XNET_E_C2S_DATA_CHAN_FILLED = "%s_E_C2S_DATA_FILLED_%"ULONGFORMAT"_%"ULONGFORMAT"_%"ULONGFORMAT;
const char* const XNET_E_C2S_DATA_CHAN_EMPTED = "%s_E_C2S_DATA_EMPTED_%"ULONGFORMAT"_%"ULONGFORMAT"_%"ULONGFORMAT;
const char* const XNET_E_S2C_DATA_CHAN_FILLED = "%s_E_S2C_DATA_FILLED_%"ULONGFORMAT"_%"ULONGFORMAT"_%"ULONGFORMAT;
const char* const XNET_E_S2C_DATA_CHAN_EMPTED = "%s_E_S2C_DATA_EMPTED_%"ULONGFORMAT"_%"ULONGFORMAT"_%"ULONGFORMAT;
const char* const XNET_E_C2S_DATA_CHAN_FILLED = "%s_E_C2S_DATA_FILLED_%" ULONGFORMAT"_%" ULONGFORMAT"_%" ULONGFORMAT;
const char* const XNET_E_C2S_DATA_CHAN_EMPTED = "%s_E_C2S_DATA_EMPTED_%" ULONGFORMAT"_%" ULONGFORMAT"_%" ULONGFORMAT;
const char* const XNET_E_S2C_DATA_CHAN_FILLED = "%s_E_S2C_DATA_FILLED_%" ULONGFORMAT"_%" ULONGFORMAT"_%" ULONGFORMAT;
const char* const XNET_E_S2C_DATA_CHAN_EMPTED = "%s_E_S2C_DATA_EMPTED_%" ULONGFORMAT"_%" ULONGFORMAT"_%" ULONGFORMAT;
const char* const XNET_E_C2S_EVNT_CHAN_FILLED = "%s_E_C2S_EVNT_FILLED_%"ULONGFORMAT"_%"ULONGFORMAT"_%"ULONGFORMAT;
const char* const XNET_E_C2S_EVNT_CHAN_EMPTED = "%s_E_C2S_EVNT_EMPTED_%"ULONGFORMAT"_%"ULONGFORMAT"_%"ULONGFORMAT;
const char* const XNET_E_S2C_EVNT_CHAN_FILLED = "%s_E_S2C_EVNT_FILLED_%"ULONGFORMAT"_%"ULONGFORMAT"_%"ULONGFORMAT;
const char* const XNET_E_S2C_EVNT_CHAN_EMPTED = "%s_E_S2C_EVNT_EMPTED_%"ULONGFORMAT"_%"ULONGFORMAT"_%"ULONGFORMAT;
const char* const XNET_E_C2S_EVNT_CHAN_FILLED = "%s_E_C2S_EVNT_FILLED_%" ULONGFORMAT"_%" ULONGFORMAT"_%" ULONGFORMAT;
const char* const XNET_E_C2S_EVNT_CHAN_EMPTED = "%s_E_C2S_EVNT_EMPTED_%" ULONGFORMAT"_%" ULONGFORMAT"_%" ULONGFORMAT;
const char* const XNET_E_S2C_EVNT_CHAN_FILLED = "%s_E_S2C_EVNT_FILLED_%" ULONGFORMAT"_%" ULONGFORMAT"_%" ULONGFORMAT;
const char* const XNET_E_S2C_EVNT_CHAN_EMPTED = "%s_E_S2C_EVNT_EMPTED_%" ULONGFORMAT"_%" ULONGFORMAT"_%" ULONGFORMAT;
#endif // REMOTE_XNET_H

4
src/utilities/fbsvcmgr/fbsvcmgr.cpp
View File

@ -628,12 +628,12 @@ void printMessage(USHORT number, const SafeArg& arg, bool newLine = true)
void printInt(const char*& p, SLONG num)
{
printf("%s: %"SLONGFORMAT"\n", getMessage(num).c_str(), getInt(p));
printf("%s: %" SLONGFORMAT"\n", getMessage(num).c_str(), getInt(p));
}
void printInt64(const char*& p, SINT64 num)
{
printf("%s: %"SQUADFORMAT"\n", getMessage(num).c_str(), getInt64(p));
printf("%s: %" SQUADFORMAT"\n", getMessage(num).c_str(), getInt64(p));
}
const char* capArray[] = {

20
src/utilities/gstat/ppg.cpp
View File

@ -63,29 +63,29 @@ void PPG_print_header(const header_page* header, ULONG page,
{
uSvc->printf(false, "\tFlags\t\t\t%d\n", header->hdr_header.pag_flags);
//uSvc->printf("\tChecksum\t\t%d\n", header->hdr_header.pag_checksum);
uSvc->printf(false, "\tGeneration\t\t%"ULONGFORMAT"\n", header->hdr_header.pag_generation);
uSvc->printf(false, "\tSystem Change Number\t%"ULONGFORMAT"\n", header->hdr_header.pag_scn);
uSvc->printf(false, "\tGeneration\t\t%" ULONGFORMAT"\n", header->hdr_header.pag_generation);
uSvc->printf(false, "\tSystem Change Number\t%" ULONGFORMAT"\n", header->hdr_header.pag_scn);
uSvc->printf(false, "\tPage size\t\t%d\n", header->hdr_page_size);
uSvc->printf(false, "\tODS version\t\t%d.%d\n",
header->hdr_ods_version & ~ODS_FIREBIRD_FLAG, header->hdr_ods_minor);
uSvc->printf(false, "\tOldest transaction\t%"SQUADFORMAT"\n", Ods::getOIT(header));
uSvc->printf(false, "\tOldest active\t\t%"SQUADFORMAT"\n", Ods::getOAT(header));
uSvc->printf(false, "\tOldest snapshot\t\t%"SQUADFORMAT"\n", Ods::getOST(header));
uSvc->printf(false, "\tNext transaction\t%"SQUADFORMAT"\n", Ods::getNT(header));
uSvc->printf(false, "\tOldest transaction\t%" SQUADFORMAT"\n", Ods::getOIT(header));
uSvc->printf(false, "\tOldest active\t\t%" SQUADFORMAT"\n", Ods::getOAT(header));
uSvc->printf(false, "\tOldest snapshot\t\t%" SQUADFORMAT"\n", Ods::getOST(header));
uSvc->printf(false, "\tNext transaction\t%" SQUADFORMAT"\n", Ods::getNT(header));
uSvc->printf(false, "\tSequence number\t\t%d\n", header->hdr_sequence);
const AttNumber att_id =
(AttNumber) header->hdr_att_high << BITS_PER_LONG | header->hdr_attachment_id;
uSvc->printf(false, "\tNext attachment ID\t%"SQUADFORMAT"\n", att_id);
uSvc->printf(false, "\tNext attachment ID\t%" SQUADFORMAT"\n", att_id);
Firebird::DbImplementation imp(header);
uSvc->printf(false, "\tImplementation\t\tHW=%s %s-endian OS=%s CC=%s\n",
imp.cpu(), imp.endianess(), imp.os(), imp.cc());
uSvc->printf(false, "\tShadow count\t\t%"SLONGFORMAT"\n", header->hdr_shadow_count);
uSvc->printf(false, "\tPage buffers\t\t%"ULONGFORMAT"\n", header->hdr_page_buffers);
uSvc->printf(false, "\tShadow count\t\t%" SLONGFORMAT"\n", header->hdr_shadow_count);
uSvc->printf(false, "\tPage buffers\t\t%" ULONGFORMAT"\n", header->hdr_page_buffers);
}
uSvc->printf(false, "\tNext header page\t%"ULONGFORMAT"\n", header->hdr_next_page);
uSvc->printf(false, "\tNext header page\t%" ULONGFORMAT"\n", header->hdr_next_page);
#ifdef DEV_BUILD
uSvc->printf(false, "\tClumplet End\t\t%d\n", header->hdr_end);
#endif

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

@ -302,7 +302,7 @@ static USHORT inst_error(ULONG status, const TEXT* string)
sizeof(buffer),
NULL))
{
printf("Windows NT error %"SLONGFORMAT"\n", status);
printf("Windows NT error %" SLONGFORMAT"\n", status);
}
else
{

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

@ -188,7 +188,7 @@ static USHORT reg_error( SLONG status, const TEXT* string, HKEY hkey)
sizeof(buffer),
NULL);
if (!l) {
printf("Windows NT error %"SLONGFORMAT"\n", status);
printf("Windows NT error %" SLONGFORMAT"\n", status);
}
else
{

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

@ -709,7 +709,7 @@ static USHORT svc_error( SLONG status, const TEXT* string, SC_HANDLE service)
sizeof(buffer),
NULL))
{
printf("Windows NT error %"SLONGFORMAT"\n", status);
printf("Windows NT error %" SLONGFORMAT"\n", status);
}
else
{

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

@ -740,7 +740,7 @@ void NBackup::pr_error(const ISC_STATUS* status, const char* operation)
fprintf(stderr, "[\n");
printMsg(23, SafeArg() << operation); // PROBLEM ON "%s".
isc_print_status(status);
fprintf(stderr, "SQLCODE:%"SLONGFORMAT"\n", isc_sqlcode(status));
fprintf(stderr, "SQLCODE:%" SLONGFORMAT"\n", isc_sqlcode(status));
fprintf(stderr, "]\n");
m_printed = true;

2
src/utilities/ntrace/TraceConfiguration.cpp
View File

@ -262,7 +262,7 @@ ULONG TraceCfgReader::parseUInteger(const ConfigFile::Parameter* el) const
{
const char *value = el->value.c_str();
ULONG result = 0;
if (!sscanf(value, "%"ULONGFORMAT, &result))
if (!sscanf(value, "%" ULONGFORMAT, &result))
{
fatal_exception::raiseFmt(ERROR_PREFIX
"line %d, element \"%s\": \"%s\" is not a valid integer value",

40
src/utilities/ntrace/TracePluginImpl.cpp
View File

@ -251,7 +251,7 @@ void TracePluginImpl::logRecordConn(const char* action, ITraceDatabaseConnection
if (reg)
{
string temp;
temp.printf("\t%s (ATT_%"SQUADFORMAT", <unknown, bug?>)" NEWLINE,
temp.printf("\t%s (ATT_%" SQUADFORMAT", <unknown, bug?>)" NEWLINE,
config.db_filename.c_str(), conn_id);
record.insert(0, temp);
break;
@ -297,7 +297,7 @@ void TracePluginImpl::logRecordTrans(const char* action, ITraceDatabaseConnectio
if (reg)
{
string temp;
temp.printf("\t\t(TRA_%"SQUADFORMAT", <unknown, bug?>)" NEWLINE, transaction->getTransactionID());
temp.printf("\t\t(TRA_%" SQUADFORMAT", <unknown, bug?>)" NEWLINE, transaction->getTransactionID());
record.insert(0, temp);
break;
}
@ -354,7 +354,7 @@ void TracePluginImpl::logRecordStmt(const char* action, ITraceDatabaseConnection
if (reg)
{
string temp;
temp.printf(NEWLINE "Statement %"SQUADFORMAT", <unknown, bug?>:" NEWLINE, stmt_id);
temp.printf(NEWLINE "Statement %" SQUADFORMAT", <unknown, bug?>:" NEWLINE, stmt_id);
record.insert(0, temp);
break;
}
@ -459,32 +459,32 @@ void TracePluginImpl::appendGlobalCounts(const PerformanceInfo* info)
{
string temp;
temp.printf("%7"QUADFORMAT"d ms", info->pin_time);
temp.printf("%7" QUADFORMAT"d ms", info->pin_time);
record.append(temp);
ntrace_counter_t cnt;
if ((cnt = info->pin_counters[RuntimeStatistics::PAGE_READS]) != 0)
{
temp.printf(", %"QUADFORMAT"d read(s)", cnt);
temp.printf(", %" QUADFORMAT"d read(s)", cnt);
record.append(temp);
}
if ((cnt = info->pin_counters[RuntimeStatistics::PAGE_WRITES]) != 0)
{
temp.printf(", %"QUADFORMAT"d write(s)", cnt);
temp.printf(", %" QUADFORMAT"d write(s)", cnt);
record.append(temp);
}
if ((cnt = info->pin_counters[RuntimeStatistics::PAGE_FETCHES]) != 0)
{
temp.printf(", %"QUADFORMAT"d fetch(es)", cnt);
temp.printf(", %" QUADFORMAT"d fetch(es)", cnt);
record.append(temp);
}
if ((cnt = info->pin_counters[RuntimeStatistics::PAGE_MARKS]) != 0)
{
temp.printf(", %"QUADFORMAT"d mark(s)", cnt);
temp.printf(", %" QUADFORMAT"d mark(s)", cnt);
record.append(temp);
}
@ -518,7 +518,7 @@ void TracePluginImpl::appendTableCounts(const PerformanceInfo *info)
{
//fb_utils::exactNumericToStr(trc->trc_counters[j], 0, temp);
//record.append(' ', 10 - temp.length());
temp.printf("%10"QUADFORMAT"d", trc->trc_counters[j]);
temp.printf("%10" QUADFORMAT"d", trc->trc_counters[j]);
record.append(temp);
}
}
@ -952,7 +952,7 @@ void TracePluginImpl::register_connection(ITraceDatabaseConnection* connection)
string tmp(*getDefaultMemoryPool());
conn_data.description->printf("\t%s (ATT_%"SQUADFORMAT,
conn_data.description->printf("\t%s (ATT_%" SQUADFORMAT,
connection->getDatabaseName(), connection->getConnectionID());
const char* user = connection->getUserName();
@ -1051,7 +1051,7 @@ void TracePluginImpl::register_transaction(ITraceTransaction* transaction)
TransactionData trans_data;
trans_data.id = transaction->getTransactionID();
trans_data.description = FB_NEW_POOL(*getDefaultMemoryPool()) string(*getDefaultMemoryPool());
trans_data.description->printf("\t\t(TRA_%"SQUADFORMAT", ", trans_data.id);
trans_data.description->printf("\t\t(TRA_%" SQUADFORMAT", ", trans_data.id);
switch (transaction->getIsolation())
{
@ -1232,7 +1232,7 @@ void TracePluginImpl::log_event_proc_execute(ITraceDatabaseConnection* connectio
if (info->pin_records_fetched)
{
string temp;
temp.printf("%"QUADFORMAT"d records fetched" NEWLINE, info->pin_records_fetched);
temp.printf("%" QUADFORMAT"d records fetched" NEWLINE, info->pin_records_fetched);
record.append(temp);
}
appendGlobalCounts(info);
@ -1288,7 +1288,7 @@ void TracePluginImpl::log_event_func_execute(ITraceDatabaseConnection* connectio
{
params = function->getResult();
{
record.append("returns:"NEWLINE);
record.append("returns:" NEWLINE);
appendParams(params);
record.append(NEWLINE);
}
@ -1299,7 +1299,7 @@ void TracePluginImpl::log_event_func_execute(ITraceDatabaseConnection* connectio
if (info->pin_records_fetched)
{
string temp;
temp.printf("%"QUADFORMAT"d records fetched" NEWLINE, info->pin_records_fetched);
temp.printf("%" QUADFORMAT"d records fetched" NEWLINE, info->pin_records_fetched);
record.append(temp);
}
appendGlobalCounts(info);
@ -1492,7 +1492,7 @@ void TracePluginImpl::log_event_dsql_execute(ITraceDatabaseConnection* connectio
if (info)
{
string temp;
temp.printf("%"QUADFORMAT"d records fetched" NEWLINE, info->pin_records_fetched);
temp.printf("%" QUADFORMAT"d records fetched" NEWLINE, info->pin_records_fetched);
record.append(temp);
appendGlobalCounts(info);
@ -1527,7 +1527,7 @@ void TracePluginImpl::register_blr_statement(ITraceBLRStatement* statement)
string* description = FB_NEW_POOL(*getDefaultMemoryPool()) string(*getDefaultMemoryPool());
if (statement->getStmtID()) {
description->printf(NEWLINE "Statement %"SQUADFORMAT":" NEWLINE, statement->getStmtID());
description->printf(NEWLINE "Statement %" SQUADFORMAT":" NEWLINE, statement->getStmtID());
}
if (config.print_blr)
@ -2061,10 +2061,10 @@ void TracePluginImpl::log_event_sweep(ITraceDatabaseConnection* connection, ITra
sweep_state == SWEEP_STATE_FINISHED)
{
record.printf("\nTransaction counters:\n"
"\tOldest interesting %10"SQUADFORMAT"\n"
"\tOldest active %10"SQUADFORMAT"\n"
"\tOldest snapshot %10"SQUADFORMAT"\n"
"\tNext transaction %10"SQUADFORMAT"\n",
"\tOldest interesting %10" SQUADFORMAT"\n"
"\tOldest active %10" SQUADFORMAT"\n"
"\tOldest snapshot %10" SQUADFORMAT"\n"
"\tNext transaction %10" SQUADFORMAT"\n",
sweep->getOIT(),
sweep->getOAT(),
sweep->getOST(),

6
src/yvalve/perf.cpp
View File

@ -191,20 +191,20 @@ static int perf_format(const P* before, const P* after,
case 'b':
case 'c':
case 'x':
sprintf(p, "%"SQUADFORMAT, delta);
sprintf(p, "%" SQUADFORMAT, delta);
while (*p)
p++;
break;
case 'u':
case 's':
sprintf(p, "%"SQUADFORMAT".%.2"SQUADFORMAT, delta / TICK, (delta % TICK) * 100 / TICK);
sprintf(p, "%" SQUADFORMAT".%.2" SQUADFORMAT, delta / TICK, (delta % TICK) * 100 / TICK);
while (*p)
p++;
break;
case 'e':
sprintf(p, "%"SQUADFORMAT".%.2"SQUADFORMAT, delta / 100, delta % 100);
sprintf(p, "%" SQUADFORMAT".%.2" SQUADFORMAT, delta / 100, delta % 100);
while (*p)
p++;
break;