interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switched haiku status_t printing to use a constant; also gave the constant a self-descriptive name for readability.

This commit is contained in:
Pietro Gagliardi 2020-05-10 12:55:47 -04:00
parent ecb5558d3d
commit 1daac120af
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
haiku/main.cpp
View File

@ -3,11 +3,7 @@
uiprivApplication *uiprivApp; 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) #define uiprivInitReturnStatus(err, msg, status) uiprivInitReturnErrorf(err, "%s: %" uiprivStatustFmt, msg, status)
// - 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)
static thread_id mainThread; static thread_id mainThread;
@ -50,7 +46,7 @@ void uiprivApplication::MessageReceived(BMessage *msg)
status = msg->FindData("args", B_ANY_TYPE, status = msg->FindData("args", B_ANY_TYPE,
&data, &size); &data, &size);
if (status != B_OK) { 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; return;
} }
args = (const struct queueMainArgs *) data; args = (const struct queueMainArgs *) data;
@ -72,7 +68,7 @@ void uiprivSysQueueMain(void (*f)(void *data), void *data)
status = msg->AddData("args", B_RAW_TYPE, status = msg->AddData("args", B_RAW_TYPE,
&args, sizeof (struct queueMainArgs), true, 1); &args, sizeof (struct queueMainArgs), true, 1);
if (status != B_OK) { if (status != B_OK) {
uiprivInternalError("BMessage::AddData() failed in uiQueueMain(): %ld", status); uiprivInternalError("BMessage::AddData() failed in uiQueueMain(): %" uiprivStatustFmt, status);
delete msg; delete msg;
return; return;
} }
@ -80,7 +76,7 @@ void uiprivSysQueueMain(void (*f)(void *data), void *data)
// msg is copied by PostMessage() so we can delete it here // msg is copied by PostMessage() so we can delete it here
delete msg; delete msg;
if (status != B_OK) if (status != B_OK)
uiprivInternalError("BApplication::PostMessage() failed in uiQueueMain(): %ld", status); uiprivInternalError("BApplication::PostMessage() failed in uiQueueMain(): %" uiprivStatustFmt, status);
} }
bool uiprivSysCheckThread(void) bool uiprivSysCheckThread(void)

3
haiku/uipriv_haiku.hpp
View File

@ -6,6 +6,9 @@
#define uiprivOSHeader "../ui_haiku.h" #define uiprivOSHeader "../ui_haiku.h"
#include "../common/uipriv.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'; constexpr uint32 uiprivMsgQueueMain = 'uiQM';
// main.cpp // main.cpp