samples: Bluetooth: Initialize conn to NULL for bt_conn_le_create()

rugeGerritsen · rlubos · commit c7370fc8d08c · 2024-11-05T15:32:32.000+01:00
After zephyrproject-rtos/zephyr#79856 a warning message is printed out if the connection object is not initialized to NULL. This commit addresses this by initialing it. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no> (cherry picked from commit 9dbb6db)
diff --git a/samples/bluetooth/central_bas/src/main.c b/samples/bluetooth/central_bas/src/main.c
@@ -68,7 +68,7 @@ static void scan_filter_no_match(struct bt_scan_device_info *device_info,
 				 bool connectable)
 {
 	int err;
-	struct bt_conn *conn;
+	struct bt_conn *conn = NULL;
 	char addr[BT_ADDR_LE_STR_LEN];
 
 	if (device_info->recv_info->adv_type == BT_GAP_ADV_TYPE_ADV_DIRECT_IND) {
diff --git a/samples/bluetooth/central_hids/src/main.c b/samples/bluetooth/central_hids/src/main.c
@@ -96,7 +96,7 @@ static void scan_filter_no_match(struct bt_scan_device_info *device_info,
 				 bool connectable)
 {
 	int err;
-	struct bt_conn *conn;
+	struct bt_conn *conn = NULL;
 	char addr[BT_ADDR_LE_STR_LEN];
 
 	if (device_info->recv_info->adv_type == BT_GAP_ADV_TYPE_ADV_DIRECT_IND) {
diff --git a/samples/bluetooth/central_nfc_pairing/src/main.c b/samples/bluetooth/central_nfc_pairing/src/main.c
@@ -120,7 +120,7 @@ static void scan_filter_no_match(struct bt_scan_device_info *device_info,
 				 bool connectable)
 {
 	int err;
-	struct bt_conn *conn;
+	struct bt_conn *conn = NULL;
 	char addr[BT_ADDR_LE_STR_LEN];
 
 	if (device_info->recv_info->adv_type == BT_GAP_ADV_TYPE_ADV_DIRECT_IND) {
diff --git a/samples/bluetooth/iso_combined_bis_and_cis/src/combined_bis_cis.c b/samples/bluetooth/iso_combined_bis_and_cis/src/combined_bis_cis.c
@@ -101,7 +101,7 @@ static void scan_recv(const struct bt_le_scan_recv_info *info, struct net_buf_si
 	const struct bt_le_conn_param *conn_param =
 		BT_LE_CONN_PARAM(ACL_INTERVAL_BLE_UNITS, ACL_INTERVAL_BLE_UNITS, 0, 400);
 
-	struct bt_conn *conn;
+	struct bt_conn *conn = NULL;
 	int err = bt_conn_le_create(info->addr, BT_CONN_LE_CREATE_CONN, conn_param, &conn);
 
 	if (err) {
diff --git a/samples/bluetooth/iso_time_sync/src/cis_central.c b/samples/bluetooth/iso_time_sync/src/cis_central.c
@@ -83,7 +83,7 @@ static void scan_recv(const struct bt_le_scan_recv_info *info, struct net_buf_si
 		return;
 	}
 
-	struct bt_conn *conn;
+	struct bt_conn *conn = NULL;
 	int err = bt_conn_le_create(info->addr, BT_CONN_LE_CREATE_CONN, BT_LE_CONN_PARAM_DEFAULT,
 				    &conn);
 	if (err) {
diff --git a/samples/bluetooth/radio_notification_cb/src/central.c b/samples/bluetooth/radio_notification_cb/src/central.c
@@ -54,7 +54,7 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 		return;
 	}
 
-	struct bt_conn *unused_conn;
+	struct bt_conn *unused_conn = NULL;
 
 	err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN,
 				BT_LE_CONN_PARAM_DEFAULT, &unused_conn);

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ static void scan_filter_no_match(struct bt_scan_device_info *device_info,`
`68`	`68`	`bool connectable)`
`69`	`69`	`{`
`70`	`70`	`int err;`
`71`		`- struct bt_conn *conn;`
	`71`	`+ struct bt_conn *conn = NULL;`
`72`	`72`	`char addr[BT_ADDR_LE_STR_LEN];`
`73`	`73`
`74`	`74`	`if (device_info->recv_info->adv_type == BT_GAP_ADV_TYPE_ADV_DIRECT_IND) {`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ static void scan_filter_no_match(struct bt_scan_device_info *device_info,`
`96`	`96`	`bool connectable)`
`97`	`97`	`{`
`98`	`98`	`int err;`
`99`		`- struct bt_conn *conn;`
	`99`	`+ struct bt_conn *conn = NULL;`
`100`	`100`	`char addr[BT_ADDR_LE_STR_LEN];`
`101`	`101`
`102`	`102`	`if (device_info->recv_info->adv_type == BT_GAP_ADV_TYPE_ADV_DIRECT_IND) {`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ static void scan_filter_no_match(struct bt_scan_device_info *device_info,`
`120`	`120`	`bool connectable)`
`121`	`121`	`{`
`122`	`122`	`int err;`
`123`		`- struct bt_conn *conn;`
	`123`	`+ struct bt_conn *conn = NULL;`
`124`	`124`	`char addr[BT_ADDR_LE_STR_LEN];`
`125`	`125`
`126`	`126`	`if (device_info->recv_info->adv_type == BT_GAP_ADV_TYPE_ADV_DIRECT_IND) {`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ static void scan_recv(const struct bt_le_scan_recv_info *info, struct net_buf_si`
`83`	`83`	`return;`
`84`	`84`	`}`
`85`	`85`
`86`		`- struct bt_conn *conn;`
	`86`	`+ struct bt_conn *conn = NULL;`
`87`	`87`	`int err = bt_conn_le_create(info->addr, BT_CONN_LE_CREATE_CONN, BT_LE_CONN_PARAM_DEFAULT,`
`88`	`88`	`&conn);`
`89`	`89`	`if (err) {`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,`
`54`	`54`	`return;`
`55`	`55`	`}`
`56`	`56`
`57`		`- struct bt_conn *unused_conn;`
	`57`	`+ struct bt_conn *unused_conn = NULL;`
`58`	`58`
`59`	`59`	`err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN,`
`60`	`60`	`BT_LE_CONN_PARAM_DEFAULT, &unused_conn);`