From 669d07ba3e5a89c77354b5f2c1cf8dd1e5cc7b83 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Wed, 7 Mar 2018 13:20:14 -0800 Subject: [PATCH] SCP: Fix compile WIN32 MinGW warnings --- sim_disk.c | 4 ++-- sim_fio.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sim_disk.c b/sim_disk.c index 2f98f9a7..0aaf9c99 100644 --- a/sim_disk.c +++ b/sim_disk.c @@ -2310,7 +2310,7 @@ if (!memcmp ("\\.\\", rawdevicename, 3)) { Handle = CreateFileA (tmpname, DesiredAccess, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS|FILE_FLAG_WRITE_THROUGH, NULL); free (tmpname); if (Handle != INVALID_HANDLE_VALUE) { - if ((sim_os_disk_info_raw (Handle, NULL, NULL, &is_cdrom)) || + if ((sim_os_disk_info_raw ((FILE *)Handle, NULL, NULL, &is_cdrom)) || (DesiredAccess & GENERIC_WRITE) && is_cdrom) { CloseHandle (Handle); errno = EACCES; @@ -2324,7 +2324,7 @@ if (Handle == INVALID_HANDLE_VALUE) { _set_errno_from_status (GetLastError ()); return NULL; } -if ((sim_os_disk_info_raw (Handle, NULL, NULL, &is_cdrom)) || +if ((sim_os_disk_info_raw ((FILE *)Handle, NULL, NULL, &is_cdrom)) || (DesiredAccess & GENERIC_WRITE) && is_cdrom) { CloseHandle (Handle); errno = EACCES; diff --git a/sim_fio.c b/sim_fio.c index 340aefcc..6d7cb6e0 100644 --- a/sim_fio.c +++ b/sim_fio.c @@ -390,7 +390,7 @@ dwStatus = FormatMessageA (FORMAT_MESSAGE_FROM_SYSTEM| sizeof (szMsgBuffer) -1, // __in DWORD nSize, NULL); // __in_opt va_list *Arguments if (0 == dwStatus) - snprintf(szMsgBuffer, sizeof(szMsgBuffer) - 1, "Error Code: 0x%lX", Error); + snprintf(szMsgBuffer, sizeof(szMsgBuffer) - 1, "Error Code: 0x%X", Error); while (sim_isspace (szMsgBuffer[strlen (szMsgBuffer)-1])) szMsgBuffer[strlen (szMsgBuffer) - 1] = '\0'; return szMsgBuffer;