Merge "system/test: Remove UNUSED_ATTR" into main (a121c301) · Commits · e / os / android_packages_modules_Bluetooth

system/test/headless/sdp/sdp.cc

+3 −5

Original line number	Diff line number	Diff line
		@@ -22,8 +22,6 @@

		#include "bta/dm/bta_dm_int.h"
		#include "bta/include/bta_api.h"
		#include "os/log.h"
		#include "osi/include/osi.h" // UNUSED_ATTR
		#include "stack/include/sdp_api.h"
		#include "test/headless/get_options.h"
		#include "test/headless/headless.h"
		@@ -34,8 +32,8 @@
		using namespace bluetooth::legacy::stack::sdp;
		using namespace bluetooth::test::headless;

		static void bta_jv_start_discovery_callback(
		UNUSED_ATTR const RawAddress& bd_addr, tSDP_STATUS result,
		static void bta_jv_start_discovery_callback(const RawAddress& /* bd_addr */,
		tSDP_STATUS result,
		const void* user_data) {
		auto promise =
		static_cast<std::promise<uint16_t>>(const_cast<void>(user_data));

+2 −6

Original line number	Diff line number	Diff line
		@@ -43,10 +43,6 @@
		#include "test/common/fake_osi.h"
		#include "test/common/mock_functions.h"

		#ifndef UNUSED_ATTR
		#define UNUSED_ATTR
		#endif

		OsiObject::OsiObject(void* ptr) : ptr_(ptr) {}

		OsiObject::OsiObject(const void* ptr) : ptr_(const_cast<void*>(ptr)) {}
		@@ -467,7 +463,7 @@ list_node_t* list_begin(const list_t* list) {
		inc_func_call_count(__func__);
		return nullptr;
		}
		list_node_t* list_end(UNUSED_ATTR const list_t* list) {
		list_node_t* list_end(const list_t* /* list */) {
		inc_func_call_count(__func__);
		return nullptr;
		}
		@@ -513,7 +509,7 @@ int osi_socket_local_client(const char* name, int namespaceId, int type) {
		return 0;
		}
		int osi_socket_local_client_connect(int fd, const char* name, int namespaceId,
		int type UNUSED_ATTR) {
		int type) {
		inc_func_call_count(__func__);
		return 0;
		}