From 6a1fc83b7f43a5e5a64839de9a12acf66e8be720 Mon Sep 17 00:00:00 2001 From: GaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com> Date: Sat, 31 May 2025 00:34:19 +0200 Subject: [PATCH] Fix debug format specifiers Fixes compiling with latest wut version --- source/devoptab/devoptab_fsa.cpp | 2 +- source/devoptab/devoptab_fsa_dirnext.cpp | 2 +- source/devoptab/devoptab_fsa_diropen.cpp | 2 +- source/devoptab/devoptab_fsa_fstat.cpp | 2 +- source/devoptab/devoptab_fsa_open.cpp | 8 ++++---- source/devoptab/devoptab_fsa_read.cpp | 2 +- source/devoptab/devoptab_fsa_seek.cpp | 2 +- source/devoptab/devoptab_fsa_stat.cpp | 2 +- source/devoptab/devoptab_fsa_statvfs.cpp | 2 +- source/devoptab/devoptab_fsa_truncate.cpp | 2 +- source/devoptab/devoptab_fsa_write.cpp | 2 +- source/fsa.cpp | 8 ++++---- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/source/devoptab/devoptab_fsa.cpp b/source/devoptab/devoptab_fsa.cpp index 52acc88..3516491 100644 --- a/source/devoptab/devoptab_fsa.cpp +++ b/source/devoptab/devoptab_fsa.cpp @@ -167,7 +167,7 @@ MochaUtilsStatus Mocha_MountFSEx(const char *virt_name, const char *dev_path, co if (dev_path) { res = FSAMount(mount->clientHandle, dev_path, mount_path, mountFlags, mountArgBuf, mountArgBufLen); if (res < 0) { - DEBUG_FUNCTION_LINE_ERR("FSAMount(0x%08X, %s, %s, %08X, %08X, %08X) failed: %s", mount->clientHandle, dev_path, mount_path, mountFlags, mountArgBuf, mountArgBufLen, FSAGetStatusStr(res)); + DEBUG_FUNCTION_LINE_ERR("FSAMount(0x%08X, %s, %s, %08X, %p, %08X) failed: %s", mount->clientHandle, dev_path, mount_path, mountFlags, mountArgBuf, mountArgBufLen, FSAGetStatusStr(res)); fsa_free(mount); if (res == FS_ERROR_ALREADY_EXISTS) { return MOCHA_RESULT_ALREADY_EXISTS; diff --git a/source/devoptab/devoptab_fsa_dirnext.cpp b/source/devoptab/devoptab_fsa_dirnext.cpp index e13a555..a087cb3 100644 --- a/source/devoptab/devoptab_fsa_dirnext.cpp +++ b/source/devoptab/devoptab_fsa_dirnext.cpp @@ -23,7 +23,7 @@ int __fsa_dirnext(struct _reent *r, status = FSAReadDir(deviceData->clientHandle, dir->fd, &dir->entry_data); if (status < 0) { if (status != FS_ERROR_END_OF_DIR) { - DEBUG_FUNCTION_LINE_ERR("FSAReadDir(0x%08X, 0x%08X, 0x%08X) (%s) failed: %s", + DEBUG_FUNCTION_LINE_ERR("FSAReadDir(0x%08X, 0x%08X, %p) (%s) failed: %s", deviceData->clientHandle, dir->fd, &dir->entry_data, dir->name, FSAGetStatusStr(status)); } r->_errno = __fsa_translate_error(status); diff --git a/source/devoptab/devoptab_fsa_diropen.cpp b/source/devoptab/devoptab_fsa_diropen.cpp index 0886870..f3c74bf 100644 --- a/source/devoptab/devoptab_fsa_diropen.cpp +++ b/source/devoptab/devoptab_fsa_diropen.cpp @@ -28,7 +28,7 @@ __fsa_diropen(struct _reent *r, auto *deviceData = (FSADeviceData *) r->deviceData; status = FSAOpenDir(deviceData->clientHandle, dir->name, &fd); if (status < 0) { - DEBUG_FUNCTION_LINE_ERR("FSAOpenDir(0x%08X, %s, 0x%08X) failed: %s", + DEBUG_FUNCTION_LINE_ERR("FSAOpenDir(0x%08X, %s, %p) failed: %s", deviceData->clientHandle, dir->name, &fd, FSAGetStatusStr(status)); r->_errno = __fsa_translate_error(status); return nullptr; diff --git a/source/devoptab/devoptab_fsa_fstat.cpp b/source/devoptab/devoptab_fsa_fstat.cpp index 0bdfc9e..f54d1e1 100644 --- a/source/devoptab/devoptab_fsa_fstat.cpp +++ b/source/devoptab/devoptab_fsa_fstat.cpp @@ -20,7 +20,7 @@ int __fsa_fstat(struct _reent *r, status = FSAGetStatFile(deviceData->clientHandle, file->fd, &fsStat); if (status < 0) { - DEBUG_FUNCTION_LINE_ERR("FSAGetStatFile(0x%08X, 0x%08X, 0x%08X) (%s) failed: %s", + DEBUG_FUNCTION_LINE_ERR("FSAGetStatFile(0x%08X, 0x%08X, %p) (%s) failed: %s", deviceData->clientHandle, file->fd, &fsStat, file->fullPath, FSAGetStatusStr(status)); r->_errno = __fsa_translate_error(status); return -1; diff --git a/source/devoptab/devoptab_fsa_open.cpp b/source/devoptab/devoptab_fsa_open.cpp index faa3a22..8870e85 100644 --- a/source/devoptab/devoptab_fsa_open.cpp +++ b/source/devoptab/devoptab_fsa_open.cpp @@ -92,7 +92,7 @@ int __fsa_open(struct _reent *r, } fd = -1; } else { - DEBUG_FUNCTION_LINE_ERR("FSAOpenFileEx(0x%08X, %s, %s, 0x%X, 0x%08X, 0x%08X, 0x%08X) failed: %s", + DEBUG_FUNCTION_LINE_ERR("FSAOpenFileEx(0x%08X, %s, %s, 0x%X, 0x%08X, 0x%08X, %p) failed: %s", deviceData->clientHandle, file->fullPath, "w", translatedMode, openFlags, preAllocSize, &fd, FSAGetStatusStr(status)); r->_errno = __fsa_translate_error(status); @@ -113,7 +113,7 @@ int __fsa_open(struct _reent *r, status = FSAOpenFileEx(deviceData->clientHandle, file->fullPath, fsMode, translatedMode, openFlags, preAllocSize, &fd); if (status < 0) { - DEBUG_FUNCTION_LINE_ERR("FSAOpenFileEx(0x%08X, %s, %s, 0x%X, 0x%08X, 0x%08X, 0x%08X) failed: %s", + DEBUG_FUNCTION_LINE_ERR("FSAOpenFileEx(0x%08X, %s, %s, 0x%X, 0x%08X, 0x%08X, %p) failed: %s", deviceData->clientHandle, file->fullPath, fsMode, translatedMode, openFlags, preAllocSize, &fd, FSAGetStatusStr(status)); r->_errno = __fsa_translate_error(status); @@ -129,11 +129,11 @@ int __fsa_open(struct _reent *r, FSAStat stat; status = FSAGetStatFile(deviceData->clientHandle, fd, &stat); if (status < 0) { - DEBUG_FUNCTION_LINE_ERR("FSAGetStatFile(0x%08X, 0x%08X, 0x%08X) (%s) failed: %s", + DEBUG_FUNCTION_LINE_ERR("FSAGetStatFile(0x%08X, 0x%08X, %p) (%s) failed: %s", deviceData->clientHandle, fd, &stat, file->fullPath, FSAGetStatusStr(status)); r->_errno = __fsa_translate_error(status); if (FSACloseFile(deviceData->clientHandle, fd) < 0) { - DEBUG_FUNCTION_LINE_ERR("FSACloseFile(0x%08X, 0x%08X) (%d) failed: %s", + DEBUG_FUNCTION_LINE_ERR("FSACloseFile(0x%08X, 0x%08X) (%s) failed: %s", deviceData->clientHandle, fd, file->fullPath, FSAGetStatusStr(status)); } return -1; diff --git a/source/devoptab/devoptab_fsa_read.cpp b/source/devoptab/devoptab_fsa_read.cpp index 00131ae..29e3355 100644 --- a/source/devoptab/devoptab_fsa_read.cpp +++ b/source/devoptab/devoptab_fsa_read.cpp @@ -52,7 +52,7 @@ ssize_t __fsa_read(struct _reent *r, void *fd, char *ptr, size_t len) { status = FSAReadFile(deviceData->clientHandle, tmp, 1, size, file->fd, 0); if (status < 0) { - DEBUG_FUNCTION_LINE_ERR("FSAReadFile(0x%08X, 0x%08X, 1, 0x%08X, 0x%08X, 0) (%s) failed: %s", + DEBUG_FUNCTION_LINE_ERR("FSAReadFile(0x%08X, %p, 1, 0x%08X, 0x%08X, 0) (%s) failed: %s", deviceData->clientHandle, tmp, size, file->fd, file->fullPath, FSAGetStatusStr(status)); if (bytesRead != 0) { return bytesRead; // error after partial read diff --git a/source/devoptab/devoptab_fsa_seek.cpp b/source/devoptab/devoptab_fsa_seek.cpp index 74b2bb5..65a7a6b 100644 --- a/source/devoptab/devoptab_fsa_seek.cpp +++ b/source/devoptab/devoptab_fsa_seek.cpp @@ -33,7 +33,7 @@ off_t __fsa_seek(struct _reent *r, case SEEK_END: { // Set position relative to the end of the file status = FSAGetStatFile(deviceData->clientHandle, file->fd, &fsStat); if (status < 0) { - DEBUG_FUNCTION_LINE_ERR("FSAGetStatFile(0x%08X, 0x%08X, 0x%08X) (%s) failed: %s", + DEBUG_FUNCTION_LINE_ERR("FSAGetStatFile(0x%08X, 0x%08X, %p) (%s) failed: %s", deviceData->clientHandle, file->fd, &fsStat, file->fullPath, FSAGetStatusStr(status)); r->_errno = __fsa_translate_error(status); return -1; diff --git a/source/devoptab/devoptab_fsa_stat.cpp b/source/devoptab/devoptab_fsa_stat.cpp index 562b27a..eda59f1 100644 --- a/source/devoptab/devoptab_fsa_stat.cpp +++ b/source/devoptab/devoptab_fsa_stat.cpp @@ -23,7 +23,7 @@ int __fsa_stat(struct _reent *r, status = FSAGetStat(deviceData->clientHandle, fixedPath, &fsStat); if (status < 0) { - DEBUG_FUNCTION_LINE_ERR("FSAGetStat(0x%08X, %s, 0x%08X) failed: %s", + DEBUG_FUNCTION_LINE_ERR("FSAGetStat(0x%08X, %s, %p) failed: %s", deviceData->clientHandle, fixedPath, &fsStat, FSAGetStatusStr(status)); free(fixedPath); r->_errno = __fsa_translate_error(status); diff --git a/source/devoptab/devoptab_fsa_statvfs.cpp b/source/devoptab/devoptab_fsa_statvfs.cpp index 94574a2..0906c05 100644 --- a/source/devoptab/devoptab_fsa_statvfs.cpp +++ b/source/devoptab/devoptab_fsa_statvfs.cpp @@ -20,7 +20,7 @@ int __fsa_statvfs(struct _reent *r, status = FSAGetFreeSpaceSize(deviceData->clientHandle, fixedPath, &freeSpace); if (status < 0) { - DEBUG_FUNCTION_LINE_ERR("FSAGetFreeSpaceSize(0x%08X, %s, 0x%08X) failed: %s", + DEBUG_FUNCTION_LINE_ERR("FSAGetFreeSpaceSize(0x%08X, %s, %p) failed: %s", deviceData->clientHandle, fixedPath, &freeSpace, FSAGetStatusStr(status)); free(fixedPath); r->_errno = __fsa_translate_error(status); diff --git a/source/devoptab/devoptab_fsa_truncate.cpp b/source/devoptab/devoptab_fsa_truncate.cpp index 562ee72..0f1bba3 100644 --- a/source/devoptab/devoptab_fsa_truncate.cpp +++ b/source/devoptab/devoptab_fsa_truncate.cpp @@ -21,7 +21,7 @@ int __fsa_ftruncate(struct _reent *r, // Set the new file size status = FSASetPosFile(deviceData->clientHandle, file->fd, len); if (status < 0) { - DEBUG_FUNCTION_LINE_ERR("FSASetPosFile(0x%08X, 0x%08X, 0x%08X) failed: %s", + DEBUG_FUNCTION_LINE_ERR("FSASetPosFile(0x%08X, 0x%08X, 0x%08llX) failed: %s", deviceData->clientHandle, file->fd, len, FSAGetStatusStr(status)); r->_errno = __fsa_translate_error(status); return -1; diff --git a/source/devoptab/devoptab_fsa_write.cpp b/source/devoptab/devoptab_fsa_write.cpp index 1fc1016..39bc50c 100644 --- a/source/devoptab/devoptab_fsa_write.cpp +++ b/source/devoptab/devoptab_fsa_write.cpp @@ -60,7 +60,7 @@ ssize_t __fsa_write(struct _reent *r, void *fd, const char *ptr, size_t len) { status = FSAWriteFile(deviceData->clientHandle, tmp, 1, size, file->fd, 0); if (status < 0) { - DEBUG_FUNCTION_LINE_ERR("FSAWriteFile(0x%08X, 0x%08X, 1, 0x%08X, 0x%08X, 0) (%s) failed: %s", + DEBUG_FUNCTION_LINE_ERR("FSAWriteFile(0x%08X, %p, 1, 0x%08X, 0x%08X, 0) (%s) failed: %s", deviceData->clientHandle, tmp, size, file->fd, file->fullPath, FSAGetStatusStr(status)); if (bytesWritten != 0) { return bytesWritten; // error after partial write diff --git a/source/fsa.cpp b/source/fsa.cpp index ff84e30..ceb358b 100644 --- a/source/fsa.cpp +++ b/source/fsa.cpp @@ -104,10 +104,10 @@ FSError FSAEx_RawReadEx(int clientHandle, void *data, uint32_t size_bytes, uint3 if ((uint32_t) data & 0x3F) { auto *alignedBuffer = memalign(0x40, ROUNDUP(size_bytes * cnt, 0x40)); if (!alignedBuffer) { - DEBUG_FUNCTION_LINE_ERR("Buffer not aligned (%08X).\n", data); + DEBUG_FUNCTION_LINE_ERR("Buffer not aligned (%p).\n", data); return FS_ERROR_INVALID_ALIGNMENT; } - DEBUG_FUNCTION_LINE_WARN("Buffer not aligned (%08X). Align to 0x40 for best performance\n", data); + DEBUG_FUNCTION_LINE_WARN("Buffer not aligned (%p). Align to 0x40 for best performance\n", data); tmp = alignedBuffer; } @@ -162,10 +162,10 @@ FSError FSAEx_RawWriteEx(int clientHandle, const void *data, uint32_t size_bytes if ((uint32_t) data & 0x3F) { auto *alignedBuffer = memalign(0x40, ROUNDUP(size_bytes * cnt, 0x40)); if (!alignedBuffer) { - DEBUG_FUNCTION_LINE_ERR("Buffer not aligned (%08X).", data); + DEBUG_FUNCTION_LINE_ERR("Buffer not aligned (%p).", data); return FS_ERROR_INVALID_ALIGNMENT; } - DEBUG_FUNCTION_LINE_WARN("Buffer not aligned (%08X). Align to 0x40 for best performance", data); + DEBUG_FUNCTION_LINE_WARN("Buffer not aligned (%p). Align to 0x40 for best performance", data); tmp = alignedBuffer; memcpy(tmp, data, size_bytes * cnt); }