diff options
| author | Thomas Van Lenten <thomasvl@google.com> | 2015-06-16 16:45:14 -0400 |
|---|---|---|
| committer | Thomas Van Lenten <thomasvl@google.com> | 2015-06-16 17:04:50 -0400 |
| commit | 8c88957ef375f3b739b6e72ea5c2fb71b12e1fc2 (patch) | |
| tree | 31b4561aae2a11b1a9b4b7010dc9df10c52a4d72 /objectivec/GPBUtilities.m | |
| parent | 4cbb612299eaf8259db25f5dcda46022fbd1db54 (diff) | |
| download | protobuf-8c88957ef375f3b739b6e72ea5c2fb71b12e1fc2.tar.gz protobuf-8c88957ef375f3b739b6e72ea5c2fb71b12e1fc2.tar.bz2 protobuf-8c88957ef375f3b739b6e72ea5c2fb71b12e1fc2.zip | |
Add nonnil markup to ObjC library.
Add the clang annotations to the objc library and generated code to help with Swift bridging and compiler checks.
Diffstat (limited to 'objectivec/GPBUtilities.m')
| -rw-r--r-- | objectivec/GPBUtilities.m | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/objectivec/GPBUtilities.m b/objectivec/GPBUtilities.m index 7a035ce6..5ee61230 100644 --- a/objectivec/GPBUtilities.m +++ b/objectivec/GPBUtilities.m @@ -1497,7 +1497,7 @@ static void AppendTextFormatForMessage(GPBMessage *message, } NSString *GPBTextFormatForMessage(GPBMessage *message, NSString *lineIndent) { - if (message == nil) return nil; + if (message == nil) return @""; if (lineIndent == nil) lineIndent = @""; NSMutableString *buildString = [NSMutableString string]; @@ -1507,7 +1507,7 @@ NSString *GPBTextFormatForMessage(GPBMessage *message, NSString *lineIndent) { NSString *GPBTextFormatForUnknownFieldSet(GPBUnknownFieldSet *unknownSet, NSString *lineIndent) { - if (unknownSet == nil) return nil; + if (unknownSet == nil) return @""; if (lineIndent == nil) lineIndent = @""; NSMutableString *result = [NSMutableString string]; |