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

Made BMessage::GetInfo() pointer arguments optional (ie. passing NULL doesn't

Browse Source 
cause a crash anymore).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15022 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-11-18 15:35:38 +00:00
parent 63ea9a2870
commit 4ad46aa954
2 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/app/Message4.cpp
+14 -7
View File
@@ -213,8 +213,10 @@ BMessage::GetInfo(type_code typeRequested, int32 index, char **nameFound,
if (index >= fHeader->fieldCount)
return B_BAD_INDEX;
*nameFound = (char *)fData + fFields[index].offset;
*typeFound = fFields[index].type;
if (nameFound)
*nameFound = (char *)fData + fFields[index].offset;
if (typeFound)
*typeFound = fFields[index].type;
if (countFound)
*countFound = fFields[index].count;
return B_OK;
@@ -227,8 +229,10 @@ BMessage::GetInfo(type_code typeRequested, int32 index, char **nameFound,
counter++;
if (counter == index) {
*nameFound = (char *)fData + field->offset;
*typeFound = field->type;
if (nameFound)
*nameFound = (char *)fData + field->offset;
if (typeFound)
*typeFound = field->type;
if (countFound)
*countFound = field->count;
return B_OK;
@@ -255,7 +259,8 @@ BMessage::GetInfo(const char *name, type_code *typeFound, int32 *countFound)
if (result < B_OK || !field)
return result;
*typeFound = field->type;
if (typeFound)
*typeFound = field->type;
if (countFound)
*countFound = field->count;
@@ -273,8 +278,10 @@ BMessage::GetInfo(const char *name, type_code *typeFound, bool *fixedSize)
if (result < B_OK || !field)
return result;
*typeFound = field->type;
*fixedSize = field->flags & FIELD_FLAG_FIXED_SIZE;
if (typeFound)
*typeFound = field->type;
if (fixedSize)
*fixedSize = field->flags & FIELD_FLAG_FIXED_SIZE;
return B_OK;
}