8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 22:43:04 +01:00

Correct formats

This commit is contained in:
brodsom 2003-04-03 01:51:03 +00:00
parent 926d325a62
commit 927e886d81
6 changed files with 20 additions and 20 deletions

View File

@ -2360,7 +2360,7 @@ void DSQL_pretty(DSQL_NOD node, int column)
if (node->nod_desc.dsc_dtype == dtype_text)
sprintf(s, "constant \"%s\"", node->nod_desc.dsc_address);
else
sprintf(s, "constant %d",
sprintf(s, "constant %ld",
*(SLONG *) (node->nod_desc.dsc_address));
verb = s;
}
@ -2481,7 +2481,7 @@ void DSQL_pretty(DSQL_NOD node, int column)
}
if (node->nod_desc.dsc_dtype) {
PRINTF("%s%s (%d,%d,%x)\n",
PRINTF("%s%s (%d,%d,%p)\n",
buffer, verb,
node->nod_desc.dsc_dtype,
node->nod_desc.dsc_length, node->nod_desc.dsc_address);

View File

@ -119,12 +119,12 @@ void HSHD_debug(void)
collision = collision->sym_collision) {
/* check any homonyms first */
ib_fprintf(ib_stderr, "Symbol type %d: %s %x\n",
ib_fprintf(ib_stderr, "Symbol type %d: %s %p\n",
collision->sym_type, collision->sym_string,
collision->sym_dbb);
for (homptr = collision->sym_homonym; homptr;
homptr = homptr->sym_homonym) {
ib_fprintf(ib_stderr, "Homonym Symbol type %d: %s %x\n",
ib_fprintf(ib_stderr, "Homonym Symbol type %d: %s %p\n",
homptr->sym_type, homptr->sym_string,
homptr->sym_dbb);
}

View File

@ -491,7 +491,7 @@ ULONG IPS_start_thread(ULONG client_pid)
CHAR szBuf[80];
DWORD dw = GetLastError();
sprintf(szBuf, "%s:%s failed: GetLastError returned %u\n",
sprintf(szBuf, "%s:%s failed: GetLastError returned %lu\n",
"ipserver.c", "DuplicateHandle(server_proc)", dw);
gds__log(szBuf);
}
@ -503,7 +503,7 @@ ULONG IPS_start_thread(ULONG client_pid)
CHAR szBuf[80];
DWORD dw = GetLastError();
sprintf(szBuf, "%s:%s failed: GetLastError returned %u\n",
sprintf(szBuf, "%s:%s failed: GetLastError returned %lu\n",
"ipserver.c", "DuplicateHandle(ips_server_proc)", dw);
gds__log(szBuf);
comm->ips_server_proc = 0;

View File

@ -252,7 +252,7 @@ void CNTL_shutdown_service( TEXT * message)
char *strings[2];
HANDLE event_source;
sprintf(buffer, "%s error: %d", "Firebird Server", GetLastError());
sprintf(buffer, "%s error: %lu", "Firebird Server", GetLastError());
event_source = RegisterEventSource(NULL, "Firebird Server");
if (event_source) {

View File

@ -653,7 +653,7 @@ BOOL CanEndServer(HWND hWnd, BOOL bSysExit)
JRD_num_attachments(NULL, 0, 0, &usNumAtt, &usNumDbs);
sprintf(szMsgString, "%lu ", usNumAtt);
sprintf(szMsgString, "%u ", usNumAtt);
if (!usNumAtt) /* IF 0 CONNECTIONS, JUST SHUTDOWN */
return TRUE;

View File

@ -338,10 +338,10 @@ void PPG_print_log( LIP logp, SLONG page,
memcpy(temp, p + 2, logp->log_cp_1.cp_fn_length);
temp[logp->log_cp_1.cp_fn_length] = '\0';
FPRINTF(outfile, "\t\tFile name:\t%s\n", temp);
FPRINTF(outfile, "\t\tPartition offset: %ld ",
FPRINTF(outfile, "\t\tPartition offset: %"SLONGFORMAT" ",
logp->log_cp_1.cp_p_offset);
FPRINTF(outfile, "\tSeqno: %ld ", logp->log_cp_1.cp_seqno);
FPRINTF(outfile, "\tOffset: %ld ", logp->log_cp_1.cp_offset);
FPRINTF(outfile, "\tSeqno: %"SLONGFORMAT" ", logp->log_cp_1.cp_seqno);
FPRINTF(outfile, "\tOffset: %"SLONGFORMAT" ", logp->log_cp_1.cp_offset);
FPRINTF(outfile, "\n");
break;
@ -351,10 +351,10 @@ void PPG_print_log( LIP logp, SLONG page,
memcpy(temp, p + 2, logp->log_cp_2.cp_fn_length);
temp[logp->log_cp_2.cp_fn_length] = '\0';
FPRINTF(outfile, "\t\tFile name:\t%s\n", temp);
FPRINTF(outfile, "\t\tPartition offset: %ld ",
FPRINTF(outfile, "\t\tPartition offset: %"SLONGFORMAT" ",
logp->log_cp_2.cp_p_offset);
FPRINTF(outfile, "\tSeqno: %ld ", logp->log_cp_2.cp_seqno);
FPRINTF(outfile, "\tOffset: %ld ", logp->log_cp_2.cp_offset);
FPRINTF(outfile, "\tSeqno: %"SLONGFORMAT" ", logp->log_cp_2.cp_seqno);
FPRINTF(outfile, "\tOffset: %"SLONGFORMAT" ", logp->log_cp_2.cp_offset);
FPRINTF(outfile, "\n");
break;
@ -364,17 +364,17 @@ void PPG_print_log( LIP logp, SLONG page,
memcpy(temp, p + 2, logp->log_file.cp_fn_length);
temp[logp->log_file.cp_fn_length] = '\0';
FPRINTF(outfile, "\t\tFile name:\t\t%s\n", temp);
FPRINTF(outfile, "\t\tPartition offset: %ld ",
FPRINTF(outfile, "\t\tPartition offset: %"SLONGFORMAT" ",
logp->log_file.cp_p_offset);
FPRINTF(outfile, "\tSeqno: %ld ", logp->log_file.cp_seqno);
FPRINTF(outfile, "\tOffset: %ld ", logp->log_file.cp_offset);
FPRINTF(outfile, "\tSeqno: %"SLONGFORMAT" ", logp->log_file.cp_seqno);
FPRINTF(outfile, "\tOffset: %"SLONGFORMAT" ", logp->log_file.cp_offset);
FPRINTF(outfile, "\n");
break;
case LOG_chkpt_len:
memcpy(&ltemp, p + 2, p[1]);
FPRINTF(outfile, "\tCheck Point Length %ld\n", ltemp);
FPRINTF(outfile, "\tCheck Point Length %"SLONGFORMAT"\n", ltemp);
break;
case LOG_num_bufs:
@ -384,12 +384,12 @@ void PPG_print_log( LIP logp, SLONG page,
case LOG_bufsize:
memcpy(&ustemp, p + 2, p[1]);
FPRINTF(outfile, "\tWAL buffer Size %ld\n", ustemp);
FPRINTF(outfile, "\tWAL buffer Size %u\n", ustemp);
break;
case LOG_grp_cmt_wait:
memcpy(&ltemp, p + 2, p[1]);
FPRINTF(outfile, "\tGroup Commit Wait Time %ld\n", ltemp);
FPRINTF(outfile, "\tGroup Commit Wait Time %"SLONGFORMAT"\n", ltemp);
break;
default: