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

app_server: Cleanup argument checks to use boolean expressions.

Browse Source
This commit is contained in:
Michael Lotz
2018-12-29 00:52:05 +01:00
parent 3752309050
commit 02f41b1a74
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/ServerFont.cpp
+7 -3
View File
@@ -832,8 +832,10 @@ ServerFont::GetEscapements(const char* string, int32 numBytes, int32 numChars,
escapement_delta delta, BPoint escapementArray[], escapement_delta delta, BPoint escapementArray[],
BPoint offsetArray[]) const BPoint offsetArray[]) const
{ {
if (!string || numBytes <= 0 || !escapementArray) if (string == NULL || numBytes <= 0 || numChars <= 0
|| escapementArray == NULL) {
return B_BAD_DATA; return B_BAD_DATA;
}
BPointEscapementConsumer consumer(escapementArray, offsetArray, fSize); BPointEscapementConsumer consumer(escapementArray, offsetArray, fSize);
if (GlyphLayoutEngine::LayoutGlyphs(consumer, *this, string, numBytes, if (GlyphLayoutEngine::LayoutGlyphs(consumer, *this, string, numBytes,
@@ -881,7 +883,7 @@ status_t
ServerFont::GetEscapements(const char* string, int32 numBytes, int32 numChars, ServerFont::GetEscapements(const char* string, int32 numBytes, int32 numChars,
escapement_delta delta, float widthArray[]) const escapement_delta delta, float widthArray[]) const
{ {
if (!string || numBytes <= 0 || !widthArray) if (string == NULL || numBytes <= 0 || numChars <= 0 || widthArray == NULL)
return B_BAD_DATA; return B_BAD_DATA;
WidthEscapementConsumer consumer(widthArray, fSize); WidthEscapementConsumer consumer(widthArray, fSize);
@@ -1011,8 +1013,10 @@ ServerFont::GetBoundingBoxesForStrings(char *charArray[], size_t lengthArray[],
escapement_delta deltaArray[]) escapement_delta deltaArray[])
{ {
// TODO: The font_metric_mode is never used // TODO: The font_metric_mode is never used
if (!charArray || !lengthArray|| numStrings <= 0 || !rectArray || !deltaArray) if (charArray == NULL || lengthArray == NULL || numStrings <= 0
|| rectArray == NULL || deltaArray == NULL) {
return B_BAD_DATA; return B_BAD_DATA;
}
Transformable transform(EmbeddedTransformation()); Transformable transform(EmbeddedTransformation());