From 3543d8170c4658933d13c2c66996e1895fe20ac8 Mon Sep 17 00:00:00 2001
From: island <island@espressif.com>
Date: Wed, 8 Mar 2017 17:00:56 +0800
Subject: [PATCH] =?UTF-8?q?bt=20component:=20update=20if=E2=80=A6else=20co?=
 =?UTF-8?q?de=20style?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/bt/bluedroid/stack/gatt/gatt_db.c |  9 +++------
 components/bt/bluedroid/stack/gatt/gatt_sr.c | 18 ++++++------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/components/bt/bluedroid/stack/gatt/gatt_db.c b/components/bt/bluedroid/stack/gatt/gatt_db.c
index 3f9066d05..525375a05 100644
--- a/components/bt/bluedroid/stack/gatt/gatt_db.c
+++ b/components/bt/bluedroid/stack/gatt/gatt_db.c
@@ -276,8 +276,7 @@ static tGATT_STATUS read_attr_value (void *p_attr,
             //if offset is greater than max_len, should respond with an error*/
             else if (offset > p_attr16->p_value->attr_val.attr_len){
                 status = GATT_INVALID_OFFSET;
-            }
-            else { 
+            } else { 
                 UINT8 *value = (UINT8 *)(p_attr16->p_value->attr_val.attr_val) + offset;
                 UINT16 len_left = p_attr16->p_value->attr_val.attr_len - offset;
                 len = (mtu >= len_left) ? (len_left) : mtu;
@@ -650,8 +649,7 @@ UINT16 gatts_add_char_descr (tGATT_SVC_DB *p_db, tGATT_PERM perm,
         deallocate_attr_in_db(p_db, p_char_dscptr);
         GATT_TRACE_DEBUG("gatts_add_char_descr Fail for adding char descriptors.");
         return 0;
-    } 
-    else {
+    } else {
         p_char_dscptr->control.auto_rsp = (control == NULL) ? GATT_RSP_DEFAULT : (control->auto_rsp);
         if (attr_val != NULL) {
             if (!copy_extra_byte_in_db(p_db, (void **)&p_char_dscptr->p_value, sizeof(tGATT_ATTR_VAL))) {
@@ -736,8 +734,7 @@ tGATT_STATUS gatts_set_attribute_value(tGATT_SVC_DB *p_db, UINT16 attr_handle,
             else if (p_cur->p_value->attr_val.attr_max_len < length) {
                 GATT_TRACE_ERROR("gatts_set_attribute_value failed:Invalid value length");
                 return GATT_INVALID_ATTR_LEN;
-            }
-            else{
+            } else{
                 memcpy(p_cur->p_value->attr_val.attr_val, value, length);
                 p_cur->p_value->attr_val.attr_len = length;
             }
diff --git a/components/bt/bluedroid/stack/gatt/gatt_sr.c b/components/bt/bluedroid/stack/gatt/gatt_sr.c
index 4afcab794..d43a3a2c8 100644
--- a/components/bt/bluedroid/stack/gatt/gatt_sr.c
+++ b/components/bt/bluedroid/stack/gatt/gatt_sr.c
@@ -1135,8 +1135,7 @@ void gatts_process_write_req (tGATT_TCB *p_tcb, UINT8 i_rcb, UINT16 handle,
                     trans_id,
                     GATTS_REQ_TYPE_WRITE,
                     &sr_data);
-        } 
-        else {
+        } else {
             GATT_TRACE_ERROR("Error in %s, line=%d, max pending command, send error\n", __func__, __LINE__);
             status = GATT_BUSY; /* max pending command, application error */
         }
@@ -1237,8 +1236,7 @@ void gatt_attr_process_prepare_write (tGATT_TCB *p_tcb, UINT8 i_rcb, UINT16 hand
                             LOG_ERROR("Error in %s, attribute of handle 0x%x not allocate value buffer\n",
                                         __func__, handle);
                             status = GATT_ESP_ERROR;
-                        }
-                         else {
+                        } else {
                              //valid prepare write request, need to send response and queue the data
                              //status: GATT_SUCCESS
                              is_need_prepare_write_rsp = TRUE;
@@ -1248,8 +1246,7 @@ void gatt_attr_process_prepare_write (tGATT_TCB *p_tcb, UINT8 i_rcb, UINT16 hand
                     p_attr = (tGATT_ATTR16 *)p_attr->p_next;
                 }
             }
-        }
-        else{
+        } else{
             status = GATT_ESP_ERROR;
             GATT_TRACE_ERROR("Error in %s, Line %d: GATT BUSY\n", __func__, __LINE__);
         }
@@ -1259,8 +1256,7 @@ void gatt_attr_process_prepare_write (tGATT_TCB *p_tcb, UINT8 i_rcb, UINT16 hand
         queue_data = (tGATT_PREPARE_WRITE_QUEUE_DATA *)GKI_getbuf(len + sizeof(tGATT_PREPARE_WRITE_QUEUE_DATA));
         if (queue_data == NULL){
             status = GATT_PREPARE_Q_FULL;
-        }
-        else {
+        } else {
             queue_data->p_attr = p_attr_temp;
             queue_data->len = len;
             queue_data->handle = handle;
@@ -1283,8 +1279,7 @@ void gatt_attr_process_prepare_write (tGATT_TCB *p_tcb, UINT8 i_rcb, UINT16 hand
                 LOG_ERROR("Error in %s, line=%d, fail to send prepare_write_rsp, status=0x%x\n",
                             __func__, __LINE__, rsp_send_status);
             }
-        }
-        else{
+        } else{
             LOG_ERROR("Error in %s, line=%d, queue_data should not be NULL here, fail to send prepare_write_rsp\n",
                         __func__, __LINE__);
         }
@@ -1300,8 +1295,7 @@ void gatt_attr_process_prepare_write (tGATT_TCB *p_tcb, UINT8 i_rcb, UINT16 hand
         sr_data.write_req.need_rsp = (status == GATT_APP_RSP) ? TRUE : FALSE;
         memcpy(sr_data.write_req.value, p, len);
         gatt_sr_send_req_callback(conn_id, trans_id, GATTS_REQ_TYPE_WRITE, &sr_data);
-    }
-    else{
+    } else{
         gatt_send_error_rsp(p_tcb, status, GATT_REQ_PREPARE_WRITE, handle, TRUE);
     }