From 265316f78ca1077216c9d87b2de096894fdd5ee5 Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Mon, 29 Aug 2016 07:30:48 -0700 Subject: [PATCH] test_vendor: Remove unused extern statements It should be safe to include C header files without using extern. Change-Id: I2b562ef3f76df9f9dac69323345ed3d3610e8bc2 Signed-off-by: Myles Watson --- vendor_libs/test_vendor_lib/include/packet.h | 2 -- vendor_libs/test_vendor_lib/src/command_packet.cc | 2 -- vendor_libs/test_vendor_lib/src/dual_mode_controller.cc | 2 -- vendor_libs/test_vendor_lib/src/event_packet.cc | 2 -- vendor_libs/test_vendor_lib/src/packet.cc | 5 +---- vendor_libs/test_vendor_lib/src/packet_stream.cc | 2 -- vendor_libs/test_vendor_lib/src/test_channel_transport.cc | 2 -- vendor_libs/test_vendor_lib/test/hci_transport_unittest.cc | 2 -- vendor_libs/test_vendor_lib/test/packet_stream_unittest.cc | 2 -- 9 files changed, 1 insertion(+), 20 deletions(-) diff --git a/vendor_libs/test_vendor_lib/include/packet.h b/vendor_libs/test_vendor_lib/include/packet.h index 4636dd87b..45bb6e765 100644 --- a/vendor_libs/test_vendor_lib/include/packet.h +++ b/vendor_libs/test_vendor_lib/include/packet.h @@ -20,9 +20,7 @@ #include using std::vector; -extern "C" { #include "hci/include/hci_hal.h" -} // extern "C" namespace test_vendor_lib { diff --git a/vendor_libs/test_vendor_lib/src/command_packet.cc b/vendor_libs/test_vendor_lib/src/command_packet.cc index 8704f5ac9..1127e1d76 100644 --- a/vendor_libs/test_vendor_lib/src/command_packet.cc +++ b/vendor_libs/test_vendor_lib/src/command_packet.cc @@ -18,11 +18,9 @@ #include "command_packet.h" -extern "C" { #include "hci/include/hci_hal.h" #include "osi/include/log.h" #include "stack/include/hcidefs.h" -} // extern "C" namespace test_vendor_lib { diff --git a/vendor_libs/test_vendor_lib/src/dual_mode_controller.cc b/vendor_libs/test_vendor_lib/src/dual_mode_controller.cc index f9fea2c4a..ce0984605 100644 --- a/vendor_libs/test_vendor_lib/src/dual_mode_controller.cc +++ b/vendor_libs/test_vendor_lib/src/dual_mode_controller.cc @@ -27,11 +27,9 @@ #include "event_packet.h" #include "hci_transport.h" -extern "C" { #include "osi/include/log.h" #include "osi/include/osi.h" #include "stack/include/hcidefs.h" -} // extern "C" namespace { diff --git a/vendor_libs/test_vendor_lib/src/event_packet.cc b/vendor_libs/test_vendor_lib/src/event_packet.cc index 02a325364..3a353f84c 100644 --- a/vendor_libs/test_vendor_lib/src/event_packet.cc +++ b/vendor_libs/test_vendor_lib/src/event_packet.cc @@ -18,10 +18,8 @@ #include "event_packet.h" -extern "C" { #include "osi/include/log.h" #include "stack/include/hcidefs.h" -} // extern "C" namespace test_vendor_lib { diff --git a/vendor_libs/test_vendor_lib/src/packet.cc b/vendor_libs/test_vendor_lib/src/packet.cc index f119edd5b..c6789c9a0 100644 --- a/vendor_libs/test_vendor_lib/src/packet.cc +++ b/vendor_libs/test_vendor_lib/src/packet.cc @@ -18,13 +18,10 @@ #include "packet.h" -#include "base/logging.h" - #include -extern "C" { +#include "base/logging.h" #include "osi/include/log.h" -} // extern "C" namespace test_vendor_lib { diff --git a/vendor_libs/test_vendor_lib/src/packet_stream.cc b/vendor_libs/test_vendor_lib/src/packet_stream.cc index 187d32458..63d53c706 100644 --- a/vendor_libs/test_vendor_lib/src/packet_stream.cc +++ b/vendor_libs/test_vendor_lib/src/packet_stream.cc @@ -20,12 +20,10 @@ #include "base/logging.h" -extern "C" { #include #include #include "osi/include/log.h" -} // extern "C" namespace test_vendor_lib { diff --git a/vendor_libs/test_vendor_lib/src/test_channel_transport.cc b/vendor_libs/test_vendor_lib/src/test_channel_transport.cc index e66783ca8..9b67eae1f 100644 --- a/vendor_libs/test_vendor_lib/src/test_channel_transport.cc +++ b/vendor_libs/test_vendor_lib/src/test_channel_transport.cc @@ -20,13 +20,11 @@ #include "base/logging.h" -extern "C" { #include "osi/include/log.h" #include "osi/include/osi.h" #include #include -} // extern "C" namespace test_vendor_lib { diff --git a/vendor_libs/test_vendor_lib/test/hci_transport_unittest.cc b/vendor_libs/test_vendor_lib/test/hci_transport_unittest.cc index bd6903085..144a19b47 100644 --- a/vendor_libs/test_vendor_lib/test/hci_transport_unittest.cc +++ b/vendor_libs/test_vendor_lib/test/hci_transport_unittest.cc @@ -24,9 +24,7 @@ #include #include -extern "C" { #include "stack/include/hcidefs.h" -} // extern "C" namespace { const vector stub_command({DATA_TYPE_COMMAND, diff --git a/vendor_libs/test_vendor_lib/test/packet_stream_unittest.cc b/vendor_libs/test_vendor_lib/test/packet_stream_unittest.cc index bebf86562..66e512603 100644 --- a/vendor_libs/test_vendor_lib/test/packet_stream_unittest.cc +++ b/vendor_libs/test_vendor_lib/test/packet_stream_unittest.cc @@ -25,12 +25,10 @@ #include using std::vector; -extern "C" { #include "hci/include/hci_hal.h" #include "stack/include/hcidefs.h" #include -} // extern "C" namespace { const char small_payload[] = "foo bar baz"; -- 2.11.0