From 09864bdf914e06542b8153ad83279e2f28a27995 Mon Sep 17 00:00:00 2001 From: Mikhail Antropov Date: Mon, 25 Apr 2022 20:07:28 +0300 Subject: [PATCH] Fix code review --- src/bacnet/datalink/datalink.c | 2 +- test/bacnet/datalink/mock/src/arcnet-mock.c | 5 +---- test/bacnet/datalink/mock/src/main.c | 3 --- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/bacnet/datalink/datalink.c b/src/bacnet/datalink/datalink.c index be897456..42fd7638 100644 --- a/src/bacnet/datalink/datalink.c +++ b/src/bacnet/datalink/datalink.c @@ -44,7 +44,7 @@ #include "bacnet/basic/bbmd6/h_bbmd6.h" #include "bacnet/datalink/arcnet.h" #include "bacnet/datalink/dlmstp.h" -#include +#include /* for strcasecmp() */ static enum { DATALINK_NONE = 0, diff --git a/test/bacnet/datalink/mock/src/arcnet-mock.c b/test/bacnet/datalink/mock/src/arcnet-mock.c index 1eceb7d8..2ac79295 100644 --- a/test/bacnet/datalink/mock/src/arcnet-mock.c +++ b/test/bacnet/datalink/mock/src/arcnet-mock.c @@ -32,13 +32,10 @@ int arcnet_send_pdu(BACNET_ADDRESS *dest, BACNET_NPDU_DATA *npdu_data, return ztest_get_return_value(); } -bool check_arcnet_receive_src = true; - uint16_t arcnet_receive(BACNET_ADDRESS *src, uint8_t *pdu, uint16_t max_pdu, unsigned timeout) { - if (check_arcnet_receive_src) - ztest_check_expected_value(src); + ztest_check_expected_value(src); ztest_check_expected_value(timeout); ztest_copy_return_data(pdu, max_pdu); return ztest_get_return_value(); diff --git a/test/bacnet/datalink/mock/src/main.c b/test/bacnet/datalink/mock/src/main.c index 7f370e42..6f17c35d 100644 --- a/test/bacnet/datalink/mock/src/main.c +++ b/test/bacnet/datalink/mock/src/main.c @@ -13,8 +13,6 @@ #include #include "bacnet/apdu.h" -extern bool check_arcnet_receive_src; - void bvlc_maintenance_timer(uint16_t seconds) { ztest_check_expected_value(seconds); @@ -50,7 +48,6 @@ static void test_datalink_arcnet(void) BACNET_ADDRESS addr2 = {0}; BACNET_NPDU_DATA npdu = {0}; - check_arcnet_receive_src = true; zassert_equal(z_cleanup_mock(), 0, NULL); datalink_set("arcnet");