From c64e8f944e471776d7cd242a6843d752e103f240 Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Tue, 20 Sep 2016 00:45:29 +0100 Subject: [PATCH] cdvdgigaherz: Fix printf sign mismatch warnings Fixes warning C6340: printf sign mismatch Only remaining warnings for cdvdGigaherz (using level 4 warning settings) are: C6258: TerminateThread does not allow proper thread clean up C4201: nonstandard extension used: nameless struct/union (from the lo/hi u128 struct in common/include/Pcsx2Types.h) --- plugins/cdvdGigaherz/src/CDVD.cpp | 4 ++-- plugins/cdvdGigaherz/src/TocStuff.cpp | 2 +- plugins/cdvdGigaherz/src/Windows/IOCtlSrc.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/cdvdGigaherz/src/CDVD.cpp b/plugins/cdvdGigaherz/src/CDVD.cpp index 73d347f8fc..4f5c12d44b 100644 --- a/plugins/cdvdGigaherz/src/CDVD.cpp +++ b/plugins/cdvdGigaherz/src/CDVD.cpp @@ -521,7 +521,7 @@ s32 CALLBACK CDVDgetTOC(u8 *tocBuff) tocBuff[28] = itob(sec); tocBuff[29] = itob(frm); - fprintf(stderr, "Track 0: %d mins %d secs %d frames\n", min, sec, frm); + fprintf(stderr, "Track 0: %u mins %u secs %u frames\n", min, sec, frm); for (i = diskInfo.strack; i <= diskInfo.etrack; i++) { err = CDVDgetTD(i, &trackInfo); @@ -531,7 +531,7 @@ s32 CALLBACK CDVDgetTOC(u8 *tocBuff) tocBuff[i * 10 + 37] = itob(min); tocBuff[i * 10 + 38] = itob(sec); tocBuff[i * 10 + 39] = itob(frm); - fprintf(stderr, "Track %d: %d mins %d secs %d frames\n", i, min, sec, frm); + fprintf(stderr, "Track %u: %u mins %u secs %u frames\n", i, min, sec, frm); } } else return -1; diff --git a/plugins/cdvdGigaherz/src/TocStuff.cpp b/plugins/cdvdGigaherz/src/TocStuff.cpp index 23ae3d68ca..deae3d07b7 100644 --- a/plugins/cdvdGigaherz/src/TocStuff.cpp +++ b/plugins/cdvdGigaherz/src/TocStuff.cpp @@ -113,7 +113,7 @@ s32 cdvdParseTOC() tracks[tn].type = CDVD_MODE1_TRACK; } - fprintf(stderr, "Track %d: %d mins %d secs %d frames\n", tn, min, sec, frm); + fprintf(stderr, "Track %d: %u mins %u secs %u frames\n", tn, min, sec, frm); } else if (cdtoc.Descriptors[i].Point > 0) { printf("Found code 0x%02x\n", cdtoc.Descriptors[i].Point); } diff --git a/plugins/cdvdGigaherz/src/Windows/IOCtlSrc.cpp b/plugins/cdvdGigaherz/src/Windows/IOCtlSrc.cpp index acf00c4a80..a6f8a46123 100644 --- a/plugins/cdvdGigaherz/src/Windows/IOCtlSrc.cpp +++ b/plugins/cdvdGigaherz/src/Windows/IOCtlSrc.cpp @@ -230,7 +230,7 @@ void IOCtlSrc::SetSpindleSpeed(bool restore_defaults) &dontcare, //#bytes returned (LPOVERLAPPED)NULL)) //synchronous I/O == 0) { - printf(" * CDVD: setSpindleSpeed success (%dKB/s)\n", speed); + printf(" * CDVD: setSpindleSpeed success (%uKB/s)\n", speed); } else { printf(" * CDVD: setSpindleSpeed failed! \n"); } @@ -418,7 +418,7 @@ s32 IOCtlSrc::ReadSectors2352(u32 sector, u32 count, char *buffer) rri.TrackMode = CDDA; printf(" * CDVD: Trying CDDA\n"); if (DeviceIoControl(device, IOCTL_CDROM_RAW_READ, &rri, sizeof(rri), buffer, 2352 * count, &size, NULL) == 0) { - printf(" * CDVD: Failed to read this CD-ROM with error code: %d\n", GetLastError()); + printf(" * CDVD: Failed to read this CD-ROM with error code: %u\n", GetLastError()); return -1; } }