Skip to content

Commit be98d24

Browse files
ctillerctiller
committed
clang-format after nullptr changes
1 parent 6d0ec6b commit be98d24

File tree

141 files changed

+724
-528
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+724
-528
lines changed

‎src/core/ext/filters/client_channel/channel_connectivity.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ static void partly_done(grpc_exec_ctx* exec_ctx, state_watcher* w,
115115
grpc_channel_get_channel_stack(w->channel));
116116
grpc_client_channel_watch_connectivity_state(
117117
exec_ctx, client_channel_elem,
118-
grpc_polling_entity_create_from_pollset(grpc_cq_pollset(w->cq)), nullptr,
119-
&w->on_complete, nullptr);
118+
grpc_polling_entity_create_from_pollset(grpc_cq_pollset(w->cq)),
119+
nullptr, &w->on_complete, nullptr);
120120
}
121121

122122
gpr_mu_lock(&w->mu);

‎src/core/ext/filters/client_channel/client_channel.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,8 @@ static void on_lb_policy_state_changed_locked(grpc_exec_ctx* exec_ctx,
266266
gpr_log(GPR_DEBUG, "chand=%p: lb_policy=%p state changed to %s", w->chand,
267267
w->lb_policy, grpc_connectivity_state_name(w->state));
268268
}
269-
if (publish_state == GRPC_CHANNEL_SHUTDOWN && w->chand->resolver != nullptr) {
269+
if (publish_state == GRPC_CHANNEL_SHUTDOWN &&
270+
w->chand->resolver != nullptr) {
270271
publish_state = GRPC_CHANNEL_TRANSIENT_FAILURE;
271272
grpc_resolver_channel_saw_error_locked(exec_ctx, w->chand->resolver);
272273
GRPC_LB_POLICY_UNREF(exec_ctx, w->chand->lb_policy, "channel");
@@ -408,7 +409,8 @@ static void on_resolver_result_changed_locked(grpc_exec_ctx* exec_ctx,
408409
}
409410
}
410411
if (found_balancer_address) {
411-
if (lb_policy_name != nullptr && strcmp(lb_policy_name, "grpclb") != 0) {
412+
if (lb_policy_name != nullptr &&
413+
strcmp(lb_policy_name, "grpclb") != 0) {
412414
gpr_log(GPR_INFO,
413415
"resolver requested LB policy %s but provided at least one "
414416
"balancer address -- forcing use of grpclb LB policy",

‎src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,8 +1178,8 @@ static int glb_pick_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol,
11781178
bool pick_done = false;
11791179
if (glb_policy->rr_policy != nullptr) {
11801180
const grpc_connectivity_state rr_connectivity_state =
1181-
grpc_lb_policy_check_connectivity_locked(exec_ctx,
1182-
glb_policy->rr_policy, nullptr);
1181+
grpc_lb_policy_check_connectivity_locked(
1182+
exec_ctx, glb_policy->rr_policy, nullptr);
11831183
// The glb_policy->rr_policy may have transitioned to SHUTDOWN but the
11841184
// callback registered to capture this event
11851185
// (glb_rr_connectivity_changed_locked) may not have been invoked yet. We
@@ -1525,8 +1525,8 @@ static void query_for_backends_locked(grpc_exec_ctx* exec_ctx,
15251525
op->flags = 0;
15261526
op->reserved = nullptr;
15271527
op++;
1528-
call_error = grpc_call_start_batch_and_execute(exec_ctx, glb_policy->lb_call,
1529-
ops, (size_t)(op - ops), nullptr);
1528+
call_error = grpc_call_start_batch_and_execute(
1529+
exec_ctx, glb_policy->lb_call, ops, (size_t)(op - ops), nullptr);
15301530
GPR_ASSERT(GRPC_CALL_OK == call_error);
15311531

15321532
op = ops;

‎src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,8 @@ static void pf_cancel_picks_locked(grpc_exec_ctx* exec_ctx, grpc_lb_policy* pol,
155155
static void start_picking_locked(grpc_exec_ctx* exec_ctx,
156156
pick_first_lb_policy* p) {
157157
p->started_picking = true;
158-
if (p->subchannel_list != nullptr && p->subchannel_list->num_subchannels > 0) {
158+
if (p->subchannel_list != nullptr &&
159+
p->subchannel_list->num_subchannels > 0) {
159160
p->subchannel_list->checking_subchannel = 0;
160161
grpc_lb_subchannel_list_ref_for_connectivity_watch(
161162
p->subchannel_list, "connectivity_watch+start_picking");

‎src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,8 @@ static void subchannel_data_cancel_connectivity_watch(
240240
(size_t)(sd - sd->subchannel_list->subchannels),
241241
sd->subchannel_list->num_subchannels, sd->subchannel, reason);
242242
}
243-
grpc_subchannel_notify_on_state_change(exec_ctx, sd->subchannel, nullptr, nullptr,
243+
grpc_subchannel_notify_on_state_change(exec_ctx, sd->subchannel, nullptr,
244+
nullptr,
244245
&sd->connectivity_changed_closure);
245246
}
246247

‎src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,8 @@ static char* choose_service_config(char* service_config_choice_json) {
177177
break;
178178
}
179179
grpc_json* service_config_json = nullptr;
180-
for (grpc_json* field = choice->child; field != nullptr; field = field->next) {
180+
for (grpc_json* field = choice->child; field != nullptr;
181+
field = field->next) {
181182
// Check client language, if specified.
182183
if (strcmp(field->key, "clientLanguage") == 0) {
183184
if (field->type != GRPC_JSON_ARRAY ||

‎src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ static grpc_resolver* sockaddr_create(grpc_exec_ctx* exec_ctx,
157157
grpc_slice_buffer path_parts;
158158
grpc_slice_buffer_init(&path_parts);
159159
grpc_slice_split(path_slice, ",", &path_parts);
160-
grpc_lb_addresses* addresses =
161-
grpc_lb_addresses_create(path_parts.count, nullptr /* user_data_vtable */);
160+
grpc_lb_addresses* addresses = grpc_lb_addresses_create(
161+
path_parts.count, nullptr /* user_data_vtable */);
162162
bool errors_found = false;
163163
for (size_t i = 0; i < addresses->num_addresses; i++) {
164164
grpc_uri ith_uri = *args->uri;

‎src/core/ext/filters/client_channel/subchannel.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@ grpc_error* grpc_connected_subchannel_create_call(
756756
(*call)->connection = GRPC_CONNECTED_SUBCHANNEL_REF(con, "subchannel_call");
757757
const grpc_call_element_args call_args = {
758758
callstk, /* call_stack */
759-
nullptr, /* server_transport_data */
759+
nullptr, /* server_transport_data */
760760
args->context, /* context */
761761
args->path, /* path */
762762
args->start_time, /* start_time */

‎src/core/ext/transport/chttp2/client/insecure/channel_create.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ grpc_channel* grpc_insecure_channel_create(const char* target,
9999
grpc_channel_args_destroy(&exec_ctx, new_args);
100100
grpc_exec_ctx_finish(&exec_ctx);
101101
return channel != nullptr ? channel
102-
: grpc_lame_client_channel_create(
103-
target, GRPC_STATUS_INTERNAL,
104-
"Failed to create client channel");
102+
: grpc_lame_client_channel_create(
103+
target, GRPC_STATUS_INTERNAL,
104+
"Failed to create client channel");
105105
}

‎src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ grpc_channel* grpc_insecure_channel_create_from_fd(
6363
grpc_exec_ctx_finish(&exec_ctx);
6464

6565
return channel != nullptr ? channel
66-
: grpc_lame_client_channel_create(
67-
target, GRPC_STATUS_INTERNAL,
68-
"Failed to create client channel");
66+
: grpc_lame_client_channel_create(
67+
target, GRPC_STATUS_INTERNAL,
68+
"Failed to create client channel");
6969
}
7070

7171
#else // !GPR_SUPPORT_CHANNELS_FROM_FD

‎src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ grpc_channel* grpc_secure_channel_create(grpc_channel_credentials* creds,
218218
grpc_exec_ctx_finish(&exec_ctx);
219219
}
220220
return channel != nullptr ? channel
221-
: grpc_lame_client_channel_create(
222-
target, GRPC_STATUS_INTERNAL,
223-
"Failed to create secure client channel");
221+
: grpc_lame_client_channel_create(
222+
target, GRPC_STATUS_INTERNAL,
223+
"Failed to create secure client channel");
224224
}

‎src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ void grpc_server_add_insecure_channel_from_fd(grpc_server* server,
6060
grpc_endpoint_add_to_pollset(&exec_ctx, server_endpoint, pollsets[i]);
6161
}
6262

63-
grpc_server_setup_transport(&exec_ctx, server, transport, nullptr, server_args);
63+
grpc_server_setup_transport(&exec_ctx, server, transport, nullptr,
64+
server_args);
6465
grpc_chttp2_transport_start_reading(&exec_ctx, transport, nullptr);
6566
grpc_exec_ctx_finish(&exec_ctx);
6667
}

‎src/core/ext/transport/chttp2/transport/chttp2_transport.cc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1761,8 +1761,8 @@ static void send_goaway(grpc_exec_ctx* exec_ctx, grpc_chttp2_transport* t,
17611761
t->sent_goaway_state = GRPC_CHTTP2_GOAWAY_SEND_SCHEDULED;
17621762
grpc_http2_error_code http_error;
17631763
grpc_slice slice;
1764-
grpc_error_get_status(exec_ctx, error, GRPC_MILLIS_INF_FUTURE, nullptr, &slice,
1765-
&http_error);
1764+
grpc_error_get_status(exec_ctx, error, GRPC_MILLIS_INF_FUTURE, nullptr,
1765+
&slice, &http_error);
17661766
grpc_chttp2_goaway_append(t->last_new_stream_id, (uint32_t)http_error,
17671767
grpc_slice_ref_internal(slice), &t->qbuf);
17681768
grpc_chttp2_initiate_write(exec_ctx, t,
@@ -1980,10 +1980,10 @@ void grpc_chttp2_maybe_complete_recv_trailing_metadata(grpc_exec_ctx* exec_ctx,
19801980
s->stream_decompression_ctx = grpc_stream_compression_context_create(
19811981
s->stream_decompression_method);
19821982
}
1983-
if (!grpc_stream_decompress(s->stream_decompression_ctx,
1984-
&s->frame_storage,
1985-
&s->unprocessed_incoming_frames_buffer, nullptr,
1986-
GRPC_HEADER_SIZE_IN_BYTES, &end_of_context)) {
1983+
if (!grpc_stream_decompress(
1984+
s->stream_decompression_ctx, &s->frame_storage,
1985+
&s->unprocessed_incoming_frames_buffer, nullptr,
1986+
GRPC_HEADER_SIZE_IN_BYTES, &end_of_context)) {
19871987
grpc_slice_buffer_reset_and_unref_internal(exec_ctx, &s->frame_storage);
19881988
grpc_slice_buffer_reset_and_unref_internal(
19891989
exec_ctx, &s->unprocessed_incoming_frames_buffer);
@@ -2064,8 +2064,8 @@ void grpc_chttp2_cancel_stream(grpc_exec_ctx* exec_ctx,
20642064
if (!s->read_closed || !s->write_closed) {
20652065
if (s->id != 0) {
20662066
grpc_http2_error_code http_error;
2067-
grpc_error_get_status(exec_ctx, due_to_error, s->deadline, nullptr, nullptr,
2068-
&http_error);
2067+
grpc_error_get_status(exec_ctx, due_to_error, s->deadline, nullptr,
2068+
nullptr, &http_error);
20692069
grpc_slice_buffer_add(
20702070
&t->qbuf, grpc_chttp2_rst_stream_create(s->id, (uint32_t)http_error,
20712071
&s->stats.outgoing));

‎src/core/ext/transport/chttp2/transport/hpack_encoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
static grpc_slice_refcount terminal_slice_refcount = {nullptr, nullptr};
5555
static const grpc_slice terminal_slice = {
5656
&terminal_slice_refcount, /* refcount */
57-
{{nullptr, 0}} /* data.refcounted */
57+
{{nullptr, 0}} /* data.refcounted */
5858
};
5959

6060
extern "C" grpc_tracer_flag grpc_http_trace;

‎src/core/ext/transport/chttp2/transport/writing.cc

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -333,10 +333,10 @@ class DataSendContext {
333333
s_->fetching_send_message == nullptr);
334334
if (is_last_data_frame && s_->send_trailing_metadata != nullptr &&
335335
s_->stream_compression_ctx != nullptr) {
336-
if (!grpc_stream_compress(s_->stream_compression_ctx,
337-
&s_->flow_controlled_buffer,
338-
&s_->compressed_data_buffer, nullptr, MAX_SIZE_T,
339-
GRPC_STREAM_COMPRESSION_FLUSH_FINISH)) {
336+
if (!grpc_stream_compress(
337+
s_->stream_compression_ctx, &s_->flow_controlled_buffer,
338+
&s_->compressed_data_buffer, nullptr, MAX_SIZE_T,
339+
GRPC_STREAM_COMPRESSION_FLUSH_FINISH)) {
340340
gpr_log(GPR_ERROR, "Stream compression failed.");
341341
}
342342
grpc_stream_compression_context_destroy(s_->stream_compression_ctx);
@@ -347,7 +347,8 @@ class DataSendContext {
347347
* recalculated. */
348348
return;
349349
}
350-
is_last_frame_ = is_last_data_frame && s_->send_trailing_metadata != nullptr &&
350+
is_last_frame_ = is_last_data_frame &&
351+
s_->send_trailing_metadata != nullptr &&
351352
grpc_metadata_batch_is_empty(s_->send_trailing_metadata);
352353
grpc_chttp2_encode_data(s_->id, &s_->compressed_data_buffer, send_bytes,
353354
is_last_frame_, &s_->stats.outgoing, &t_->outbuf);

‎src/core/ext/transport/inproc/inproc_transport.cc

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -410,10 +410,11 @@ static void fail_helper_locked(grpc_exec_ctx* exec_ctx, inproc_stream* s,
410410
grpc_metadata_batch_init(&fake_md);
411411

412412
inproc_stream* other = s->other_side;
413-
grpc_metadata_batch* dest = (other == nullptr) ? &s->write_buffer_trailing_md
414-
: &other->to_read_trailing_md;
413+
grpc_metadata_batch* dest = (other == nullptr)
414+
? &s->write_buffer_trailing_md
415+
: &other->to_read_trailing_md;
415416
bool* destfilled = (other == nullptr) ? &s->write_buffer_trailing_md_filled
416-
: &other->to_read_trailing_md_filled;
417+
: &other->to_read_trailing_md_filled;
417418
fill_in_metadata(exec_ctx, s, &fake_md, 0, dest, nullptr, destfilled);
418419
grpc_metadata_batch_destroy(exec_ctx, &fake_md);
419420

@@ -612,10 +613,11 @@ static void op_state_machine(grpc_exec_ctx* exec_ctx, void* arg,
612613
(!s->send_message_op ||
613614
(s->t->is_client &&
614615
(s->trailing_md_recvd || s->to_read_trailing_md_filled)))) {
615-
grpc_metadata_batch* dest = (other == nullptr) ? &s->write_buffer_trailing_md
616-
: &other->to_read_trailing_md;
616+
grpc_metadata_batch* dest = (other == nullptr)
617+
? &s->write_buffer_trailing_md
618+
: &other->to_read_trailing_md;
617619
bool* destfilled = (other == nullptr) ? &s->write_buffer_trailing_md_filled
618-
: &other->to_read_trailing_md_filled;
620+
: &other->to_read_trailing_md_filled;
619621
if (*destfilled || s->trailing_md_sent) {
620622
// The buffer is already in use; that's an error!
621623
INPROC_LOG(GPR_DEBUG, "Extra trailing metadata %p", s);
@@ -827,10 +829,11 @@ static bool cancel_stream_locked(grpc_exec_ctx* exec_ctx, inproc_stream* s,
827829
grpc_metadata_batch_init(&cancel_md);
828830

829831
inproc_stream* other = s->other_side;
830-
grpc_metadata_batch* dest = (other == nullptr) ? &s->write_buffer_trailing_md
831-
: &other->to_read_trailing_md;
832+
grpc_metadata_batch* dest = (other == nullptr)
833+
? &s->write_buffer_trailing_md
834+
: &other->to_read_trailing_md;
832835
bool* destfilled = (other == nullptr) ? &s->write_buffer_trailing_md_filled
833-
: &other->to_read_trailing_md_filled;
836+
: &other->to_read_trailing_md_filled;
834837
fill_in_metadata(exec_ctx, s, &cancel_md, 0, dest, nullptr, destfilled);
835838
grpc_metadata_batch_destroy(exec_ctx, &cancel_md);
836839

@@ -914,12 +917,14 @@ static void perform_stream_op(grpc_exec_ctx* exec_ctx, grpc_transport* gt,
914917
error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Endpoint already shutdown");
915918
}
916919
if (error == GRPC_ERROR_NONE && op->send_initial_metadata) {
917-
grpc_metadata_batch* dest = (other == nullptr) ? &s->write_buffer_initial_md
918-
: &other->to_read_initial_md;
919-
uint32_t* destflags = (other == nullptr) ? &s->write_buffer_initial_md_flags
920-
: &other->to_read_initial_md_flags;
920+
grpc_metadata_batch* dest = (other == nullptr)
921+
? &s->write_buffer_initial_md
922+
: &other->to_read_initial_md;
923+
uint32_t* destflags = (other == nullptr)
924+
? &s->write_buffer_initial_md_flags
925+
: &other->to_read_initial_md_flags;
921926
bool* destfilled = (other == nullptr) ? &s->write_buffer_initial_md_filled
922-
: &other->to_read_initial_md_filled;
927+
: &other->to_read_initial_md_filled;
923928
if (*destfilled || s->initial_md_sent) {
924929
// The buffer is already in use; that's an error!
925930
INPROC_LOG(GPR_DEBUG, "Extra initial metadata %p", s);

‎src/core/lib/http/httpcli.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ static void on_read(grpc_exec_ctx* exec_ctx, void* user_data,
136136
for (i = 0; i < req->incoming.count; i++) {
137137
if (GRPC_SLICE_LENGTH(req->incoming.slices[i])) {
138138
req->have_read_byte = 1;
139-
grpc_error* err =
140-
grpc_http_parser_parse(&req->parser, req->incoming.slices[i], nullptr);
139+
grpc_error* err = grpc_http_parser_parse(
140+
&req->parser, req->incoming.slices[i], nullptr);
141141
if (err != GRPC_ERROR_NONE) {
142142
finish(exec_ctx, req, err);
143143
return;

‎src/core/lib/iomgr/error.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -767,8 +767,8 @@ grpc_error* grpc_os_error(const char* file, int line, int err,
767767
grpc_error_set_str(
768768
grpc_error_set_int(
769769
grpc_error_create(file, line,
770-
grpc_slice_from_static_string("OS Error"), nullptr,
771-
0),
770+
grpc_slice_from_static_string("OS Error"),
771+
nullptr, 0),
772772
GRPC_ERROR_INT_ERRNO, err),
773773
GRPC_ERROR_STR_OS_ERROR,
774774
grpc_slice_from_static_string(strerror(err))),

‎src/core/lib/iomgr/sockaddr_utils.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ int grpc_sockaddr_to_string(char** out,
167167
port = ntohs(addr6->sin6_port);
168168
sin6_scope_id = addr6->sin6_scope_id;
169169
}
170-
if (ip != nullptr &&
171-
grpc_inet_ntop(addr->sa_family, ip, ntop_buf, sizeof(ntop_buf)) != nullptr) {
170+
if (ip != nullptr && grpc_inet_ntop(addr->sa_family, ip, ntop_buf,
171+
sizeof(ntop_buf)) != nullptr) {
172172
if (sin6_scope_id != 0) {
173173
char* host_with_scope;
174174
/* Enclose sin6_scope_id with the format defined in RFC 6784 section 2. */

‎src/core/lib/iomgr/socket_utils_common_posix.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,8 @@ static grpc_error* error_for_fd(int fd, const grpc_resolved_address* addr) {
263263
grpc_error* grpc_create_dualstack_socket(
264264
const grpc_resolved_address* resolved_addr, int type, int protocol,
265265
grpc_dualstack_mode* dsmode, int* newfd) {
266-
return grpc_create_dualstack_socket_using_factory(nullptr, resolved_addr, type,
267-
protocol, dsmode, newfd);
266+
return grpc_create_dualstack_socket_using_factory(
267+
nullptr, resolved_addr, type, protocol, dsmode, newfd);
268268
}
269269

270270
static int create_socket(grpc_socket_factory* factory, int domain, int type,

‎src/core/lib/iomgr/tcp_client_posix.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,8 @@ static void tcp_client_connect_impl(grpc_exec_ctx* exec_ctx,
296296
}
297297

298298
if (errno != EWOULDBLOCK && errno != EINPROGRESS) {
299-
grpc_fd_orphan(exec_ctx, fdobj, nullptr, nullptr, false /* already_closed */,
300-
"tcp_client_connect_error");
299+
grpc_fd_orphan(exec_ctx, fdobj, nullptr, nullptr,
300+
false /* already_closed */, "tcp_client_connect_error");
301301
GRPC_CLOSURE_SCHED(exec_ctx, closure, GRPC_OS_ERROR(errno, "connect"));
302302
goto done;
303303
}

‎src/core/lib/iomgr/tcp_posix.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,8 @@ static void cover_self(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) {
198198
grpc_executor_scheduler(GRPC_EXECUTOR_LONG)),
199199
GRPC_ERROR_NONE);
200200
} else {
201-
while ((p = (backup_poller*)gpr_atm_acq_load(&g_backup_poller)) == nullptr) {
201+
while ((p = (backup_poller*)gpr_atm_acq_load(&g_backup_poller)) ==
202+
nullptr) {
202203
// spin waiting for backup poller
203204
}
204205
}

‎src/core/lib/security/credentials/composite/composite_credentials.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,8 @@ static grpc_security_status composite_channel_create_security_connector(
224224
downstream. */
225225
if (call_creds != nullptr) {
226226
grpc_call_credentials* composite_call_creds =
227-
grpc_composite_call_credentials_create(c->call_creds, call_creds, nullptr);
227+
grpc_composite_call_credentials_create(c->call_creds, call_creds,
228+
nullptr);
228229
status = c->inner_creds->vtable->create_security_connector(
229230
exec_ctx, c->inner_creds, composite_call_creds, target, args, sc,
230231
new_args);
@@ -253,7 +254,8 @@ grpc_channel_credentials* grpc_composite_channel_credentials_create(
253254
void* reserved) {
254255
grpc_composite_channel_credentials* c =
255256
(grpc_composite_channel_credentials*)gpr_zalloc(sizeof(*c));
256-
GPR_ASSERT(channel_creds != nullptr && call_creds != nullptr && reserved == nullptr);
257+
GPR_ASSERT(channel_creds != nullptr && call_creds != nullptr &&
258+
reserved == nullptr);
257259
GRPC_API_TRACE(
258260
"grpc_composite_channel_credentials_create(channel_creds=%p, "
259261
"call_creds=%p, reserved=%p)",

0 commit comments

Comments
 (0)