From 4782d92b2d4fab261b5520a29d79ba97fea9ce7b Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 10 Nov 2017 09:53:21 -0800 Subject: s/NULL/nullptr --- src/core/lib/channel/channel_stack_builder.cc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/core/lib/channel/channel_stack_builder.cc') diff --git a/src/core/lib/channel/channel_stack_builder.cc b/src/core/lib/channel/channel_stack_builder.cc index 83748db3c2..1e553bfb03 100644 --- a/src/core/lib/channel/channel_stack_builder.cc +++ b/src/core/lib/channel/channel_stack_builder.cc @@ -54,8 +54,8 @@ grpc_channel_stack_builder* grpc_channel_stack_builder_create(void) { grpc_channel_stack_builder* b = (grpc_channel_stack_builder*)gpr_zalloc(sizeof(*b)); - b->begin.filter = NULL; - b->end.filter = NULL; + b->begin.filter = nullptr; + b->end.filter = nullptr; b->begin.next = &b->end; b->begin.prev = &b->end; b->end.next = &b->begin; @@ -108,7 +108,7 @@ bool grpc_channel_stack_builder_iterator_is_end( const char* grpc_channel_stack_builder_iterator_filter_name( grpc_channel_stack_builder_iterator* iterator) { - if (iterator->node->filter == NULL) return NULL; + if (iterator->node->filter == nullptr) return nullptr; return iterator->node->filter->name; } @@ -128,7 +128,7 @@ bool grpc_channel_stack_builder_move_prev( grpc_channel_stack_builder_iterator* grpc_channel_stack_builder_iterator_find( grpc_channel_stack_builder* builder, const char* filter_name) { - GPR_ASSERT(filter_name != NULL); + GPR_ASSERT(filter_name != nullptr); grpc_channel_stack_builder_iterator* it = grpc_channel_stack_builder_create_iterator_at_first(builder); while (grpc_channel_stack_builder_move_next(it)) { @@ -145,14 +145,14 @@ bool grpc_channel_stack_builder_move_prev( void grpc_channel_stack_builder_set_name(grpc_channel_stack_builder* builder, const char* name) { - GPR_ASSERT(builder->name == NULL); + GPR_ASSERT(builder->name == nullptr); builder->name = name; } void grpc_channel_stack_builder_set_channel_arguments( grpc_exec_ctx* exec_ctx, grpc_channel_stack_builder* builder, const grpc_channel_args* args) { - if (builder->args != NULL) { + if (builder->args != nullptr) { grpc_channel_args_destroy(exec_ctx, builder->args); } builder->args = grpc_channel_args_copy(args); @@ -160,7 +160,7 @@ void grpc_channel_stack_builder_set_channel_arguments( void grpc_channel_stack_builder_set_transport( grpc_channel_stack_builder* builder, grpc_transport* transport) { - GPR_ASSERT(builder->transport == NULL); + GPR_ASSERT(builder->transport == nullptr); builder->transport = transport; } @@ -249,7 +249,7 @@ void grpc_channel_stack_builder_destroy(grpc_exec_ctx* exec_ctx, gpr_free(p); p = next; } - if (builder->args != NULL) { + if (builder->args != nullptr) { grpc_channel_args_destroy(exec_ctx, builder->args); } gpr_free(builder->target); @@ -285,19 +285,19 @@ grpc_error* grpc_channel_stack_builder_finish( // and initialize it grpc_error* error = grpc_channel_stack_init( exec_ctx, initial_refs, destroy, - destroy_arg == NULL ? *result : destroy_arg, filters, num_filters, + destroy_arg == nullptr ? *result : destroy_arg, filters, num_filters, builder->args, builder->transport, builder->name, channel_stack); if (error != GRPC_ERROR_NONE) { grpc_channel_stack_destroy(exec_ctx, channel_stack); gpr_free(*result); - *result = NULL; + *result = nullptr; } else { // run post-initialization functions i = 0; for (filter_node* p = builder->begin.next; p != &builder->end; p = p->next) { - if (p->init != NULL) { + if (p->init != nullptr) { p->init(channel_stack, grpc_channel_stack_element(channel_stack, i), p->init_arg); } -- cgit v1.2.3