From 1a88be4edfba35732236956e6e835ecd5c9de13d Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Thu, 18 Oct 2018 13:56:03 -0700 Subject: [PATCH] Prefix functions in ChannelArgsUtil --- src/objective-c/GRPCClient/private/ChannelArgsUtil.h | 4 ++-- src/objective-c/GRPCClient/private/ChannelArgsUtil.m | 4 ++-- .../GRPCClient/private/GRPCInsecureChannelFactory.m | 4 ++-- src/objective-c/GRPCClient/private/GRPCSecureChannelFactory.m | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/objective-c/GRPCClient/private/ChannelArgsUtil.h b/src/objective-c/GRPCClient/private/ChannelArgsUtil.h index d9d6933c6bb..d0be4849105 100644 --- a/src/objective-c/GRPCClient/private/ChannelArgsUtil.h +++ b/src/objective-c/GRPCClient/private/ChannelArgsUtil.h @@ -20,6 +20,6 @@ #include -void FreeChannelArgs(grpc_channel_args* channel_args); +void GRPCFreeChannelArgs(grpc_channel_args* channel_args); -grpc_channel_args* BuildChannelArgs(NSDictionary* dictionary); +grpc_channel_args* GRPCBuildChannelArgs(NSDictionary* dictionary); diff --git a/src/objective-c/GRPCClient/private/ChannelArgsUtil.m b/src/objective-c/GRPCClient/private/ChannelArgsUtil.m index b26fb12d597..8669f79992c 100644 --- a/src/objective-c/GRPCClient/private/ChannelArgsUtil.m +++ b/src/objective-c/GRPCClient/private/ChannelArgsUtil.m @@ -39,7 +39,7 @@ static int cmp_pointer_arg(void *p, void *q) { return p == q; } static const grpc_arg_pointer_vtable objc_arg_vtable = {copy_pointer_arg, destroy_pointer_arg, cmp_pointer_arg}; -void FreeChannelArgs(grpc_channel_args *channel_args) { +void GRPCFreeChannelArgs(grpc_channel_args *channel_args) { for (size_t i = 0; i < channel_args->num_args; ++i) { grpc_arg *arg = &channel_args->args[i]; gpr_free(arg->key); @@ -58,7 +58,7 @@ void FreeChannelArgs(grpc_channel_args *channel_args) { * value responds to @c @selector(intValue). Otherwise, an exception will be raised. The caller of * this function is responsible for calling @c freeChannelArgs on a non-NULL returned value. */ -grpc_channel_args *BuildChannelArgs(NSDictionary *dictionary) { +grpc_channel_args *GRPCBuildChannelArgs(NSDictionary *dictionary) { if (!dictionary) { return NULL; } diff --git a/src/objective-c/GRPCClient/private/GRPCInsecureChannelFactory.m b/src/objective-c/GRPCClient/private/GRPCInsecureChannelFactory.m index d969b887b40..5773f2d9af1 100644 --- a/src/objective-c/GRPCClient/private/GRPCInsecureChannelFactory.m +++ b/src/objective-c/GRPCClient/private/GRPCInsecureChannelFactory.m @@ -36,10 +36,10 @@ NS_ASSUME_NONNULL_BEGIN - (nullable grpc_channel *)createChannelWithHost:(NSString *)host channelArgs:(nullable NSDictionary *)args { - grpc_channel_args *coreChannelArgs = BuildChannelArgs([args copy]); + grpc_channel_args *coreChannelArgs = GRPCBuildChannelArgs([args copy]); grpc_channel *unmanagedChannel = grpc_insecure_channel_create(host.UTF8String, coreChannelArgs, NULL); - FreeChannelArgs(coreChannelArgs); + GRPCFreeChannelArgs(coreChannelArgs); return unmanagedChannel; } diff --git a/src/objective-c/GRPCClient/private/GRPCSecureChannelFactory.m b/src/objective-c/GRPCClient/private/GRPCSecureChannelFactory.m index 277823c4e33..8a00d080a11 100644 --- a/src/objective-c/GRPCClient/private/GRPCSecureChannelFactory.m +++ b/src/objective-c/GRPCClient/private/GRPCSecureChannelFactory.m @@ -111,10 +111,10 @@ NS_ASSUME_NONNULL_BEGIN - (nullable grpc_channel *)createChannelWithHost:(NSString *)host channelArgs:(nullable NSDictionary *)args { - grpc_channel_args *coreChannelArgs = BuildChannelArgs([args copy]); + grpc_channel_args *coreChannelArgs = GRPCBuildChannelArgs([args copy]); grpc_channel *unmanagedChannel = grpc_secure_channel_create(_channelCreds, host.UTF8String, coreChannelArgs, NULL); - FreeChannelArgs(coreChannelArgs); + GRPCFreeChannelArgs(coreChannelArgs); return unmanagedChannel; }