From e959827ec014b3df13b949addee806ebd37123f8 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 4 Jan 2016 16:12:30 -0800 Subject: Update copyrights --- src/php/ext/grpc/LICENSE | 2 +- tools/run_tests/run_sanity.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/php/ext/grpc/LICENSE b/src/php/ext/grpc/LICENSE index 0c651a0287..a8c47a2081 100644 --- a/src/php/ext/grpc/LICENSE +++ b/src/php/ext/grpc/LICENSE @@ -1,4 +1,4 @@ -Copyright 2015, Google Inc. +Copyright 2015-2016, Google Inc. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/tools/run_tests/run_sanity.sh b/tools/run_tests/run_sanity.sh index 1b29848861..690332daae 100755 --- a/tools/run_tests/run_sanity.sh +++ b/tools/run_tests/run_sanity.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2015, Google Inc. +# Copyright 2015-2016, Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without -- cgit v1.2.3 From 560e5f8aa31db1b23baeb413e646a1b9ac7180d2 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 4 Jan 2016 16:39:12 -0800 Subject: Update copyrights, clang-fmt --- src/core/httpcli/httpcli_security_connector.c | 5 ++--- src/core/security/client_auth_filter.c | 6 +++--- src/core/security/credentials.c | 4 ++-- src/core/security/jwt_verifier.c | 4 ++-- src/core/security/security_connector.c | 19 ++++++++++--------- src/core/security/security_connector.h | 7 ++----- src/core/surface/init.c | 4 ++-- src/core/transport/static_metadata.c | 4 ++-- src/core/transport/static_metadata.h | 4 ++-- test/core/end2end/end2end_nosec_tests.c | 8 +++----- test/core/end2end/end2end_tests.c | 6 ++---- test/core/support/alloc_test.c | 6 +++--- 12 files changed, 35 insertions(+), 42 deletions(-) diff --git a/src/core/httpcli/httpcli_security_connector.c b/src/core/httpcli/httpcli_security_connector.c index ba7cba25f9..41ad1de6c0 100644 --- a/src/core/httpcli/httpcli_security_connector.c +++ b/src/core/httpcli/httpcli_security_connector.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -84,8 +84,7 @@ static void httpcli_ssl_do_handshake(grpc_exec_ctx *exec_ctx, } static void httpcli_ssl_check_peer(grpc_exec_ctx *exec_ctx, - grpc_security_connector *sc, - tsi_peer peer, + grpc_security_connector *sc, tsi_peer peer, grpc_security_peer_check_cb cb, void *user_data) { grpc_httpcli_ssl_channel_security_connector *c = diff --git a/src/core/security/client_auth_filter.c b/src/core/security/client_auth_filter.c index 1cb247d874..795de0df7b 100644 --- a/src/core/security/client_auth_filter.c +++ b/src/core/security/client_auth_filter.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -232,8 +232,8 @@ static void auth_start_transport_op(grpc_exec_ctx *exec_ctx, } sec_ctx = op->context[GRPC_CONTEXT_SECURITY].value; GRPC_AUTH_CONTEXT_UNREF(sec_ctx->auth_context, "client auth filter"); - sec_ctx->auth_context = GRPC_AUTH_CONTEXT_REF( - chand->auth_context, "client_auth_filter"); + sec_ctx->auth_context = + GRPC_AUTH_CONTEXT_REF(chand->auth_context, "client_auth_filter"); } if (op->send_initial_metadata != NULL) { diff --git a/src/core/security/credentials.c b/src/core/security/credentials.c index 1d1c3b098a..3473d5c887 100644 --- a/src/core/security/credentials.c +++ b/src/core/security/credentials.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -180,7 +180,7 @@ void grpc_server_credentials_set_auth_metadata_processor( "grpc_server_credentials_set_auth_metadata_processor(" "creds=%p, " "processor=grpc_auth_metadata_processor { process: %p, state: %p })", - 3, (creds, (void*)(gpr_intptr)processor.process, processor.state)); + 3, (creds, (void *)(gpr_intptr)processor.process, processor.state)); if (creds == NULL) return; if (creds->processor.destroy != NULL && creds->processor.state != NULL) { creds->processor.destroy(creds->processor.state); diff --git a/src/core/security/jwt_verifier.c b/src/core/security/jwt_verifier.c index d36f2ca471..042a117f5d 100644 --- a/src/core/security/jwt_verifier.c +++ b/src/core/security/jwt_verifier.c @@ -443,8 +443,8 @@ static BIGNUM *bignum_from_base64(const char *b64) { gpr_log(GPR_ERROR, "Invalid base64 for big num."); return NULL; } - result = - BN_bin2bn(GPR_SLICE_START_PTR(bin), TSI_SIZE_AS_SIZE(GPR_SLICE_LENGTH(bin)), NULL); + result = BN_bin2bn(GPR_SLICE_START_PTR(bin), + TSI_SIZE_AS_SIZE(GPR_SLICE_LENGTH(bin)), NULL); gpr_slice_unref(bin); return result; } diff --git a/src/core/security/security_connector.c b/src/core/security/security_connector.c index 204cd324f6..61336a1057 100644 --- a/src/core/security/security_connector.c +++ b/src/core/security/security_connector.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -316,8 +316,7 @@ grpc_channel_security_connector *grpc_fake_channel_security_connector_create( c->base.is_client_side = 1; c->base.url_scheme = GRPC_FAKE_SECURITY_URL_SCHEME; c->base.vtable = &fake_channel_vtable; - c->request_metadata_creds = - grpc_call_credentials_ref(request_metadata_creds); + c->request_metadata_creds = grpc_call_credentials_ref(request_metadata_creds); c->check_call_host = fake_channel_check_call_host; return c; } @@ -500,9 +499,10 @@ static grpc_security_status ssl_check_peer(grpc_security_connector *sc, return GRPC_SECURITY_OK; } -static void ssl_channel_check_peer( - grpc_exec_ctx *exec_ctx, grpc_security_connector *sc, tsi_peer peer, - grpc_security_peer_check_cb cb, void *user_data) { +static void ssl_channel_check_peer(grpc_exec_ctx *exec_ctx, + grpc_security_connector *sc, tsi_peer peer, + grpc_security_peer_check_cb cb, + void *user_data) { grpc_ssl_channel_security_connector *c = (grpc_ssl_channel_security_connector *)sc; grpc_security_status status; @@ -516,9 +516,10 @@ static void ssl_channel_check_peer( tsi_peer_destruct(&peer); } -static void ssl_server_check_peer( - grpc_exec_ctx *exec_ctx, grpc_security_connector *sc, tsi_peer peer, - grpc_security_peer_check_cb cb, void *user_data) { +static void ssl_server_check_peer(grpc_exec_ctx *exec_ctx, + grpc_security_connector *sc, tsi_peer peer, + grpc_security_peer_check_cb cb, + void *user_data) { grpc_auth_context *auth_context = NULL; grpc_security_status status = ssl_check_peer(sc, NULL, &peer, &auth_context); tsi_peer_destruct(&peer); diff --git a/src/core/security/security_connector.h b/src/core/security/security_connector.h index b5f3ff17f4..2b734109b3 100644 --- a/src/core/security/security_connector.h +++ b/src/core/security/security_connector.h @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -40,10 +40,7 @@ /* --- status enum. --- */ -typedef enum { - GRPC_SECURITY_OK = 0, - GRPC_SECURITY_ERROR -} grpc_security_status; +typedef enum { GRPC_SECURITY_OK = 0, GRPC_SECURITY_ERROR } grpc_security_status; /* --- URL schemes. --- */ diff --git a/src/core/surface/init.c b/src/core/surface/init.c index 81166e8ec5..6ef8ff3853 100644 --- a/src/core/surface/init.c +++ b/src/core/surface/init.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -83,7 +83,7 @@ static int g_number_of_plugins = 0; void grpc_register_plugin(void (*init)(void), void (*destroy)(void)) { GRPC_API_TRACE("grpc_register_plugin(init=%p, destroy=%p)", 2, - ((void*)(gpr_intptr)init, (void*)(gpr_intptr)destroy)); + ((void*)(gpr_intptr)init, (void*)(gpr_intptr)destroy)); GPR_ASSERT(g_number_of_plugins != MAX_PLUGINS); g_all_of_the_plugins[g_number_of_plugins].init = init; g_all_of_the_plugins[g_number_of_plugins].destroy = destroy; diff --git a/src/core/transport/static_metadata.c b/src/core/transport/static_metadata.c index 361fe5ede6..5825eb225a 100644 --- a/src/core/transport/static_metadata.c +++ b/src/core/transport/static_metadata.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,7 +30,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ - + /* * WARNING: Auto-generated code. * diff --git a/src/core/transport/static_metadata.h b/src/core/transport/static_metadata.h index d951293c84..8f4cd2e447 100644 --- a/src/core/transport/static_metadata.h +++ b/src/core/transport/static_metadata.h @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,7 +30,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ - + /* * WARNING: Auto-generated code. * diff --git a/test/core/end2end/end2end_nosec_tests.c b/test/core/end2end/end2end_nosec_tests.c index 8f6cdd8a0a..ff7c46d31f 100644 --- a/test/core/end2end/end2end_nosec_tests.c +++ b/test/core/end2end/end2end_nosec_tests.c @@ -2,7 +2,7 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -33,8 +33,6 @@ * */ - - /* This file is auto-generated */ #include "test/core/end2end/end2end_tests.h" @@ -77,7 +75,8 @@ extern void simple_delayed_request(grpc_end2end_test_config config); extern void simple_request(grpc_end2end_test_config config); extern void trailing_metadata(grpc_end2end_test_config config); -void grpc_end2end_tests(int argc, char **argv, grpc_end2end_test_config config) { +void grpc_end2end_tests(int argc, char **argv, + grpc_end2end_test_config config) { int i; if (argc <= 1) { @@ -264,4 +263,3 @@ void grpc_end2end_tests(int argc, char **argv, grpc_end2end_test_config config) abort(); } } - diff --git a/test/core/end2end/end2end_tests.c b/test/core/end2end/end2end_tests.c index 42a3a705f6..4c3a018ad2 100644 --- a/test/core/end2end/end2end_tests.c +++ b/test/core/end2end/end2end_tests.c @@ -33,8 +33,6 @@ * */ - - /* This file is auto-generated */ #include "test/core/end2end/end2end_tests.h" @@ -78,7 +76,8 @@ extern void simple_delayed_request(grpc_end2end_test_config config); extern void simple_request(grpc_end2end_test_config config); extern void trailing_metadata(grpc_end2end_test_config config); -void grpc_end2end_tests(int argc, char **argv, grpc_end2end_test_config config) { +void grpc_end2end_tests(int argc, char **argv, + grpc_end2end_test_config config) { int i; if (argc <= 1) { @@ -270,4 +269,3 @@ void grpc_end2end_tests(int argc, char **argv, grpc_end2end_test_config config) abort(); } } - diff --git a/test/core/support/alloc_test.c b/test/core/support/alloc_test.c index dc0a2acfa5..13dc22da43 100644 --- a/test/core/support/alloc_test.c +++ b/test/core/support/alloc_test.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -48,8 +48,8 @@ static void test_custom_allocs() { gpr_allocation_functions fns = {fake_malloc, fake_realloc, fake_free}; gpr_set_allocation_functions(fns); - GPR_ASSERT((void*)(size_t)0xdeadbeef == gpr_malloc(0xdeadbeef)); - GPR_ASSERT((void*)(size_t)0xcafed00d == gpr_realloc(0, 0xcafed00d)); + GPR_ASSERT((void *)(size_t)0xdeadbeef == gpr_malloc(0xdeadbeef)); + GPR_ASSERT((void *)(size_t)0xcafed00d == gpr_realloc(0, 0xcafed00d)); gpr_free(&addr_to_free); GPR_ASSERT(addr_to_free == 0xdeadd00d); -- cgit v1.2.3