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

Commit f6c84089 authored by Martin Brabham's avatar Martin Brabham Committed by Hansong Zhang
Browse files

Cleanup/organize variable initialization 

Bug: 162984360
Tag: #refactor
Test: compiles and devices pair and work
Change-Id: Idf2a2c270a4633d9104f6f8c85dbea1584c2ba51
parent 5888caa1

system/stack/btm/btm_sec.cc

+3 −5
Original line number Diff line number Diff line
@@ -2427,10 +2427,6 @@ void btm_io_capabilities_req(const RawAddress& p) { 
  evt_data.oob_data = BTM_OOB_NONE;

  evt_data.auth_req = BTM_AUTH_SP_NO;



  uint8_t err_code = 0;

  bool is_orig = true;

  uint8_t callback_rc = BTM_SUCCESS;



  BTM_TRACE_EVENT("%s: State: %s", __func__,

                  btm_pair_state_descr(btm_cb.pairing_state));
@@ -2443,6 +2439,8 @@ void btm_io_capabilities_req(const RawAddress& p) { 
                  btm_pair_state_descr(btm_cb.pairing_state),

                  btm_cb.pairing_flags);



  uint8_t err_code = 0;

  bool is_orig = true;

  switch (btm_cb.pairing_state) {

    /* initiator connecting */

    case BTM_PAIR_STATE_IDLE:
@@ -2532,7 +2530,7 @@ void btm_io_capabilities_req(const RawAddress& p) { 


  btm_sec_change_pairing_state(BTM_PAIR_STATE_WAIT_LOCAL_IOCAPS);



  callback_rc = BTM_SUCCESS;

  uint8_t callback_rc = BTM_SUCCESS;

  if (p_dev_rec->sm4 & BTM_SM4_UPGRADE) {

    p_dev_rec->sm4 &= ~BTM_SM4_UPGRADE;