diff options
author | 2018-11-19 09:52:29 -0800 | |
---|---|---|
committer | 2018-11-19 09:52:29 -0800 | |
commit | 29e1591904539fcb6d92ba49e69ed27ee9d3349d (patch) | |
tree | b13ee9babf1b89489fbe257ac426a165cf2badc8 | |
parent | 00ff5805a3c00e9d29cb71dfd5365c36dd5bf96c (diff) |
_Nullable -> nullable
4 files changed, 18 insertions, 18 deletions
diff --git a/src/objective-c/GRPCClient/private/GRPCCronetChannelFactory.h b/src/objective-c/GRPCClient/private/GRPCCronetChannelFactory.h index 5e35576ea1..738dfdb737 100644 --- a/src/objective-c/GRPCClient/private/GRPCCronetChannelFactory.h +++ b/src/objective-c/GRPCClient/private/GRPCCronetChannelFactory.h @@ -24,12 +24,12 @@ NS_ASSUME_NONNULL_BEGIN @interface GRPCCronetChannelFactory : NSObject<GRPCChannelFactory> -+ (instancetype _Nullable)sharedInstance; ++ (nullable instancetype)sharedInstance; -- (grpc_channel *_Nullable)createChannelWithHost:(NSString *)host - channelArgs:(NSDictionary *_Nullable)args; +- (nullable grpc_channel *)createChannelWithHost:(NSString *)host + channelArgs:(nullable NSDictionary *)args; -- (instancetype _Nullable)init NS_UNAVAILABLE; +- (nullable instancetype)init NS_UNAVAILABLE; @end diff --git a/src/objective-c/GRPCClient/private/GRPCInsecureChannelFactory.h b/src/objective-c/GRPCClient/private/GRPCInsecureChannelFactory.h index 98a985fe84..2d471aebed 100644 --- a/src/objective-c/GRPCClient/private/GRPCInsecureChannelFactory.h +++ b/src/objective-c/GRPCClient/private/GRPCInsecureChannelFactory.h @@ -23,12 +23,12 @@ NS_ASSUME_NONNULL_BEGIN @interface GRPCInsecureChannelFactory : NSObject<GRPCChannelFactory> -+ (instancetype _Nullable)sharedInstance; ++ (nullable instancetype)sharedInstance; -- (grpc_channel *_Nullable)createChannelWithHost:(NSString *)host - channelArgs:(NSDictionary *_Nullable)args; +- (nullable grpc_channel *)createChannelWithHost:(NSString *)host + channelArgs:(nullable NSDictionary *)args; -- (instancetype _Nullable)init NS_UNAVAILABLE; +- (nullable instancetype)init NS_UNAVAILABLE; @end diff --git a/src/objective-c/GRPCClient/private/GRPCSecureChannelFactory.h b/src/objective-c/GRPCClient/private/GRPCSecureChannelFactory.h index 02e7052996..5dc5a97312 100644 --- a/src/objective-c/GRPCClient/private/GRPCSecureChannelFactory.h +++ b/src/objective-c/GRPCClient/private/GRPCSecureChannelFactory.h @@ -23,15 +23,15 @@ NS_ASSUME_NONNULL_BEGIN @interface GRPCSecureChannelFactory : NSObject<GRPCChannelFactory> -+ (instancetype _Nullable)factoryWithPEMRootCertificates:(NSString *_Nullable)rootCerts - privateKey:(NSString *_Nullable)privateKey - certChain:(NSString *_Nullable)certChain ++ (nullable instancetype)factoryWithPEMRootCertificates:(nullable NSString *)rootCerts + privateKey:(nullable NSString *)privateKey + certChain:(nullable NSString *)certChain error:(NSError **)errorPtr; -- (grpc_channel *_Nullable)createChannelWithHost:(NSString *)host - channelArgs:(NSDictionary *_Nullable)args; +- (nullable grpc_channel *)createChannelWithHost:(NSString *)host + channelArgs:(nullable NSDictionary *)args; -- (instancetype _Nullable)init NS_UNAVAILABLE; +- (nullable instancetype)init NS_UNAVAILABLE; @end diff --git a/src/objective-c/tests/APIv2Tests/APIv2Tests.m b/src/objective-c/tests/APIv2Tests/APIv2Tests.m index e49f58ae9d..1b14043af9 100644 --- a/src/objective-c/tests/APIv2Tests/APIv2Tests.m +++ b/src/objective-c/tests/APIv2Tests/APIv2Tests.m @@ -81,20 +81,20 @@ static const NSTimeInterval kTestTimeout = 16; return self; } -- (void)receivedInitialMetadata:(NSDictionary *_Nullable)initialMetadata { +- (void)receivedInitialMetadata:(NSDictionary *)initialMetadata { if (self->_initialMetadataCallback) { self->_initialMetadataCallback(initialMetadata); } } -- (void)receivedRawMessage:(GPBMessage *_Nullable)message { +- (void)receivedRawMessage:(GPBMessage *)message { if (self->_messageCallback) { self->_messageCallback(message); } } -- (void)closedWithTrailingMetadata:(NSDictionary *_Nullable)trailingMetadata - error:(NSError *_Nullable)error { +- (void)closedWithTrailingMetadata:(NSDictionary *)trailingMetadata + error:(NSError *)error { if (self->_closeCallback) { self->_closeCallback(trailingMetadata, error); } |