From dce13e04d15971035e42b9d3d738d451242faa7b Mon Sep 17 00:00:00 2001 From: Chris Manton Date: Thu, 19 Nov 2020 16:57:04 -0800 Subject: [PATCH] Canonicalize stack/gatt/bta_gattc_act::bta_gattc_cl_cback Towards readable code Bug: 163134718 Tag: #refactor Test: gd/cert/run Change-Id: Id0c387331d72a54d919dbbda6d796234b614890b --- bta/gatt/bta_gattc_act.cc | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/bta/gatt/bta_gattc_act.cc b/bta/gatt/bta_gattc_act.cc index c3bfce863..d872636d6 100644 --- a/bta/gatt/bta_gattc_act.cc +++ b/bta/gatt/bta_gattc_act.cc @@ -69,15 +69,16 @@ static void bta_gattc_conn_update_cback(tGATT_IF gatt_if, uint16_t conn_id, uint16_t interval, uint16_t latency, uint16_t timeout, tGATT_STATUS status); -static tGATT_CBACK bta_gattc_cl_cback = {bta_gattc_conn_cback, - bta_gattc_cmpl_cback, - bta_gattc_disc_res_cback, - bta_gattc_disc_cmpl_cback, - NULL, - bta_gattc_enc_cmpl_cback, - bta_gattc_cong_cback, - bta_gattc_phy_update_cback, - bta_gattc_conn_update_cback}; +static tGATT_CBACK bta_gattc_cl_cback = { + .p_conn_cb = bta_gattc_conn_cback, + .p_cmpl_cb = bta_gattc_cmpl_cback, + .p_disc_res_cb = bta_gattc_disc_res_cback, + .p_disc_cmpl_cb = bta_gattc_disc_cmpl_cback, + .p_req_cb = nullptr, + .p_enc_cmpl_cb = bta_gattc_enc_cmpl_cback, + .p_congestion_cb = bta_gattc_cong_cback, + .p_phy_update_cb = bta_gattc_phy_update_cback, + .p_conn_update_cb = bta_gattc_conn_update_cback}; /* opcode(tGATTC_OPTYPE) order has to be comply with internal event order */ static uint16_t bta_gattc_opcode_to_int_evt[] = { -- 2.11.0