diff options
| author | Mike J. Chen <mjchen@google.com> | 2014-01-31 18:16:59 -0800 |
|---|---|---|
| committer | Mike J. Chen <mjchen@google.com> | 2014-02-11 09:48:38 -0800 |
| commit | 5cd8bff2dd0337cb52bf48f312e3d2d55a8882fb (patch) | |
| tree | e57ed7fa0f556b2f10f081f39354a903511ae5f5 /stack/btm/btm_sec.c | |
| parent | 60126e439e01a30d6121a55aaf6d3a5d6d400507 (diff) | |
| download | android_system_bt-5cd8bff2dd0337cb52bf48f312e3d2d55a8882fb.tar.gz android_system_bt-5cd8bff2dd0337cb52bf48f312e3d2d55a8882fb.tar.bz2 android_system_bt-5cd8bff2dd0337cb52bf48f312e3d2d55a8882fb.zip | |
Major warnings cleanup
Mostly fixing unused parameter warnings.
A few other warnings also fixed like possible use of
unitialized variables (no real issue found, just compiler couldn't
follow the path), signed vs unsigned warning.
Also fixed some typos, indent issues, removal of dead code, etc.
Change-Id: I95eb887aefc4d559d7921f71a0af5f3bfb01ac01
Signed-off-by: Mike J. Chen <mjchen@google.com>
Diffstat (limited to 'stack/btm/btm_sec.c')
| -rw-r--r-- | stack/btm/btm_sec.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/stack/btm/btm_sec.c b/stack/btm/btm_sec.c index e3628f8b8..09f41b799 100644 --- a/stack/btm/btm_sec.c +++ b/stack/btm/btm_sec.c @@ -28,6 +28,7 @@ #include "btu.h" #include "btm_int.h" #include "l2c_int.h" +#include "bt_utils.h" #if (BT_USE_TRACES == TRUE && BT_TRACE_VERBOSE == FALSE) /* needed for sprintf() */ @@ -432,6 +433,13 @@ BOOLEAN BTM_SetUCDSecurityLevel (BOOLEAN is_originator, char *p_name, UINT8 serv return(btm_sec_set_security_level (conn_type, p_name, service_id, sec_level, psm, mx_proto_id, mx_chan_id)); #else + UNUSED(is_originator); + UNUSED(p_name); + UNUSED(service_id); + UNUSED(sec_level); + UNUSED(psm); + UNUSED(mx_proto_id); + UNUSED(mx_chan_id); return FALSE; #endif } @@ -842,6 +850,7 @@ UINT8 BTM_SecClrUCDService (UINT8 service_id) return(num_cleared); #else + UNUSED(service_id); return(0); #endif } @@ -4039,6 +4048,7 @@ BOOLEAN btm_sec_create_conn (BD_ADDR bda, UINT16 packet_types, static void btm_sec_connect_after_reject_timeout (TIMER_LIST_ENT *p_tle) { tBTM_SEC_DEV_REC *p_dev_rec = btm_cb.p_collided_dev_rec; + UNUSED(p_tle); BTM_TRACE_EVENT0 ("btm_sec_connect_after_reject_timeout()"); btm_cb.sec_collision_tle.param = 0; @@ -4655,6 +4665,7 @@ static void btm_sec_pairing_timeout (TIMER_LIST_ENT *p_tle) #endif #endif UINT8 name[2]; + UNUSED(p_tle); p_cb->pairing_tle.param = 0; /* Coverity: FALSE-POSITIVE error from Coverity tool. Please do NOT remove following comment. */ @@ -5357,6 +5368,7 @@ static tBTM_SEC_SERV_REC *btm_sec_find_mx_serv (UINT8 is_originator, UINT16 psm, static void btm_sec_collision_timeout (TIMER_LIST_ENT *p_tle) { tBTM_STATUS status; + UNUSED(p_tle); BTM_TRACE_EVENT0 ("btm_sec_collision_timeout()"); btm_cb.sec_collision_tle.param = 0; |