clang-format

pull/16190/head
Muxi Yan 6 years ago
parent c2bb755037
commit a8a7c2bdd1
  1. 4
      src/objective-c/GRPCClient/private/GRPCChannelFactory.h
  2. 4
      src/objective-c/GRPCClient/private/GRPCCronetChannelFactory.h
  3. 8
      src/objective-c/GRPCClient/private/GRPCCronetChannelFactory.m
  4. 4
      src/objective-c/GRPCClient/private/GRPCInsecureChannelFactory.h
  5. 4
      src/objective-c/GRPCClient/private/GRPCInsecureChannelFactory.m
  6. 12
      src/objective-c/GRPCClient/private/GRPCSecureChannelFactory.h
  7. 22
      src/objective-c/GRPCClient/private/GRPCSecureChannelFactory.m

@ -26,8 +26,8 @@ NS_ASSUME_NONNULL_BEGIN
@protocol GRPCChannelFactory @protocol GRPCChannelFactory
/** Create a channel with specific channel args to a specific host. */ /** Create a channel with specific channel args to a specific host. */
- (grpc_channel * _Nullable)createChannelWithHost:(NSString *)host - (grpc_channel *_Nullable)createChannelWithHost:(NSString *)host
channelArgs:(NSDictionary * _Nullable)args; channelArgs:(NSDictionary *_Nullable)args;
@end @end

@ -26,8 +26,8 @@ NS_ASSUME_NONNULL_BEGIN
+ (instancetype _Nullable)sharedInstance; + (instancetype _Nullable)sharedInstance;
- (grpc_channel * _Nullable)createChannelWithHost:(NSString *)host - (grpc_channel *_Nullable)createChannelWithHost:(NSString *)host
channelArgs:(NSDictionary * _Nullable)args; channelArgs:(NSDictionary *_Nullable)args;
- (instancetype _Nullable)init NS_UNAVAILABLE; - (instancetype _Nullable)init NS_UNAVAILABLE;

@ -52,8 +52,8 @@ NS_ASSUME_NONNULL_BEGIN
return self; return self;
} }
- (grpc_channel * _Nullable)createChannelWithHost:(NSString *)host - (grpc_channel *_Nullable)createChannelWithHost:(NSString *)host
channelArgs:(NSDictionary * _Nullable)args { channelArgs:(NSDictionary *_Nullable)args {
grpc_channel_args *channelArgs = GRPCBuildChannelArgs(args); grpc_channel_args *channelArgs = GRPCBuildChannelArgs(args);
grpc_channel *unmanagedChannel = grpc_channel *unmanagedChannel =
grpc_cronet_secure_channel_create(_cronetEngine, host.UTF8String, channelArgs, NULL); grpc_cronet_secure_channel_create(_cronetEngine, host.UTF8String, channelArgs, NULL);
@ -77,8 +77,8 @@ NS_ASSUME_NONNULL_BEGIN
return nil; return nil;
} }
- (grpc_channel * _Nullable)createChannelWithHost:(NSString *)host - (grpc_channel *_Nullable)createChannelWithHost:(NSString *)host
channelArgs:(NSDictionary * _Nullable)args { channelArgs:(NSDictionary *_Nullable)args {
[NSException raise:NSInvalidArgumentException [NSException raise:NSInvalidArgumentException
format:@"Must enable macro GRPC_COMPILE_WITH_CRONET to build Cronet channel."]; format:@"Must enable macro GRPC_COMPILE_WITH_CRONET to build Cronet channel."];
return NULL; return NULL;

@ -25,8 +25,8 @@ NS_ASSUME_NONNULL_BEGIN
+ (instancetype _Nullable)sharedInstance; + (instancetype _Nullable)sharedInstance;
- (grpc_channel * _Nullable)createChannelWithHost:(NSString *)host - (grpc_channel *_Nullable)createChannelWithHost:(NSString *)host
channelArgs:(NSDictionary * _Nullable)args; channelArgs:(NSDictionary *_Nullable)args;
- (instancetype _Nullable)init NS_UNAVAILABLE; - (instancetype _Nullable)init NS_UNAVAILABLE;

@ -34,8 +34,8 @@ NS_ASSUME_NONNULL_BEGIN
return instance; return instance;
} }
- (grpc_channel * _Nullable)createChannelWithHost:(NSString *)host - (grpc_channel *_Nullable)createChannelWithHost:(NSString *)host
channelArgs:(NSDictionary * _Nullable)args { channelArgs:(NSDictionary *_Nullable)args {
grpc_channel_args *coreChannelArgs = GRPCBuildChannelArgs([args copy]); grpc_channel_args *coreChannelArgs = GRPCBuildChannelArgs([args copy]);
grpc_channel *unmanagedChannel = grpc_channel *unmanagedChannel =
grpc_insecure_channel_create(host.UTF8String, coreChannelArgs, NULL); grpc_insecure_channel_create(host.UTF8String, coreChannelArgs, NULL);

@ -23,13 +23,13 @@ NS_ASSUME_NONNULL_BEGIN
@interface GRPCSecureChannelFactory : NSObject<GRPCChannelFactory> @interface GRPCSecureChannelFactory : NSObject<GRPCChannelFactory>
+ (instancetype _Nullable)factoryWithPEMRootCertificates:(NSString * _Nullable)rootCerts + (instancetype _Nullable)factoryWithPEMRootCertificates:(NSString *_Nullable)rootCerts
privateKey:(NSString * _Nullable)privateKey privateKey:(NSString *_Nullable)privateKey
certChain:(NSString * _Nullable)certChain certChain:(NSString *_Nullable)certChain
error:(NSError **)errorPtr; error:(NSError **)errorPtr;
- (grpc_channel * _Nullable)createChannelWithHost:(NSString *)host - (grpc_channel *_Nullable)createChannelWithHost:(NSString *)host
channelArgs:(NSDictionary * _Nullable)args; channelArgs:(NSDictionary *_Nullable)args;
- (instancetype _Nullable)init NS_UNAVAILABLE; - (instancetype _Nullable)init NS_UNAVAILABLE;

@ -29,17 +29,17 @@ NS_ASSUME_NONNULL_BEGIN
grpc_channel_credentials *_channelCreds; grpc_channel_credentials *_channelCreds;
} }
+ (instancetype _Nullable)factoryWithPEMRootCertificates:(NSString * _Nullable)rootCerts + (instancetype _Nullable)factoryWithPEMRootCertificates:(NSString *_Nullable)rootCerts
privateKey:(NSString * _Nullable)privateKey privateKey:(NSString *_Nullable)privateKey
certChain:(NSString * _Nullable)certChain certChain:(NSString *_Nullable)certChain
error:(NSError **)errorPtr { error:(NSError **)errorPtr {
return [[self alloc] initWithPEMRootCerts:rootCerts return [[self alloc] initWithPEMRootCerts:rootCerts
privateKey:privateKey privateKey:privateKey
certChain:certChain certChain:certChain
error:errorPtr]; error:errorPtr];
} }
- (NSData * _Nullable)nullTerminatedDataWithString:(NSString * _Nullable)string { - (NSData *_Nullable)nullTerminatedDataWithString:(NSString *_Nullable)string {
// dataUsingEncoding: does not return a null-terminated string. // dataUsingEncoding: does not return a null-terminated string.
NSData *data = [string dataUsingEncoding:NSASCIIStringEncoding allowLossyConversion:YES]; NSData *data = [string dataUsingEncoding:NSASCIIStringEncoding allowLossyConversion:YES];
if (data == nil) { if (data == nil) {
@ -50,10 +50,10 @@ NS_ASSUME_NONNULL_BEGIN
return nullTerminated; return nullTerminated;
} }
- (instancetype _Nullable)initWithPEMRootCerts:(NSString * _Nullable)rootCerts - (instancetype _Nullable)initWithPEMRootCerts:(NSString *_Nullable)rootCerts
privateKey:(NSString * _Nullable)privateKey privateKey:(NSString *_Nullable)privateKey
certChain:(NSString * _Nullable)certChain certChain:(NSString *_Nullable)certChain
error:(NSError **)errorPtr { error:(NSError **)errorPtr {
static NSData *defaultRootsASCII; static NSData *defaultRootsASCII;
static NSError *defaultRootsError; static NSError *defaultRootsError;
static dispatch_once_t loading; static dispatch_once_t loading;
@ -116,8 +116,8 @@ NS_ASSUME_NONNULL_BEGIN
return self; return self;
} }
- (grpc_channel * _Nullable)createChannelWithHost:(NSString *)host - (grpc_channel *_Nullable)createChannelWithHost:(NSString *)host
channelArgs:(NSDictionary * _Nullable)args { channelArgs:(NSDictionary *_Nullable)args {
grpc_channel_args *coreChannelArgs = GRPCBuildChannelArgs([args copy]); grpc_channel_args *coreChannelArgs = GRPCBuildChannelArgs([args copy]);
grpc_channel *unmanagedChannel = grpc_channel *unmanagedChannel =
grpc_secure_channel_create(_channelCreds, host.UTF8String, coreChannelArgs, NULL); grpc_secure_channel_create(_channelCreds, host.UTF8String, coreChannelArgs, NULL);

Loading…
Cancel
Save