[mynewt-nimble] branch master updated: nimble/gap: Fix build with whitelist support disabled

[janc]

This is an automated email from the ASF dual-hosted git repository.

janc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git


The following commit(s) were added to refs/heads/master by this push:
     new 7df04c1  nimble/gap: Fix build with whitelist support disabled
7df04c1 is described below

commit 7df04c1d982eef24c349cf70d00b0ecf3f8de01f
Author: Szymon Janc <szymon.j...@codecoup.pl>
AuthorDate: Wed Jan 15 09:08:37 2020 +0100

    nimble/gap: Fix build with whitelist support disabled
    
    Error: repos/apache-mynewt-nimble/nimble/host/src/ble_gap.c:2035:1:
        error: ‘ble_gap_wl_tx_clear’ defined but not used 
[-Werror=unused-function]
     ble_gap_wl_tx_clear(void)
     ^~~~~~~~~~~~~~~~~~~
    repos/apache-mynewt-nimble/nimble/host/src/ble_gap.c:2018:1:
        error: ‘ble_gap_wl_tx_add’ defined but not used 
[-Werror=unused-function]
     ble_gap_wl_tx_add(const ble_addr_t *addr)
     ^~~~~~~~~~~~~~~~~
    repos/apache-mynewt-nimble/nimble/host/src/ble_gap.c:2004:1:
        error: ‘ble_gap_wl_busy’ defined but not used [-Werror=unused-function]
     ble_gap_wl_busy(void)
     ^~~~~~~~~~~~~~~
    repos/apache-mynewt-nimble/nimble/host/src/ble_gap.c:350:1:
        error: ‘ble_gap_log_wl’ defined but not used [-Werror=unused-function]
     ble_gap_log_wl(const ble_addr_t *addr, uint8_t white_list_count)
     ^~~~~~~~~~~~~~
---
 nimble/host/src/ble_gap.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nimble/host/src/ble_gap.c b/nimble/host/src/ble_gap.c
index 93ce916..6039f6f 100644
--- a/nimble/host/src/ble_gap.c
+++ b/nimble/host/src/ble_gap.c
@@ -346,6 +346,7 @@ ble_gap_log_update(uint16_t conn_handle,
 }
 #endif
 
+#if MYNEWT_VAL(BLE_WHITELIST)
 static void
 ble_gap_log_wl(const ble_addr_t *addr, uint8_t white_list_count)
 {
@@ -359,6 +360,7 @@ ble_gap_log_wl(const ble_addr_t *addr, uint8_t 
white_list_count)
         BLE_HS_LOG(INFO, "} ");
     }
 }
+#endif
 
 #if NIMBLE_BLE_ADVERTISE && !MYNEWT_VAL(BLE_EXT_ADV)
 static void
@@ -2000,18 +2002,15 @@ ble_gap_timer(void)
  * $white list                                                               *
  *****************************************************************************/
 
+#if MYNEWT_VAL(BLE_WHITELIST)
 static int
 ble_gap_wl_busy(void)
 {
-#if MYNEWT_VAL(BLE_WHITELIST)
     /* Check if an auto or selective connection establishment procedure is in
      * progress.
      */
     return ble_gap_master.op == BLE_GAP_OP_M_CONN &&
            ble_gap_master.conn.using_wl;
-#else
-    return BLE_HS_ENOTSUP;
-#endif
 }
 
 static int
@@ -2038,6 +2037,7 @@ ble_gap_wl_tx_clear(void)
                                         BLE_HCI_OCF_LE_CLEAR_WHITE_LIST),
                              NULL, 0, NULL, 0 );
 }
+#endif
 
 int
 ble_gap_wl_set(const ble_addr_t *addrs, uint8_t white_list_count)