From b7d55d8ec618abe6a788f1dbdc2c820e43751bb9 Mon Sep 17 00:00:00 2001 From: Pisit Sawangvonganan Date: Fri, 16 Aug 2024 13:35:07 +0700 Subject: [PATCH] style: tests: comply with MISRA C:2012 Rule 15.6 Add missing braces to comply with MISRA C:2012 Rule 15.6 and also following Zephyr's style guideline. Signed-off-by: Pisit Sawangvonganan --- tests/bluetooth/controller/common/src/helper_util.c | 3 ++- .../ll/edtt/gatt_test_app/src/gatt/service_b_3_1.c | 3 ++- .../ll/edtt/gatt_test_app/src/gatt/service_b_3_2.c | 6 ++++-- .../ll/edtt/gatt_test_app/src/gatt/service_b_3_3.c | 6 ++++-- tests/drivers/build_all/sensor/src/generic_test.c | 3 ++- tests/net/lib/lwm2m/lwm2m_engine/src/main.c | 9 ++++++--- tests/net/virtual/src/main.c | 3 ++- tests/posix/fs/src/test_fs_file.c | 6 ++++-- 8 files changed, 26 insertions(+), 13 deletions(-) diff --git a/tests/bluetooth/controller/common/src/helper_util.c b/tests/bluetooth/controller/common/src/helper_util.c index d89126c7857..6d05630558d 100644 --- a/tests/bluetooth/controller/common/src/helper_util.c +++ b/tests/bluetooth/controller/common/src/helper_util.c @@ -389,8 +389,9 @@ uint16_t event_counter(struct ll_conn *conn) * return the current event counter value (i.e. -1); * otherwise return the next event counter value */ - if (*evt_active) + if (*evt_active) { event_counter--; + } return event_counter; } diff --git a/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_3_1.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_3_1.c index f7420612818..d9bbb46d06f 100644 --- a/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_3_1.c +++ b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_3_1.c @@ -127,8 +127,9 @@ void service_b_3_1_remove(void) */ void service_b_3_1_value_v6_notify(void) { - if (!value_v6_ntf_active) + if (!value_v6_ntf_active) { return; + } bt_gatt_notify(NULL, &service_b_3_1_attrs[1], &value_v6_value, sizeof(value_v6_value)); diff --git a/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_3_2.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_3_2.c index 95020b8fbf0..1a57ff7cf00 100644 --- a/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_3_2.c +++ b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_3_2.c @@ -131,8 +131,9 @@ void service_b_3_2_remove(void) */ void service_b_3_2_value_v6_notify(void) { - if (!value_v6_ntf_active) + if (!value_v6_ntf_active) { return; + } bt_gatt_notify(NULL, &service_b_3_2_attrs[1], &value_v6_value, sizeof(value_v6_value)); @@ -160,8 +161,9 @@ static void value_v6_indicate_cb(struct bt_conn *conn, */ void service_b_3_2_value_v6_indicate(void) { - if (!value_v6_ind_active) + if (!value_v6_ind_active) { return; + } /* * NOTE: Zephyr doesn't automatically bump up the attribute pointer for * indications as it does for notifications. diff --git a/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_3_3.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_3_3.c index 3a8fe5ba903..534a73be06d 100644 --- a/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_3_3.c +++ b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_3_3.c @@ -131,8 +131,9 @@ void service_b_3_3_remove(void) */ void service_b_3_3_value_v6_notify(void) { - if (!value_v6_ntf_active) + if (!value_v6_ntf_active) { return; + } bt_gatt_notify(NULL, &service_b_3_3_attrs[1], &value_v6_value, sizeof(value_v6_value)); @@ -160,8 +161,9 @@ static void value_v6_indicate_cb(struct bt_conn *conn, */ void service_b_3_3_value_v6_indicate(void) { - if (!value_v6_ind_active) + if (!value_v6_ind_active) { return; + } /* * NOTE: Zephyr doesn't automatically bump up the attribute pointer for * indications as it does for notifications. diff --git a/tests/drivers/build_all/sensor/src/generic_test.c b/tests/drivers/build_all/sensor/src/generic_test.c index 0da0bb734ad..b8500b4006d 100644 --- a/tests/drivers/build_all/sensor/src/generic_test.c +++ b/tests/drivers/build_all/sensor/src/generic_test.c @@ -63,8 +63,9 @@ static void before(void *args) /* Flush the SQ and CQ */ rtio_sqe_drop_all(&sensor_read_rtio_ctx); - while (rtio_cqe_consume(&sensor_read_rtio_ctx)) + while (rtio_cqe_consume(&sensor_read_rtio_ctx)) { ; + } } /** diff --git a/tests/net/lib/lwm2m/lwm2m_engine/src/main.c b/tests/net/lib/lwm2m/lwm2m_engine/src/main.c index 7078fbebe6d..d982f3aecae 100644 --- a/tests/net/lib/lwm2m/lwm2m_engine/src/main.c +++ b/tests/net/lib/lwm2m/lwm2m_engine/src/main.c @@ -32,12 +32,15 @@ static int lwm2m_get_res_buf_custom_fake(const struct lwm2m_obj_path *path, void uint16_t *buffer_len, uint16_t *data_len, uint8_t *data_flags) { - if (buffer_ptr) + if (buffer_ptr) { *buffer_ptr = my_buf; - if (buffer_len) + } + if (buffer_len) { *buffer_len = sizeof(my_buf); - if (data_len) + } + if (data_len) { *data_len = my_data_len; + } return 0; } diff --git a/tests/net/virtual/src/main.c b/tests/net/virtual/src/main.c index 57b0e8becea..20d0729c56e 100644 --- a/tests/net/virtual/src/main.c +++ b/tests/net/virtual/src/main.c @@ -309,8 +309,9 @@ static void iface_cb(struct net_if *iface, void *user_data) if ((iface != net_if_lookup_by_dev(DEVICE_GET(eth_test_dummy1))) && (iface != net_if_lookup_by_dev(DEVICE_GET(eth_test_dummy2))) && (iface != net_if_lookup_by_dev(DEVICE_GET(eth_test))) && - (net_if_l2(iface) != &NET_L2_GET_NAME(VIRTUAL))) + (net_if_l2(iface) != &NET_L2_GET_NAME(VIRTUAL))) { return; + } DBG("Interface %p (%s) [%d]\n", iface, iface2str(iface), net_if_get_by_iface(iface)); diff --git a/tests/posix/fs/src/test_fs_file.c b/tests/posix/fs/src/test_fs_file.c index 43fdaa3ac3f..4a22270ea13 100644 --- a/tests/posix/fs/src/test_fs_file.c +++ b/tests/posix/fs/src/test_fs_file.c @@ -145,8 +145,9 @@ static int test_file_fsync(void) { int res = 0; - if (file < 0) + if (file < 0) { return res; + } res = fsync(file); if (res < 0) { @@ -184,8 +185,9 @@ static int test_file_truncate(void) int res = 0; size_t truncate_size = sizeof(test_str) - 4; - if (file < 0) + if (file < 0) { return res; + } res = ftruncate(file, truncate_size); if (res) {