Skip to content

Commit 0fcd0bb

Browse files
llyespressif-bot
lly
authored and
espressif-bot
committed
ble_mesh: stack: Client model related code clean
1 parent e924e5f commit 0fcd0bb

File tree

8 files changed

+13
-37
lines changed

8 files changed

+13
-37
lines changed

‎components/bt/esp_ble_mesh/btc/btc_ble_mesh_config_model.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,6 @@ void bt_mesh_config_client_cb_evt_to_btc(u32_t opcode, u8_t evt_type,
315315
{
316316
esp_ble_mesh_cfg_client_cb_param_t cb_params = {0};
317317
esp_ble_mesh_client_common_param_t params = {0};
318-
size_t length = 0U;
319318
uint8_t act = 0U;
320319

321320
if (!model || !ctx) {
@@ -356,8 +355,7 @@ void bt_mesh_config_client_cb_evt_to_btc(u32_t opcode, u8_t evt_type,
356355
cb_params.params = &params;
357356

358357
if (val && len) {
359-
length = (len <= sizeof(cb_params.status_cb)) ? len : sizeof(cb_params.status_cb);
360-
memcpy(&cb_params.status_cb, val, length);
358+
memcpy(&cb_params.status_cb, val, MIN(len, sizeof(cb_params.status_cb)));
361359
}
362360

363361
btc_ble_mesh_config_client_callback(&cb_params, act);
@@ -716,7 +714,6 @@ void bt_mesh_config_server_cb_evt_to_btc(u8_t evt_type, struct bt_mesh_model *mo
716714
const u8_t *val, size_t len)
717715
{
718716
esp_ble_mesh_cfg_server_cb_param_t cb_params = {0};
719-
size_t length = 0U;
720717
uint8_t act = 0U;
721718

722719
if (!model || !ctx) {
@@ -744,8 +741,7 @@ void bt_mesh_config_server_cb_evt_to_btc(u8_t evt_type, struct bt_mesh_model *mo
744741
cb_params.ctx.send_ttl = ctx->send_ttl;
745742

746743
if (val && len) {
747-
length = (len <= sizeof(cb_params.value)) ? len : sizeof(cb_params.value);
748-
memcpy(&cb_params.value, val, length);
744+
memcpy(&cb_params.value, val, MIN(len, sizeof(cb_params.value)));
749745
}
750746

751747
btc_ble_mesh_config_server_callback(&cb_params, act);

‎components/bt/esp_ble_mesh/btc/btc_ble_mesh_generic_model.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,6 @@ void bt_mesh_generic_client_cb_evt_to_btc(u32_t opcode, u8_t evt_type,
385385
{
386386
esp_ble_mesh_generic_client_cb_param_t cb_params = {0};
387387
esp_ble_mesh_client_common_param_t params = {0};
388-
size_t length = 0U;
389388
uint8_t act = 0U;
390389

391390
if (!model || !ctx) {
@@ -426,8 +425,7 @@ void bt_mesh_generic_client_cb_evt_to_btc(u32_t opcode, u8_t evt_type,
426425
cb_params.params = &params;
427426

428427
if (val && len) {
429-
length = (len <= sizeof(cb_params.status_cb)) ? len : sizeof(cb_params.status_cb);
430-
memcpy(&cb_params.status_cb, val, length);
428+
memcpy(&cb_params.status_cb, val, MIN(len, sizeof(cb_params.status_cb)));
431429
}
432430

433431
btc_ble_mesh_generic_client_callback(&cb_params, act);
@@ -698,7 +696,6 @@ void bt_mesh_generic_server_cb_evt_to_btc(u8_t evt_type, struct bt_mesh_model *m
698696
const u8_t *val, size_t len)
699697
{
700698
esp_ble_mesh_generic_server_cb_param_t cb_params = {0};
701-
size_t length = 0U;
702699
uint8_t act = 0U;
703700

704701
if (model == NULL || ctx == NULL) {
@@ -732,8 +729,7 @@ void bt_mesh_generic_server_cb_evt_to_btc(u8_t evt_type, struct bt_mesh_model *m
732729
cb_params.ctx.send_ttl = ctx->send_ttl;
733730

734731
if (val && len) {
735-
length = (len <= sizeof(cb_params.value)) ? len : sizeof(cb_params.value);
736-
memcpy(&cb_params.value, val, length);
732+
memcpy(&cb_params.value, val, MIN(len, sizeof(cb_params.value)));
737733
}
738734

739735
btc_ble_mesh_generic_server_callback(&cb_params, act);

‎components/bt/esp_ble_mesh/btc/btc_ble_mesh_health_model.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,6 @@ void bt_mesh_health_client_cb_evt_to_btc(u32_t opcode, u8_t evt_type,
249249
{
250250
esp_ble_mesh_health_client_cb_param_t cb_params = {0};
251251
esp_ble_mesh_client_common_param_t params = {0};
252-
size_t length = 0U;
253252
uint8_t act = 0U;
254253

255254
if (!model || !ctx) {
@@ -290,8 +289,7 @@ void bt_mesh_health_client_cb_evt_to_btc(u32_t opcode, u8_t evt_type,
290289
cb_params.params = &params;
291290

292291
if (val && len) {
293-
length = (len <= sizeof(cb_params.status_cb)) ? len : sizeof(cb_params.status_cb);
294-
memcpy(&cb_params.status_cb, val, length);
292+
memcpy(&cb_params.status_cb, val, MIN(len, sizeof(cb_params.status_cb)));
295293
}
296294

297295
btc_ble_mesh_health_client_callback(&cb_params, act);

‎components/bt/esp_ble_mesh/btc/btc_ble_mesh_lighting_model.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,6 @@ void bt_mesh_lighting_client_cb_evt_to_btc(u32_t opcode, u8_t evt_type,
229229
{
230230
esp_ble_mesh_light_client_cb_param_t cb_params = {0};
231231
esp_ble_mesh_client_common_param_t params = {0};
232-
size_t length = 0U;
233232
uint8_t act = 0U;
234233

235234
if (!model || !ctx) {
@@ -270,8 +269,7 @@ void bt_mesh_lighting_client_cb_evt_to_btc(u32_t opcode, u8_t evt_type,
270269
cb_params.params = &params;
271270

272271
if (val && len) {
273-
length = (len <= sizeof(cb_params.status_cb)) ? len : sizeof(cb_params.status_cb);
274-
memcpy(&cb_params.status_cb, val, length);
272+
memcpy(&cb_params.status_cb, val, MIN(len, sizeof(cb_params.status_cb)));
275273
}
276274

277275
btc_ble_mesh_lighting_client_callback(&cb_params, act);
@@ -510,7 +508,6 @@ void bt_mesh_lighting_server_cb_evt_to_btc(u8_t evt_type, struct bt_mesh_model *
510508
const u8_t *val, size_t len)
511509
{
512510
esp_ble_mesh_lighting_server_cb_param_t cb_params = {0};
513-
size_t length = 0U;
514511
uint8_t act = 0U;
515512

516513
if (model == NULL || ctx == NULL) {
@@ -547,8 +544,7 @@ void bt_mesh_lighting_server_cb_evt_to_btc(u8_t evt_type, struct bt_mesh_model *
547544
cb_params.ctx.send_ttl = ctx->send_ttl;
548545

549546
if (val && len) {
550-
length = (len <= sizeof(cb_params.value)) ? len : sizeof(cb_params.value);
551-
memcpy(&cb_params.value, val, length);
547+
memcpy(&cb_params.value, val, MIN(len, sizeof(cb_params.value)));
552548
}
553549

554550
btc_ble_mesh_lighting_server_callback(&cb_params, act);

‎components/bt/esp_ble_mesh/btc/btc_ble_mesh_sensor_model.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,6 @@ void bt_mesh_sensor_client_cb_evt_to_btc(u32_t opcode, u8_t evt_type,
467467
{
468468
esp_ble_mesh_sensor_client_cb_param_t cb_params = {0};
469469
esp_ble_mesh_client_common_param_t params = {0};
470-
size_t length = 0U;
471470
uint8_t act = 0U;
472471

473472
if (!model || !ctx) {
@@ -508,8 +507,7 @@ void bt_mesh_sensor_client_cb_evt_to_btc(u32_t opcode, u8_t evt_type,
508507
cb_params.params = &params;
509508

510509
if (val && len) {
511-
length = (len <= sizeof(cb_params.status_cb)) ? len : sizeof(cb_params.status_cb);
512-
memcpy(&cb_params.status_cb, val, length);
510+
memcpy(&cb_params.status_cb, val, MIN(len, sizeof(cb_params.status_cb)));
513511
}
514512

515513
btc_ble_mesh_sensor_client_callback(&cb_params, act);
@@ -830,7 +828,6 @@ void bt_mesh_sensor_server_cb_evt_to_btc(u8_t evt_type, struct bt_mesh_model *mo
830828
const u8_t *val, size_t len)
831829
{
832830
esp_ble_mesh_sensor_server_cb_param_t cb_params = {0};
833-
size_t length = 0U;
834831
uint8_t act = 0U;
835832

836833
if (model == NULL || ctx == NULL) {
@@ -864,8 +861,7 @@ void bt_mesh_sensor_server_cb_evt_to_btc(u8_t evt_type, struct bt_mesh_model *mo
864861
cb_params.ctx.send_ttl = ctx->send_ttl;
865862

866863
if (val && len) {
867-
length = (len <= sizeof(cb_params.value)) ? len : sizeof(cb_params.value);
868-
memcpy(&cb_params.value, val, length);
864+
memcpy(&cb_params.value, val, MIN(len, sizeof(cb_params.value)));
869865
}
870866

871867
btc_ble_mesh_sensor_server_callback(&cb_params, act);

‎components/bt/esp_ble_mesh/btc/btc_ble_mesh_time_scene_model.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ void bt_mesh_time_scene_client_cb_evt_to_btc(u32_t opcode, u8_t evt_type,
231231
{
232232
esp_ble_mesh_time_scene_client_cb_param_t cb_params = {0};
233233
esp_ble_mesh_client_common_param_t params = {0};
234-
size_t length = 0U;
235234
uint8_t act = 0U;
236235

237236
if (!model || !ctx) {
@@ -272,8 +271,7 @@ void bt_mesh_time_scene_client_cb_evt_to_btc(u32_t opcode, u8_t evt_type,
272271
cb_params.params = &params;
273272

274273
if (val && len) {
275-
length = (len <= sizeof(cb_params.status_cb)) ? len : sizeof(cb_params.status_cb);
276-
memcpy(&cb_params.status_cb, val, length);
274+
memcpy(&cb_params.status_cb, val, MIN(len, sizeof(cb_params.status_cb)));
277275
}
278276

279277
btc_ble_mesh_time_scene_client_callback(&cb_params, act);
@@ -413,7 +411,6 @@ void bt_mesh_time_scene_server_cb_evt_to_btc(u8_t evt_type, struct bt_mesh_model
413411
const u8_t *val, size_t len)
414412
{
415413
esp_ble_mesh_time_scene_server_cb_param_t cb_params = {0};
416-
size_t length = 0U;
417414
uint8_t act = 0U;
418415

419416
if (model == NULL || ctx == NULL) {
@@ -450,8 +447,7 @@ void bt_mesh_time_scene_server_cb_evt_to_btc(u8_t evt_type, struct bt_mesh_model
450447
cb_params.ctx.send_ttl = ctx->send_ttl;
451448

452449
if (val && len) {
453-
length = (len <= sizeof(cb_params.value)) ? len : sizeof(cb_params.value);
454-
memcpy(&cb_params.value, val, length);
450+
memcpy(&cb_params.value, val, MIN(len, sizeof(cb_params.value)));
455451
}
456452

457453
btc_ble_mesh_time_scene_server_callback(&cb_params, act);

‎components/bt/esp_ble_mesh/mesh_core/cfg_cli.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,7 @@ static void cfg_client_recv_status(struct bt_mesh_model *model,
214214

215215
switch (ctx->recv_op) {
216216
case OP_DEV_COMP_DATA_STATUS: {
217-
struct bt_mesh_cfg_comp_data_status *val;
218-
val = (struct bt_mesh_cfg_comp_data_status *)status;
217+
struct bt_mesh_cfg_comp_data_status *val = status;
219218
bt_mesh_free_buf(val->comp_data);
220219
break;
221220
}

‎components/bt/esp_ble_mesh/mesh_core/health_cli.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,7 @@ static void health_client_recv_status(struct bt_mesh_model *model,
132132

133133
switch (ctx->recv_op) {
134134
case OP_HEALTH_FAULT_STATUS: {
135-
struct bt_mesh_health_fault_status *val;
136-
val = (struct bt_mesh_health_fault_status *)status;
135+
struct bt_mesh_health_fault_status *val = status;
137136
bt_mesh_free_buf(val->fault_array);
138137
break;
139138
}

0 commit comments

Comments
 (0)