summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorSzymon Janc <szymon.janc@codecoup.pl>2018-05-09 14:11:13 +0200
committerSzymon Janc <szymon.janc@codecoup.pl>2018-05-25 09:57:46 +0200
commitce0b582c2ffa547e3390a0f3cdfeae3a3b144eee (patch)
treea2c1ee6f4b4c6b1f0147c0fba8c1a12906916258 /android
parent98ec05de7647fc6af72fd59f5707d5d0c42acc86 (diff)
downloadbluez-ce0b582c2ffa547e3390a0f3cdfeae3a3b144eee.tar.gz
android/client: Fix compilation with GCC 8
CC android/client/android_haltest-if-gatt.o android/client/if-gatt.c: In function ‘multi_adv_set_inst_data_p’: android/client/if-gatt.c:2034:7: error: ‘set_scan_rsp’ may be used uninitialized in this function [-Werror=maybe-uninitialized] EXEC(if_gatt->client->multi_adv_set_inst_data, client_if, set_scan_rsp, ^~~~~~~ android/client/if-gatt.c:2034:7: error: ‘include_name’ may be used uninitialized in this function [-Werror=maybe-uninitialized] android/client/if-gatt.c:2034:7: error: ‘include_txpower’ may be used uninitialized in this function [-Werror=maybe-uninitialized] android/client/if-gatt.c: In function ‘set_adv_data_p’: android/client/if-gatt.c:1859:7: error: ‘set_scan_rsp’ may be used uninitialized in this function [-Werror=maybe-uninitialized] EXEC(if_gatt->client->set_adv_data, client_if, set_scan_rsp, ^~~~~~~ android/client/if-gatt.c:1859:7: error: ‘include_name’ may be used uninitialized in this function [-Werror=maybe-uninitialized] android/client/if-gatt.c:1859:7: error: ‘include_txpower’ may be used uninitialized in this function [-Werror=maybe-uninitialized] cc1: all warnings being treated as errors make[1]: *** [Makefile:6431: android/client/android_haltest-if-gatt.o] Error 1 make: *** [Makefile:3262: all] Error 2
Diffstat (limited to 'android')
-rw-r--r--android/client/if-gatt.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/android/client/if-gatt.c b/android/client/if-gatt.c
index 35267832f..ed14f92c4 100644
--- a/android/client/if-gatt.c
+++ b/android/client/if-gatt.c
@@ -1825,8 +1825,9 @@ static void set_adv_data_c(int argc, const char **argv,
static void set_adv_data_p(int argc, const char **argv)
{
int client_if;
- bool set_scan_rsp;
- bool include_name, include_txpower;
+ bool set_scan_rsp = false;
+ bool include_name = false;
+ bool include_txpower = false;
int min_interval, max_interval;
int appearance;
uint16_t manufacturer_len;
@@ -2003,8 +2004,9 @@ static void multi_adv_set_inst_data_c(int argc, const char **argv,
static void multi_adv_set_inst_data_p(int argc, const char **argv)
{
int client_if;
- bool set_scan_rsp;
- bool include_name, include_txpower;
+ bool set_scan_rsp = false;
+ bool include_name = false;
+ bool include_txpower = false;
int appearance;
uint16_t manufacturer_len;
uint8_t manufacturer_data[100];