diff options
Diffstat (limited to 'src/objective-c')
7 files changed, 29 insertions, 29 deletions
diff --git a/src/objective-c/GRPCClient/private/GRPCChannelFactory.h b/src/objective-c/GRPCClient/private/GRPCChannelFactory.h index 287233f246..3a3500fc95 100644 --- a/src/objective-c/GRPCClient/private/GRPCChannelFactory.h +++ b/src/objective-c/GRPCClient/private/GRPCChannelFactory.h @@ -26,8 +26,8 @@ NS_ASSUME_NONNULL_BEGIN @protocol GRPCChannelFactory /** Create a channel with specific channel args to a specific host. */ -- (grpc_channel * _Nullable)createChannelWithHost:(NSString *)host - channelArgs:(NSDictionary * _Nullable)args; +- (grpc_channel *_Nullable)createChannelWithHost:(NSString *)host + channelArgs:(NSDictionary *_Nullable)args; @end diff --git a/src/objective-c/GRPCClient/private/GRPCCronetChannelFactory.h b/src/objective-c/GRPCClient/private/GRPCCronetChannelFactory.h index 18e84b81fa..5e35576ea1 100644 --- a/src/objective-c/GRPCClient/private/GRPCCronetChannelFactory.h +++ b/src/objective-c/GRPCClient/private/GRPCCronetChannelFactory.h @@ -26,8 +26,8 @@ NS_ASSUME_NONNULL_BEGIN + (instancetype _Nullable)sharedInstance; -- (grpc_channel * _Nullable)createChannelWithHost:(NSString *)host - channelArgs:(NSDictionary * _Nullable)args; +- (grpc_channel *_Nullable)createChannelWithHost:(NSString *)host + channelArgs:(NSDictionary *_Nullable)args; - (instancetype _Nullable)init NS_UNAVAILABLE; diff --git a/src/objective-c/GRPCClient/private/GRPCCronetChannelFactory.m b/src/objective-c/GRPCClient/private/GRPCCronetChannelFactory.m index 51d8df0fb7..781881d211 100644 --- a/src/objective-c/GRPCClient/private/GRPCCronetChannelFactory.m +++ b/src/objective-c/GRPCClient/private/GRPCCronetChannelFactory.m @@ -52,8 +52,8 @@ NS_ASSUME_NONNULL_BEGIN return self; } -- (grpc_channel * _Nullable)createChannelWithHost:(NSString *)host - channelArgs:(NSDictionary * _Nullable)args { +- (grpc_channel *_Nullable)createChannelWithHost:(NSString *)host + channelArgs:(NSDictionary *_Nullable)args { grpc_channel_args *channelArgs = GRPCBuildChannelArgs(args); grpc_channel *unmanagedChannel = grpc_cronet_secure_channel_create(_cronetEngine, host.UTF8String, channelArgs, NULL); @@ -77,8 +77,8 @@ NS_ASSUME_NONNULL_BEGIN return nil; } -- (grpc_channel * _Nullable)createChannelWithHost:(NSString *)host - channelArgs:(NSDictionary * _Nullable)args { +- (grpc_channel *_Nullable)createChannelWithHost:(NSString *)host + channelArgs:(NSDictionary *_Nullable)args { [NSException raise:NSInvalidArgumentException format:@"Must enable macro GRPC_COMPILE_WITH_CRONET to build Cronet channel."]; return NULL; diff --git a/src/objective-c/GRPCClient/private/GRPCInsecureChannelFactory.h b/src/objective-c/GRPCClient/private/GRPCInsecureChannelFactory.h index 1175483c68..98a985fe84 100644 --- a/src/objective-c/GRPCClient/private/GRPCInsecureChannelFactory.h +++ b/src/objective-c/GRPCClient/private/GRPCInsecureChannelFactory.h @@ -25,8 +25,8 @@ NS_ASSUME_NONNULL_BEGIN + (instancetype _Nullable)sharedInstance; -- (grpc_channel * _Nullable)createChannelWithHost:(NSString *)host - channelArgs:(NSDictionary * _Nullable)args; +- (grpc_channel *_Nullable)createChannelWithHost:(NSString *)host + channelArgs:(NSDictionary *_Nullable)args; - (instancetype _Nullable)init NS_UNAVAILABLE; diff --git a/src/objective-c/GRPCClient/private/GRPCInsecureChannelFactory.m b/src/objective-c/GRPCClient/private/GRPCInsecureChannelFactory.m index 44e94831e9..9969887712 100644 --- a/src/objective-c/GRPCClient/private/GRPCInsecureChannelFactory.m +++ b/src/objective-c/GRPCClient/private/GRPCInsecureChannelFactory.m @@ -34,8 +34,8 @@ NS_ASSUME_NONNULL_BEGIN return instance; } -- (grpc_channel * _Nullable)createChannelWithHost:(NSString *)host - channelArgs:(NSDictionary * _Nullable)args { +- (grpc_channel *_Nullable)createChannelWithHost:(NSString *)host + channelArgs:(NSDictionary *_Nullable)args { grpc_channel_args *coreChannelArgs = GRPCBuildChannelArgs([args copy]); grpc_channel *unmanagedChannel = grpc_insecure_channel_create(host.UTF8String, coreChannelArgs, NULL); diff --git a/src/objective-c/GRPCClient/private/GRPCSecureChannelFactory.h b/src/objective-c/GRPCClient/private/GRPCSecureChannelFactory.h index 565f58a4fa..02e7052996 100644 --- a/src/objective-c/GRPCClient/private/GRPCSecureChannelFactory.h +++ b/src/objective-c/GRPCClient/private/GRPCSecureChannelFactory.h @@ -23,13 +23,13 @@ NS_ASSUME_NONNULL_BEGIN @interface GRPCSecureChannelFactory : NSObject<GRPCChannelFactory> -+ (instancetype _Nullable)factoryWithPEMRootCertificates:(NSString * _Nullable)rootCerts - privateKey:(NSString * _Nullable)privateKey - certChain:(NSString * _Nullable)certChain - error:(NSError **)errorPtr; ++ (instancetype _Nullable)factoryWithPEMRootCertificates:(NSString *_Nullable)rootCerts + privateKey:(NSString *_Nullable)privateKey + certChain:(NSString *_Nullable)certChain + error:(NSError **)errorPtr; -- (grpc_channel * _Nullable)createChannelWithHost:(NSString *)host - channelArgs:(NSDictionary * _Nullable)args; +- (grpc_channel *_Nullable)createChannelWithHost:(NSString *)host + channelArgs:(NSDictionary *_Nullable)args; - (instancetype _Nullable)init NS_UNAVAILABLE; diff --git a/src/objective-c/GRPCClient/private/GRPCSecureChannelFactory.m b/src/objective-c/GRPCClient/private/GRPCSecureChannelFactory.m index 03cfff2ed4..1f6458c524 100644 --- a/src/objective-c/GRPCClient/private/GRPCSecureChannelFactory.m +++ b/src/objective-c/GRPCClient/private/GRPCSecureChannelFactory.m @@ -29,17 +29,17 @@ NS_ASSUME_NONNULL_BEGIN grpc_channel_credentials *_channelCreds; } -+ (instancetype _Nullable)factoryWithPEMRootCertificates:(NSString * _Nullable)rootCerts - privateKey:(NSString * _Nullable)privateKey - certChain:(NSString * _Nullable)certChain - error:(NSError **)errorPtr { ++ (instancetype _Nullable)factoryWithPEMRootCertificates:(NSString *_Nullable)rootCerts + privateKey:(NSString *_Nullable)privateKey + certChain:(NSString *_Nullable)certChain + error:(NSError **)errorPtr { return [[self alloc] initWithPEMRootCerts:rootCerts privateKey:privateKey certChain:certChain error:errorPtr]; } -- (NSData * _Nullable)nullTerminatedDataWithString:(NSString * _Nullable)string { +- (NSData *_Nullable)nullTerminatedDataWithString:(NSString *_Nullable)string { // dataUsingEncoding: does not return a null-terminated string. NSData *data = [string dataUsingEncoding:NSASCIIStringEncoding allowLossyConversion:YES]; if (data == nil) { @@ -50,10 +50,10 @@ NS_ASSUME_NONNULL_BEGIN return nullTerminated; } -- (instancetype _Nullable)initWithPEMRootCerts:(NSString * _Nullable)rootCerts - privateKey:(NSString * _Nullable)privateKey - certChain:(NSString * _Nullable)certChain - error:(NSError **)errorPtr { +- (instancetype _Nullable)initWithPEMRootCerts:(NSString *_Nullable)rootCerts + privateKey:(NSString *_Nullable)privateKey + certChain:(NSString *_Nullable)certChain + error:(NSError **)errorPtr { static NSData *defaultRootsASCII; static NSError *defaultRootsError; static dispatch_once_t loading; @@ -116,8 +116,8 @@ NS_ASSUME_NONNULL_BEGIN return self; } -- (grpc_channel * _Nullable)createChannelWithHost:(NSString *)host - channelArgs:(NSDictionary * _Nullable)args { +- (grpc_channel *_Nullable)createChannelWithHost:(NSString *)host + channelArgs:(NSDictionary *_Nullable)args { grpc_channel_args *coreChannelArgs = GRPCBuildChannelArgs([args copy]); grpc_channel *unmanagedChannel = grpc_secure_channel_create(_channelCreds, host.UTF8String, coreChannelArgs, NULL); |