i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Readded TYPE()

Browse Source 
Init Messenger, Ref, Message on error


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13659 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2005-07-13 15:56:46 +00:00
parent f1459e8f91
commit 1188944790
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/app/Message.cpp
+8 -6
View File
@@ -1230,6 +1230,7 @@ status_t BMessage::PopSpecifier()
status_t BMessage::Find ## fnName(const char* name, int32 index, TYPE* p) const \ status_t BMessage::Find ## fnName(const char* name, int32 index, TYPE* p) const \
{ \ { \
void* ptr = NULL; ssize_t bytes = 0; status_t err = B_OK;\ void* ptr = NULL; ssize_t bytes = 0; status_t err = B_OK;\
*p = TYPE(); \
err = FindData(name, TYPESPEC, index, (const void**)&ptr, &bytes); \ err = FindData(name, TYPESPEC, index, (const void**)&ptr, &bytes); \
if (err == B_OK) \ if (err == B_OK) \
memcpy(p, ptr, sizeof(TYPE)); \ memcpy(p, ptr, sizeof(TYPE)); \
@@ -1480,10 +1481,12 @@ status_t
BMessage::FindMessenger(const char* name, int32 index, BMessenger* m) const BMessage::FindMessenger(const char* name, int32 index, BMessenger* m) const
{ {
void* data = NULL; void* data = NULL;
ssize_t size = 0; ssize_t size = 0;
status_t err = FindData(name, B_MESSENGER_TYPE, index, (const void **)&data, &size); status_t err = FindData(name, B_MESSENGER_TYPE, index, (const void **)&data, &size);
if (err == B_OK) if (err == B_OK)
memcpy(m, data, sizeof(BMessenger)); memcpy(m, data, sizeof(BMessenger));
else
*m = BMessenger();
return err; return err;
} }
@@ -1503,6 +1506,8 @@ BMessage::FindRef(const char* name, int32 index, entry_ref* ref) const
status_t err = FindData(name, B_REF_TYPE, index, (const void**)&data, &size); status_t err = FindData(name, B_REF_TYPE, index, (const void**)&data, &size);
if (err == B_OK) if (err == B_OK)
err = entry_ref_unflatten(ref, (char*)data, size); err = entry_ref_unflatten(ref, (char*)data, size);
else
*ref = entry_ref();
return err; return err;
} }
@@ -1521,10 +1526,9 @@ BMessage::FindMessage(const char* name, int32 index, BMessage* msg) const
ssize_t size = 0; ssize_t size = 0;
status_t err = FindData(name, B_MESSAGE_TYPE, index, (const void**)&data, &size); status_t err = FindData(name, B_MESSAGE_TYPE, index, (const void**)&data, &size);
if (!err) if (!err)
{
err = msg->Unflatten((const char*)data); err = msg->Unflatten((const char*)data);
} else
*msg = BMessage();
return err; return err;
} }
@@ -1543,9 +1547,7 @@ BMessage::FindFlat(const char* name, int32 index, BFlattenable* obj) const
ssize_t numBytes = 0; ssize_t numBytes = 0;
status_t err = FindData(name, obj->TypeCode(), index, (const void**)&data, &numBytes); status_t err = FindData(name, obj->TypeCode(), index, (const void**)&data, &numBytes);
if (!err) if (!err)
{
err = obj->Unflatten(obj->TypeCode(), data, numBytes); err = obj->Unflatten(obj->TypeCode(), data, numBytes);
}
return err; return err;
} }