Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76cdc953 authored by Henri Chataing's avatar Henri Chataing
Browse files

system/stack/avdt: Fix -Wmissing-prototypes errors 

Bug: 369381361
Test: m com.android.btservices
Flag: EXEMPT, minor fixes
Change-Id: I1ed61b827bfb4df16831fdacfa887ed5287a50d6
parent 1faa8d4c

system/stack/avdt/avdt_int.h

+1 −0
Original line number Diff line number Diff line
@@ -884,6 +884,7 @@ void avdt_scb_hdl_open_cmd(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data); 
void avdt_scb_hdl_open_rej(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data);

void avdt_scb_hdl_open_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data);

void avdt_scb_hdl_pkt(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data);

void avdt_scb_hdl_pkt_no_frag(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data);

void avdt_scb_drop_pkt(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data);

void avdt_scb_hdl_reconfig_cmd(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data);

void avdt_scb_hdl_reconfig_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data);

system/stack/avdt/avdt_msg.cc

+1 −4
Original line number Diff line number Diff line
@@ -41,9 +41,6 @@ 
#include "stack/include/bt_hdr.h"

#include "stack/include/bt_types.h"



// TODO(b/369381361) Enfore -Wmissing-prototypes

#pragma GCC diagnostic ignored "-Wmissing-prototypes"



using namespace bluetooth;



/*****************************************************************************
@@ -1176,7 +1173,7 @@ bool avdt_msg_send(AvdtpCcb* p_ccb, BT_HDR* p_msg) { 
 *                  available.

 *

 ******************************************************************************/

BT_HDR* avdt_msg_asmbl(AvdtpCcb* p_ccb, BT_HDR* p_buf) {

static BT_HDR* avdt_msg_asmbl(AvdtpCcb* p_ccb, BT_HDR* p_buf) {

  uint8_t* p;

  uint8_t pkt_type;

  BT_HDR* p_ret;

system/stack/avdt/avdt_scb_act.cc

+1 −4
Original line number Diff line number Diff line
@@ -39,9 +39,6 @@ 
#include "stack/include/l2cap_interface.h"

#include "types/raw_address.h"



// TODO(b/369381361) Enfore -Wmissing-prototypes

#pragma GCC diagnostic ignored "-Wmissing-prototypes"



using namespace bluetooth;



/* This table is used to lookup the callback event that matches a particular
@@ -309,7 +306,7 @@ length_error: 
 * Returns          Nothing.

 *

 ******************************************************************************/

uint8_t* avdt_scb_hdl_report(AvdtpScb* p_scb, uint8_t* p, uint16_t len) {

static uint8_t* avdt_scb_hdl_report(AvdtpScb* p_scb, uint8_t* p, uint16_t len) {

  uint16_t result = AVDT_SUCCESS;

  uint8_t* p_start = p;

  uint32_t ssrc;

system/stack/test/stack_avdtp_test.cc

+0 −1
Original line number Diff line number Diff line
@@ -310,7 +310,6 @@ TEST_F(StackAvdtpTest, test_SDES_reporting_handler) { 
  ASSERT_EQ(get_func_call_count("AvdtReportCallback"), 1);

}



void avdt_scb_hdl_pkt_no_frag(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data);

// regression tests for b/258057241 (CVE-2022-40503)

// The regression tests are divided into 2 tests:

// avdt_scb_hdl_pkt_no_frag_regression_test1 verifies that