Remove unnecessary extern Cs

7 years ago · 39aed1ae8b
parent af922468dd
commit 39aed1ae8b
32 changed files with 5 additions and 113 deletions
--- a/test/core/debug/stats_test.cc
+++ b/test/core/debug/stats_test.cc
@ -16,9 +16,7 @@
 *
 */

-extern "C" {
 #include "src/core/lib/debug/stats.h"
-}

 #include <mutex>
 #include <thread>
--- a/test/core/end2end/h2_ssl_cert_test.cc
+++ b/test/core/end2end/h2_ssl_cert_test.cc
@ -16,9 +16,7 @@
 *
 */

-extern "C" {
 #include "test/core/end2end/end2end_tests.h"
-}

 #include <stdio.h>
 #include <string.h>
@ -27,7 +25,6 @@ extern "C" {
 #include <grpc/support/host_port.h>
 #include <grpc/support/log.h>

-extern "C" {
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/support/env.h"
@ -37,7 +34,6 @@ extern "C" {
 #include "test/core/end2end/data/ssl_test_data.h"
 #include "test/core/util/port.h"
 #include "test/core/util/test_config.h"
-}

 #include <gtest/gtest.h>

--- a/test/core/security/oauth2_utils.h
+++ b/test/core/security/oauth2_utils.h
@ -21,17 +21,9 @@

 #include "src/core/lib/security/credentials/credentials.h"

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Fetch oauth2 access token with a credentials object. Does not take ownership.
   Returns NULL on a failure. The caller should call gpr_free on the token. */
 char *grpc_test_fetch_oauth2_token_with_credentials(
    grpc_call_credentials *creds);

-#ifdef __cplusplus
-}
-#endif
-
 #endif /* GRPC_TEST_CORE_SECURITY_OAUTH2_UTILS_H */
--- a/test/core/tsi/transport_security_test_lib.h
+++ b/test/core/tsi/transport_security_test_lib.h
@ -21,10 +21,6 @@

 #include "src/core/tsi/transport_security_interface.h"

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define TSI_TEST_TINY_HANDSHAKE_BUFFER_SIZE 32
 #define TSI_TEST_SMALL_HANDSHAKE_BUFFER_SIZE 128
 #define TSI_TEST_SMALL_READ_BUFFER_ALLOCATED_SIZE 41
@ -173,8 +169,4 @@ void tsi_test_do_handshake(tsi_test_fixture *fixture);
   the client and server switching its role. */
 void tsi_test_do_round_trip(tsi_test_fixture *fixture);

-#ifdef __cplusplus
-}
-#endif
-
 #endif  // GRPC_TEST_CORE_TSI_TRANSPORT_SECURITY_TEST_LIB_H_
--- a/test/core/util/debugger_macros.cc
+++ b/test/core/util/debugger_macros.cc
@ -29,7 +29,7 @@
 #include "src/core/lib/channel/connected_channel.h"
 #include "src/core/lib/surface/call.h"

-extern "C" void grpc_summon_debugger_macros() {}
+void grpc_summon_debugger_macros() {}

 grpc_stream *grpc_transport_stream_from_call(grpc_call *call) {
  grpc_call_stack *cs = grpc_call_get_call_stack(call);
--- a/test/core/util/debugger_macros.h
+++ b/test/core/util/debugger_macros.h
@ -19,14 +19,6 @@
 #ifndef GRPC_TEST_CORE_UTIL_DEBUGGER_MACROS_H
 #define GRPC_TEST_CORE_UTIL_DEBUGGER_MACROS_H

-#ifdef __cplusplus
-extern "C" {
-#endif /*  __cplusplus */
-
 void grpc_summon_debugger_macros();

-#ifdef __cplusplus
-}
-#endif /*  __cplusplus */
-
 #endif /* GRPC_TEST_CORE_UTIL_DEBUGGER_MACROS_H */
--- a/test/core/util/grpc_profiler.h
+++ b/test/core/util/grpc_profiler.h
@ -19,15 +19,7 @@
 #ifndef GRPC_TEST_CORE_UTIL_GRPC_PROFILER_H
 #define GRPC_TEST_CORE_UTIL_GRPC_PROFILER_H

-#ifdef __cplusplus
-extern "C" {
-#endif /*  __cplusplus */
-
 void grpc_profiler_start(const char *filename);
 void grpc_profiler_stop();

-#ifdef __cplusplus
-}
-#endif /*  __cplusplus */
-
 #endif /* GRPC_TEST_CORE_UTIL_GRPC_PROFILER_H */
--- a/test/core/util/port.h
+++ b/test/core/util/port.h
@ -19,10 +19,6 @@
 #ifndef GRPC_TEST_CORE_UTIL_PORT_H
 #define GRPC_TEST_CORE_UTIL_PORT_H

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct grpc_pick_port_functions {
  int (*pick_unused_port_fn)(void);
  int (*pick_unused_port_or_die_fn)(void);
@ -45,8 +41,4 @@ void grpc_recycle_unused_port(int port);
 /** Request the family of pick_port functions in \a functions be used. */
 void grpc_set_pick_port_functions(grpc_pick_port_functions functions);

-#ifdef __cplusplus
-}
-#endif
-
 #endif /* GRPC_TEST_CORE_UTIL_PORT_H */
--- a/test/core/util/reconnect_server.h
+++ b/test/core/util/reconnect_server.h
@ -23,10 +23,6 @@
 #include <grpc/support/time.h>
 #include "test/core/util/test_tcp_server.h"

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct timestamp_list {
  gpr_timespec timestamp;
  struct timestamp_list *next;
@ -46,8 +42,4 @@ void reconnect_server_poll(reconnect_server *server, int seconds);
 void reconnect_server_destroy(reconnect_server *server);
 void reconnect_server_clear_timestamps(reconnect_server *server);

-#ifdef __cplusplus
-}
-#endif
-
 #endif /* GRPC_TEST_CORE_UTIL_RECONNECT_SERVER_H */
--- a/test/core/util/test_config.h
+++ b/test/core/util/test_config.h
@ -21,10 +21,6 @@

 #include <grpc/support/time.h>

-#ifdef __cplusplus
-extern "C" {
-#endif /*  __cplusplus */
-
 extern int64_t g_fixture_slowdown_factor;
 extern int64_t g_poller_slowdown_factor;

@ -43,8 +39,4 @@ gpr_timespec grpc_timeout_milliseconds_to_deadline(int64_t time_ms);

 void grpc_test_init(int argc, char **argv);

-#ifdef __cplusplus
-}
-#endif /*  __cplusplus */
-
 #endif /* GRPC_TEST_CORE_UTIL_TEST_CONFIG_H */
--- a/test/core/util/trickle_endpoint.h
+++ b/test/core/util/trickle_endpoint.h
@ -21,10 +21,6 @@

 #include "src/core/lib/iomgr/endpoint.h"

-#ifdef __cplusplus
-extern "C" {
-#endif  // __cplusplus
-
 grpc_endpoint *grpc_trickle_endpoint_create(grpc_endpoint *wrap,
                                            double bytes_per_second);

@ -34,8 +30,4 @@ size_t grpc_trickle_endpoint_trickle(grpc_exec_ctx *exec_ctx,

 size_t grpc_trickle_get_backlog(grpc_endpoint *endpoint);

-#ifdef __cplusplus
-}
-#endif  // __cplusplus
-
 #endif
--- a/test/cpp/common/auth_property_iterator_test.cc
+++ b/test/cpp/common/auth_property_iterator_test.cc
@ -22,9 +22,7 @@
 #include "src/cpp/common/secure_auth_context.h"
 #include "test/cpp/util/string_ref_helper.h"

-extern "C" {
 #include "src/core/lib/security/context/security_context.h"
-}

 using ::grpc::testing::ToString;

--- a/test/cpp/common/channel_arguments_test.cc
+++ b/test/cpp/common/channel_arguments_test.cc
@ -23,10 +23,8 @@
 #include <grpc/support/useful.h>
 #include <gtest/gtest.h>

-extern "C" {
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/socket_mutator.h"
-}

 namespace grpc {
 namespace testing {
--- a/test/cpp/common/secure_auth_context_test.cc
+++ b/test/cpp/common/secure_auth_context_test.cc
@ -22,9 +22,7 @@
 #include <gtest/gtest.h>
 #include "test/cpp/util/string_ref_helper.h"

-extern "C" {
 #include "src/core/lib/security/context/security_context.h"
-}

 using grpc::testing::ToString;

--- a/test/cpp/end2end/client_lb_end2end_test.cc
+++ b/test/cpp/end2end/client_lb_end2end_test.cc
@ -33,10 +33,8 @@
 #include <grpc/support/thd.h>
 #include <grpc/support/time.h>

-extern "C" {
 #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h"
 #include "src/core/ext/filters/client_channel/subchannel_index.h"
-}

 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/util/port.h"
--- a/test/cpp/end2end/grpclb_end2end_test.cc
+++ b/test/cpp/end2end/grpclb_end2end_test.cc
@ -33,10 +33,8 @@
 #include <grpc/support/thd.h>
 #include <grpc/support/time.h>

-extern "C" {
 #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h"
 #include "src/core/lib/iomgr/sockaddr.h"
-}

 #include "test/core/util/port.h"
 #include "test/core/util/test_config.h"
--- a/test/cpp/grpclb/grpclb_test.cc
+++ b/test/cpp/grpclb/grpclb_test.cc
@ -35,7 +35,7 @@
 #include <grpc/support/time.h>

 #include <grpc++/impl/codegen/config.h>
-extern "C" {
+
 #include "src/core/ext/filters/client_channel/client_channel.h"
 #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h"
 #include "src/core/lib/channel/channel_args.h"
@ -49,7 +49,6 @@ extern "C" {
 #include "test/core/end2end/cq_verifier.h"
 #include "test/core/util/port.h"
 #include "test/core/util/test_config.h"
-}

 #include "src/proto/grpc/lb/v1/load_balancer.pb.h"

--- a/test/cpp/interop/interop_test.cc
+++ b/test/cpp/interop/interop_test.cc
@ -37,10 +37,8 @@
 #include "test/core/util/port.h"
 #include "test/cpp/util/test_config.h"

-extern "C" {
 #include "src/core/lib/iomgr/socket_utils_posix.h"
 #include "src/core/lib/support/string.h"
-}

 DEFINE_string(extra_server_flags, "", "Extra flags to pass to server.");

--- a/test/cpp/microbenchmarks/bm_arena.cc
+++ b/test/cpp/microbenchmarks/bm_arena.cc
@ -18,9 +18,7 @@

 /* Benchmark arenas */

-extern "C" {
 #include "src/core/lib/support/arena.h"
-}
 #include "test/cpp/microbenchmarks/helpers.h"
 #include "third_party/benchmark/include/benchmark/benchmark.h"

--- a/test/cpp/microbenchmarks/bm_call_create.cc
+++ b/test/cpp/microbenchmarks/bm_call_create.cc
@ -29,7 +29,6 @@
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>

-extern "C" {
 #include "src/core/ext/filters/client_channel/client_channel.h"
 #include "src/core/ext/filters/deadline/deadline_filter.h"
 #include "src/core/ext/filters/http/client/http_client_filter.h"
@ -43,7 +42,6 @@ extern "C" {
 #include "src/core/lib/profiling/timers.h"
 #include "src/core/lib/surface/channel.h"
 #include "src/core/lib/transport/transport_impl.h"
-}

 #include "src/cpp/client/create_channel_internal.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
--- a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc
+++ b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc
@ -22,14 +22,14 @@
 #include <grpc/support/log.h>
 #include <string.h>
 #include <sstream>
-extern "C" {
+
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_parser.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/slice/slice_string_helpers.h"
 #include "src/core/lib/transport/static_metadata.h"
 #include "src/core/lib/transport/timeout_encoding.h"
-}
+
 #include "test/cpp/microbenchmarks/helpers.h"
 #include "third_party/benchmark/include/benchmark/benchmark.h"

--- a/test/cpp/microbenchmarks/bm_closure.cc
+++ b/test/cpp/microbenchmarks/bm_closure.cc
@ -22,12 +22,10 @@
 #include <grpc/grpc.h>
 #include <sstream>

-extern "C" {
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/combiner.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/support/spinlock.h"
-}

 #include "test/cpp/microbenchmarks/helpers.h"

--- a/test/cpp/microbenchmarks/bm_cq.cc
+++ b/test/cpp/microbenchmarks/bm_cq.cc
@ -26,9 +26,7 @@
 #include <grpc/support/log.h>
 #include "test/cpp/microbenchmarks/helpers.h"

-extern "C" {
 #include "src/core/lib/surface/completion_queue.h"
-}

 namespace grpc {
 namespace testing {
--- a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc
+++ b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc
@ -25,11 +25,9 @@
 #include <grpc/support/log.h>
 #include "test/cpp/microbenchmarks/helpers.h"

-extern "C" {
 #include "src/core/lib/iomgr/ev_posix.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/surface/completion_queue.h"
-}

 struct grpc_pollset {
  gpr_mu mu;
--- a/test/cpp/microbenchmarks/bm_error.cc
+++ b/test/cpp/microbenchmarks/bm_error.cc
@ -21,10 +21,8 @@
 #include <benchmark/benchmark.h>
 #include <memory>

-extern "C" {
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/transport/error_utils.h"
-}

 #include "test/cpp/microbenchmarks/helpers.h"

--- a/test/cpp/microbenchmarks/bm_metadata.cc
+++ b/test/cpp/microbenchmarks/bm_metadata.cc
@ -21,10 +21,8 @@
 #include <benchmark/benchmark.h>
 #include <grpc/grpc.h>

-extern "C" {
 #include "src/core/lib/transport/metadata.h"
 #include "src/core/lib/transport/static_metadata.h"
-}

 #include "test/cpp/microbenchmarks/helpers.h"

--- a/test/cpp/microbenchmarks/bm_pollset.cc
+++ b/test/cpp/microbenchmarks/bm_pollset.cc
@ -23,12 +23,10 @@
 #include <grpc/support/log.h>
 #include <grpc/support/useful.h>

-extern "C" {
 #include "src/core/lib/iomgr/ev_posix.h"
 #include "src/core/lib/iomgr/pollset.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/wakeup_fd_posix.h"
-}

 #include "test/cpp/microbenchmarks/helpers.h"
 #include "third_party/benchmark/include/benchmark/benchmark.h"
--- a/test/cpp/microbenchmarks/fullstack_fixtures.h
+++ b/test/cpp/microbenchmarks/fullstack_fixtures.h
@ -27,7 +27,6 @@
 #include <grpc++/server_builder.h>
 #include <grpc/support/log.h>

-extern "C" {
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/endpoint.h"
@ -39,7 +38,6 @@ extern "C" {
 #include "src/core/lib/surface/server.h"
 #include "test/core/util/passthru_endpoint.h"
 #include "test/core/util/port.h"
-}

 #include "src/cpp/client/create_channel_internal.h"
 #include "test/cpp/microbenchmarks/helpers.h"
--- a/test/cpp/microbenchmarks/helpers.h
+++ b/test/cpp/microbenchmarks/helpers.h
@ -22,11 +22,9 @@
 #include <sstream>
 #include <vector>

-extern "C" {
 #include <grpc/support/port_platform.h>
 #include "src/core/lib/debug/stats.h"
 #include "test/core/util/memory_counters.h"
-}

 #include <benchmark/benchmark.h>
 #include <grpc++/impl/grpc_library.h>
--- a/test/cpp/naming/resolver_component_test.cc
+++ b/test/cpp/naming/resolver_component_test.cc
@ -32,7 +32,6 @@
 #include "test/cpp/util/subprocess.h"
 #include "test/cpp/util/test_config.h"

-extern "C" {
 #include "src/core/ext/filters/client_channel/client_channel.h"
 #include "src/core/ext/filters/client_channel/resolver.h"
 #include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h"
@ -47,7 +46,6 @@ extern "C" {
 #include "src/core/lib/support/string.h"
 #include "test/core/util/port.h"
 #include "test/core/util/test_config.h"
-}

 using std::vector;
 using grpc::SubProcess;
--- a/test/cpp/naming/resolver_component_tests_runner_invoker.cc
+++ b/test/cpp/naming/resolver_component_tests_runner_invoker.cc
@ -32,10 +32,8 @@
 #include "test/cpp/util/subprocess.h"
 #include "test/cpp/util/test_config.h"

-extern "C" {
 #include "src/core/lib/support/env.h"
 #include "test/core/util/port.h"
-}

 DEFINE_bool(
    running_under_bazel, false,
--- a/test/cpp/performance/writes_per_rpc_test.cc
+++ b/test/cpp/performance/writes_per_rpc_test.cc
@ -26,7 +26,6 @@
 #include <grpc/support/log.h>
 #include <gtest/gtest.h>

-extern "C" {
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/endpoint.h"
@ -38,7 +37,7 @@ extern "C" {
 #include "src/core/lib/surface/server.h"
 #include "test/core/util/passthru_endpoint.h"
 #include "test/core/util/port.h"
-}
+
 #include "src/cpp/client/create_channel_internal.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/util/test_config.h"