Skip to content

Commit 07d9bb9

Browse files
committed
Merge branch 'fix/uninited_local_var_in_nimble_example' into 'master'
fix(ble): init return code in nimble example Closes BLERP-2233 See merge request espressif/esp-idf!41783
2 parents 6c1b6b6 + 916f87b commit 07d9bb9

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

examples/bluetooth/ble_get_started/nimble/NimBLE_GATT_Server/main/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ static void heart_rate_task(void *param) {
8080

8181
void app_main(void) {
8282
/* Local variables */
83-
int rc;
83+
int rc = 0;
8484
esp_err_t ret;
8585

8686
/* LED initialization */

examples/bluetooth/ble_get_started/nimble/NimBLE_GATT_Server/main/src/gatt_svc.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Unlicense OR CC0-1.0
55
*/
@@ -72,7 +72,7 @@ static const struct ble_gatt_svc_def gatt_svr_svcs[] = {
7272
static int heart_rate_chr_access(uint16_t conn_handle, uint16_t attr_handle,
7373
struct ble_gatt_access_ctxt *ctxt, void *arg) {
7474
/* Local variables */
75-
int rc;
75+
int rc = 0;
7676

7777
/* Handle access events */
7878
/* Note: Heart rate characteristic is read only */
@@ -115,7 +115,7 @@ static int heart_rate_chr_access(uint16_t conn_handle, uint16_t attr_handle,
115115
static int led_chr_access(uint16_t conn_handle, uint16_t attr_handle,
116116
struct ble_gatt_access_ctxt *ctxt, void *arg) {
117117
/* Local variables */
118-
int rc;
118+
int rc = 0;
119119

120120
/* Handle access events */
121121
/* Note: LED characteristic is write only */
@@ -248,7 +248,7 @@ void gatt_svr_subscribe_cb(struct ble_gap_event *event) {
248248
*/
249249
int gatt_svc_init(void) {
250250
/* Local variables */
251-
int rc;
251+
int rc = 0;
252252

253253
/* 1. GATT service initialization */
254254
ble_svc_gatt_init();

examples/bluetooth/ble_get_started/nimble/NimBLE_Security/main/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ static void heart_rate_task(void *param) {
8585

8686
void app_main(void) {
8787
/* Local variables */
88-
int rc;
88+
int rc = 0;
8989
uint32_t seed = esp_random();
9090
esp_err_t ret;
9191

examples/bluetooth/ble_get_started/nimble/NimBLE_Security/main/src/gatt_svc.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Unlicense OR CC0-1.0
55
*/
@@ -75,7 +75,7 @@ static const struct ble_gatt_svc_def gatt_svr_svcs[] = {
7575
static int heart_rate_chr_access(uint16_t conn_handle, uint16_t attr_handle,
7676
struct ble_gatt_access_ctxt *ctxt, void *arg) {
7777
/* Local variables */
78-
int rc;
78+
int rc = 0;
7979

8080
/* Handle access events */
8181
/* Note: Heart rate characteristic is read only */
@@ -118,7 +118,7 @@ static int heart_rate_chr_access(uint16_t conn_handle, uint16_t attr_handle,
118118
static int led_chr_access(uint16_t conn_handle, uint16_t attr_handle,
119119
struct ble_gatt_access_ctxt *ctxt, void *arg) {
120120
/* Local variables */
121-
int rc;
121+
int rc = 0;
122122

123123
/* Handle access events */
124124
/* Note: LED characteristic is write only */
@@ -256,7 +256,7 @@ int gatt_svr_subscribe_cb(struct ble_gap_event *event) {
256256
*/
257257
int gatt_svc_init(void) {
258258
/* Local variables */
259-
int rc;
259+
int rc = 0;
260260

261261
/* 1. GATT service initialization */
262262
ble_svc_gatt_init();

0 commit comments

Comments
 (0)