silence warnings in wrc
Timo Kreuzer
timo.kreuzer at web.de
Sat Aug 26 09:44:26 CDT 2006
silence 20 warning of the type "warning: long unsigned int format, unsigned int
arg (arg 2)" with gcc 3.4.5.
-------------- next part --------------
Index: dumpres.c
===================================================================
--- dumpres.c (revision 23717)
+++ dumpres.c (working copy)
@@ -203,12 +203,12 @@
printf("LANGUAGE <not set>\n");
if(l->version)
- printf("VERSION %08lx\n", *(l->version));
+ printf("VERSION %08x\n", *(l->version));
else
printf("VERSION <not set>\n");
if(l->characts)
- printf("CHARACTERISTICS %08lx\n", *(l->characts));
+ printf("CHARACTERISTICS %08x\n", *(l->characts));
else
printf("CHARACTERISTICS <not set>\n");
}
@@ -537,16 +537,16 @@
{
assert(ctrl->style != NULL);
assert(ctrl->style->and_mask == 0);
- printf("\tStyle: %08lx\n", ctrl->style->or_mask);
+ printf("\tStyle: %08x\n", ctrl->style->or_mask);
}
if(ctrl->gotexstyle)
{
assert(ctrl->exstyle != NULL);
assert(ctrl->exstyle->and_mask == 0);
- printf("\tExStyle: %08lx\n", ctrl->exstyle->or_mask);
+ printf("\tExStyle: %08x\n", ctrl->exstyle->or_mask);
}
if(ctrl->gothelpid)
- printf("\tHelpid: %ld\n", ctrl->helpid);
+ printf("\tHelpid: %d\n", ctrl->helpid);
if(ctrl->extra)
{
printf("\t");
@@ -577,14 +577,14 @@
{
assert(dlg->style != NULL);
assert(dlg->style->and_mask == 0);
- printf("Style: %08lx\n", dlg->style->or_mask);
+ printf("Style: %08x\n", dlg->style->or_mask);
}
if(dlg->gotexstyle)
{
assert(dlg->exstyle != NULL);
assert(dlg->exstyle->and_mask == 0);
- printf("ExStyle: %08lx\n", dlg->exstyle->or_mask);
+ printf("ExStyle: %08x\n", dlg->exstyle->or_mask);
}
printf("Menu: %s\n", get_nameid_str(dlg->menu));
printf("Class: %s\n", get_nameid_str(dlg->dlgclass));
@@ -627,16 +627,16 @@
{
assert(dlgex->style != NULL);
assert(dlgex->style->and_mask == 0);
- printf("Style: %08lx\n", dlgex->style->or_mask);
+ printf("Style: %08x\n", dlgex->style->or_mask);
}
if(dlgex->gotexstyle)
{
assert(dlgex->exstyle != NULL);
assert(dlgex->exstyle->and_mask == 0);
- printf("ExStyle: %08lx\n", dlgex->exstyle->or_mask);
+ printf("ExStyle: %08x\n", dlgex->exstyle->or_mask);
}
if(dlgex->gothelpid)
- printf("Helpid: %ld\n", dlgex->helpid);
+ printf("Helpid: %d\n", dlgex->helpid);
printf("Menu: %s\n", get_nameid_str(dlgex->menu));
printf("Class: %s\n", get_nameid_str(dlgex->dlgclass));
printf("Title: "); print_string(dlgex->title); printf("\n");
@@ -683,7 +683,7 @@
if(item->name)
{
print_string(item->name);
- printf(", %d, %08lx", item->id, item->state);
+ printf(", %d, %08x", item->id, item->state);
}
else
printf("SEPARATOR");
@@ -732,9 +732,9 @@
if(item->gotid)
printf(", Id=%d", item->id);
if(item->gottype)
- printf(", Type=%ld", item->type);
+ printf(", Type=%d", item->type);
if(item->gotstate)
- printf(", State=%08lx", item->state);
+ printf(", State=%08x", item->state);
if(item->gothelpid)
printf(", HelpId=%d", item->helpid);
printf("\n");
@@ -749,9 +749,9 @@
if(item->gotid)
printf(", Id=%d", item->id);
if(item->gottype)
- printf(", Type=%ld", item->type);
+ printf(", Type=%d", item->type);
if(item->gotstate)
- printf(", State=%08lx", item->state);
+ printf(", State=%08x", item->state);
if(item->gothelpid)
printf(", HelpId=%d", item->helpid);
}
Index: newstruc.c
===================================================================
--- newstruc.c (revision 23717)
+++ newstruc.c (working copy)
@@ -328,7 +328,7 @@
else
{
fprintf(stderr, "bisizel %d bosizel %d b4sizel %d\n", bisizel, bosizel, b4sizel);
- yyerror("Invalid bitmap format, bih->biSize = %ld", bih->biSize);
+ yyerror("Invalid bitmap format, bih->biSize = %d", bih->biSize);
}
switch(type)
@@ -1045,7 +1045,7 @@
for(id = mbp[i].idlo; id <= mbp[i].idhi; id++)
{
if(MSGTAB_BAD_PTR(mep, rd->data, rd->size, mep->length))
- yyerror("Messagetable's data for block %d, ID 0x%08lx is outside of defined data", (int)i, id);
+ yyerror("Messagetable's data for block %d, ID 0x%08x is outside of defined data", (int)i, id);
if(mep->flags == 1) /* Docu says 'flags == 0x0001' for unicode */
{
WORD *wp = (WORD *)&mep[1];
@@ -1053,7 +1053,7 @@
int n;
if(mep->length & 1)
- yyerror("Message 0x%08lx is unicode (block %d), but has odd length (%d)", id, (int)i, mep->length);
+ yyerror("Message 0x%08x is unicode (block %d), but has odd length (%d)", id, (int)i, mep->length);
for(n = 0; n < l; n++)
wp[n] = BYTESWAP_WORD(wp[n]);
@@ -1098,7 +1098,7 @@
mep->flags = BYTESWAP_WORD(mep->flags);
if(MSGTAB_BAD_PTR(mep, rd->data, rd->size, mep->length))
- yyerror("Messagetable's data for block %d, ID 0x%08lx is outside of defined data", (int)i, id);
+ yyerror("Messagetable's data for block %d, ID 0x%08x is outside of defined data", (int)i, id);
if(mep->flags == 1) /* Docu says 'flags == 0x0001' for unicode */
{
WORD *wp = (WORD *)&mep[1];
@@ -1106,7 +1106,7 @@
int n;
if(mep->length & 1)
- yyerror("Message 0x%08lx is unicode (block %d), but has odd length (%d)", id, (int)i, mep->length);
+ yyerror("Message 0x%08x is unicode (block %d), but has odd length (%d)", id, (int)i, mep->length);
for(n = 0; n < l; n++)
wp[n] = BYTESWAP_WORD(wp[n]);
More information about the wine-patches
mailing list