From 1daac120afe9d29aedfd6d2c92ad1216a1725dcf Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Sun, 10 May 2020 12:55:47 -0400 Subject: [PATCH] Switched haiku status_t printing to use a constant; also gave the constant a self-descriptive name for readability. --- haiku/main.cpp | 12 ++++-------- haiku/uipriv_haiku.hpp | 3 +++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/haiku/main.cpp b/haiku/main.cpp index e1cf34bb..2b10279b 100644 --- a/haiku/main.cpp +++ b/haiku/main.cpp @@ -3,11 +3,7 @@ uiprivApplication *uiprivApp; -// TODO see if we can convert this to a string, or use a known type for status_t instead of assuming it's int(32_t) -// - https://www.haiku-os.org/docs/api/SupportDefs_8h.html#a0969fa9dac055f91eebe733902dd928a -// - https://review.haiku-os.org/c/haiku/+/2171/3/src/system/boot/platform/u-boot/start.cpp -// - https://github.com/haiku/haiku/blob/master/src/system/libroot/posix/string/strerror.c -#define uiprivInitReturnStatus(err, msg, status) uiprivInitReturnErrorf(err, "%s: %ld", msg, status) +#define uiprivInitReturnStatus(err, msg, status) uiprivInitReturnErrorf(err, "%s: %" uiprivStatustFmt, msg, status) static thread_id mainThread; @@ -50,7 +46,7 @@ void uiprivApplication::MessageReceived(BMessage *msg) status = msg->FindData("args", B_ANY_TYPE, &data, &size); if (status != B_OK) { - uiprivInternalError("BMessage::FindData() failed in uiprivApplication::MessageReceived() for uiQueueMain(): %ld", status); + uiprivInternalError("BMessage::FindData() failed in uiprivApplication::MessageReceived() for uiQueueMain(): %" uiprivStatustFmt, status); return; } args = (const struct queueMainArgs *) data; @@ -72,7 +68,7 @@ void uiprivSysQueueMain(void (*f)(void *data), void *data) status = msg->AddData("args", B_RAW_TYPE, &args, sizeof (struct queueMainArgs), true, 1); if (status != B_OK) { - uiprivInternalError("BMessage::AddData() failed in uiQueueMain(): %ld", status); + uiprivInternalError("BMessage::AddData() failed in uiQueueMain(): %" uiprivStatustFmt, status); delete msg; return; } @@ -80,7 +76,7 @@ void uiprivSysQueueMain(void (*f)(void *data), void *data) // msg is copied by PostMessage() so we can delete it here delete msg; if (status != B_OK) - uiprivInternalError("BApplication::PostMessage() failed in uiQueueMain(): %ld", status); + uiprivInternalError("BApplication::PostMessage() failed in uiQueueMain(): %" uiprivStatustFmt, status); } bool uiprivSysCheckThread(void) diff --git a/haiku/uipriv_haiku.hpp b/haiku/uipriv_haiku.hpp index bf2d200a..b249b62f 100644 --- a/haiku/uipriv_haiku.hpp +++ b/haiku/uipriv_haiku.hpp @@ -6,6 +6,9 @@ #define uiprivOSHeader "../ui_haiku.h" #include "../common/uipriv.h" +// B_PRId32 is the correct format for status_t; see, for instance, https://review.haiku-os.org/c/haiku/+/2171/3/src/system/boot/platform/u-boot/start.cpp +#define uiprivStatustFmt B_PRId32 + constexpr uint32 uiprivMsgQueueMain = 'uiQM'; // main.cpp