From f725c2a4d44858270feaf3877d443bf6a6c4d3d9 Mon Sep 17 00:00:00 2001
From: Martin Szulecki
Date: Thu, 2 Apr 2009 15:24:48 +0200
Subject: Remove use of positional parameters in printf() as it does not work
 on Windows

---
 wii_tmd.c |  5 +++--
 wii_wad.c | 14 +++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/wii_tmd.c b/wii_tmd.c
index 8f4002d..1624c2a 100644
--- a/wii_tmd.c
+++ b/wii_tmd.c
@@ -159,7 +159,8 @@ void print_tmd(tmd_header *tmd) {
 	printf("version           : %x\n", tmd->version);
 	printf("ca_crl_version    : %x\n", tmd->ca_crl_version);
 	printf("signer_crl_version: %x\n", tmd->signer_crl_version);
-	printf("sys_version       : %016llx (IOS%llu)\n", tmd->sys_version, tmd->sys_version & 0xff);
+	printf("sys_version       : %016llx ", tmd->sys_version);
+	printf("(IOS%llu)\n", tmd->sys_version & 0xff);
 	printf("title_category    : %08x (%s)\n", tmd->title_category, tmd_lookup_title_category_name(tmd->title_category));
 	printf("title_id          : %08x ", tmd->title_id);
 	if(tmd->title_category == TITLE_CATEGORY_SYSTEM) {
@@ -190,7 +191,7 @@ void print_tmd_content_records(tmd_header *tmd, tmd_content_record *tmd_content)
 		printf("cid  : %08x\n", cr->cid);
 		printf("index: %04x\n", cr->index);
 		printf("type : %04x\n", cr->type);
-		printf("size : %1$016llx (%1$llu)\n", cr->size);
+		printf("size : %016llx (%llu)\n", cr->size, cr->size);
 		printf("hash : ");
 		for (n = 0; n < 20; n++)
 			printf("%02x", cr->hash[n]);
diff --git a/wii_wad.c b/wii_wad.c
index 792c84c..5bc7527 100644
--- a/wii_wad.c
+++ b/wii_wad.c
@@ -10,15 +10,15 @@
 
 void print_wad(wad_header *wad) {
 	printf("- wad_header\n");
-	printf("size              : %1$08x (%1$d)\n", wad->size);
+	printf("size              : %08x (%d)\n", wad->size, wad->size);
 	printf("type              : %04x (%.2s)\n", wad->type, (char*)&wad->type);
 	printf("unknown           : %04x\n", wad->unk0);
-	printf("cert_chain_size   : %1$08x (%1$d)\n", wad->cert_chain_size);
-	printf("crl_size          : %1$08x (%1$d)\n", wad->crl_size);
-	printf("ticket_size       : %1$08x (%1$d)\n", wad->ticket_size);
-	printf("tmd_size          : %1$08x (%1$d)\n", wad->tmd_size);
-	printf("data_size         : %1$08x (%1$d)\n", wad->data_size);
-	printf("footer_size       : %1$08x (%1$d)\n", wad->footer_size);
+	printf("cert_chain_size   : %08x (%d)\n", wad->cert_chain_size, wad->cert_chain_size);
+	printf("crl_size          : %08x (%d)\n", wad->crl_size, wad->crl_size);
+	printf("ticket_size       : %08x (%d)\n", wad->ticket_size, wad->ticket_size);
+	printf("tmd_size          : %08x (%d)\n", wad->tmd_size, wad->tmd_size);
+	printf("data_size         : %08x (%d)\n", wad->data_size, wad->data_size);
+	printf("footer_size       : %08x (%d)\n", wad->footer_size, wad->footer_size);
 }
 
 int wad_read(FILE *f, wad_header *wad) {
-- 
cgit v1.1-32-gdbae