From 4692b7f16f770d34ad50a1ba6dd70c53c9ab3c6d Mon Sep 17 00:00:00 2001
From: Chris Manton <cmanton@google.com>
Date: Thu, 12 Nov 2020 10:41:01 -0800
Subject: [PATCH] Canonicalization of tGATT_CBACK gap and gatt

Towards readable code

Bug: 163134718
Tag: #refactor
Test: CtsVerifier

Change-Id: I34092cd3c8776d649532a192e90190516d2ae09d
---
 bta/gatt/bta_gatts_act.cc | 20 +++++++++++---------
 stack/gap/gap_ble.cc      | 20 +++++++++++---------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/bta/gatt/bta_gatts_act.cc b/bta/gatt/bta_gatts_act.cc
index 82f605656..17fd6ade8 100644
--- a/bta/gatt/bta_gatts_act.cc
+++ b/bta/gatt/bta_gatts_act.cc
@@ -60,15 +60,17 @@ static void bta_gatts_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_gatts_cback = {bta_gatts_conn_cback,
-                                      NULL,
-                                      NULL,
-                                      NULL,
-                                      bta_gatts_send_request_cback,
-                                      NULL,
-                                      bta_gatts_cong_cback,
-                                      bta_gatts_phy_update_cback,
-                                      bta_gatts_conn_update_cback};
+static tGATT_CBACK bta_gatts_cback = {
+    .p_conn_cb = bta_gatts_conn_cback,
+    .p_cmpl_cb = nullptr,
+    .p_disc_res_cb = nullptr,
+    .p_disc_cmpl_cb = nullptr,
+    .p_req_cb = bta_gatts_send_request_cback,
+    .p_enc_cmpl_cb = nullptr,
+    .p_congestion_cb = bta_gatts_cong_cback,
+    .p_phy_update_cb = bta_gatts_phy_update_cback,
+    .p_conn_update_cb = bta_gatts_conn_update_cback,
+};
 
 tGATT_APPL_INFO bta_gatts_nv_cback = {bta_gatts_nv_save_cback,
                                       bta_gatts_nv_srv_chg_cback};
diff --git a/stack/gap/gap_ble.cc b/stack/gap/gap_ble.cc
index 0dd6c21ea..bd1135780 100644
--- a/stack/gap/gap_ble.cc
+++ b/stack/gap/gap_ble.cc
@@ -59,15 +59,17 @@ void client_connect_cback(tGATT_IF, const RawAddress&, uint16_t, bool,
 void client_cmpl_cback(uint16_t, tGATTC_OPTYPE, tGATT_STATUS,
                        tGATT_CL_COMPLETE*);
 
-tGATT_CBACK gap_cback = {client_connect_cback,
-                         client_cmpl_cback,
-                         NULL,
-                         NULL,
-                         server_attr_request_cback,
-                         NULL,
-                         NULL,
-                         NULL,
-                         NULL};
+tGATT_CBACK gap_cback = {
+    .p_conn_cb = client_connect_cback,
+    .p_cmpl_cb = client_cmpl_cback,
+    .p_disc_res_cb = nullptr,
+    .p_disc_cmpl_cb = nullptr,
+    .p_req_cb = server_attr_request_cback,
+    .p_enc_cmpl_cb = nullptr,
+    .p_congestion_cb = nullptr,
+    .p_phy_update_cb = nullptr,
+    .p_conn_update_cb = nullptr,
+};
 
 constexpr int GAP_CHAR_DEV_NAME_SIZE = BD_NAME_LEN;
 constexpr int GAP_MAX_CHAR_NUM = 4;
-- 
2.11.0