diff --git a/examples/platforms/cc2538/flash.c b/examples/platforms/cc2538/flash.c index a57fa4776..7454047d8 100644 --- a/examples/platforms/cc2538/flash.c +++ b/examples/platforms/cc2538/flash.c @@ -40,7 +40,6 @@ #include "rom-utility.h" #include "utils/code_utils.h" #include "utils/flash.h" -#include "utils/wrap_string.h" #define FLASH_CTRL_FCTL_BUSY 0x00000080 diff --git a/examples/platforms/qpg6095/radio.c b/examples/platforms/qpg6095/radio.c index 6e8fee14a..61a82a2ac 100644 --- a/examples/platforms/qpg6095/radio.c +++ b/examples/platforms/qpg6095/radio.c @@ -33,6 +33,9 @@ */ #include "radio_qorvo.h" + +#include + #include #include #include diff --git a/examples/platforms/utils/settings_flash.c b/examples/platforms/utils/settings_flash.c index b3a41a8f0..a75ea0771 100644 --- a/examples/platforms/utils/settings_flash.c +++ b/examples/platforms/utils/settings_flash.c @@ -37,12 +37,12 @@ #include #include #include +#include #include #include #include "utils/code_utils.h" -#include "utils/wrap_string.h" #include "flash.h" diff --git a/examples/platforms/utils/soft_source_match_table.c b/examples/platforms/utils/soft_source_match_table.c index 65fa372a9..67fbdcad7 100644 --- a/examples/platforms/utils/soft_source_match_table.c +++ b/examples/platforms/utils/soft_source_match_table.c @@ -37,6 +37,7 @@ #include "utils/soft_source_match_table.h" #include +#include #include "common/logging.hpp" #include "utils/code_utils.h" diff --git a/src/cli/cli.cpp b/src/cli/cli.cpp index 4d770161b..d446bc35d 100644 --- a/src/cli/cli.cpp +++ b/src/cli/cli.cpp @@ -37,7 +37,6 @@ #include #include "mac/channel_mask.hpp" #include "utils/parse_cmdline.hpp" -#include "utils/wrap_string.h" #include #include @@ -83,6 +82,7 @@ #include "cli_server.hpp" #include "common/encoding.hpp" +#include "common/string.hpp" using ot::Encoding::BigEndian::HostSwap16; using ot::Encoding::BigEndian::HostSwap32; diff --git a/src/cli/cli_console.cpp b/src/cli/cli_console.cpp index ab626b5e4..e2da74ad8 100644 --- a/src/cli/cli_console.cpp +++ b/src/cli/cli_console.cpp @@ -36,7 +36,6 @@ #include #include #include -#include "utils/wrap_string.h" #include "cli/cli.hpp" #include "common/instance.hpp" diff --git a/src/cli/cli_dataset.cpp b/src/cli/cli_dataset.cpp index c497a207a..36bf1348d 100644 --- a/src/cli/cli_dataset.cpp +++ b/src/cli/cli_dataset.cpp @@ -35,7 +35,6 @@ #include #include -#include "utils/wrap_string.h" #include #include diff --git a/src/cli/cli_uart.cpp b/src/cli/cli_uart.cpp index b4bdc0b2c..a2bf5bf1f 100644 --- a/src/cli/cli_uart.cpp +++ b/src/cli/cli_uart.cpp @@ -48,7 +48,6 @@ #include "common/new.hpp" #include "common/tasklet.hpp" #include "utils/static_assert.hpp" -#include "utils/wrap_string.h" #if OPENTHREAD_CONFIG_ENABLE_DEBUG_UART #include diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 81f0c9a2e..9a493aec7 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -441,7 +441,6 @@ HEADERS_COMMON = \ utils/parse_cmdline.hpp \ utils/slaac_address.hpp \ utils/static_assert.hpp \ - utils/wrap_string.h \ $(NULL) noinst_HEADERS = \ diff --git a/src/core/coap/coap_message.hpp b/src/core/coap/coap_message.hpp index 7446b2fc3..f34310086 100644 --- a/src/core/coap/coap_message.hpp +++ b/src/core/coap/coap_message.hpp @@ -36,8 +36,6 @@ #include "openthread-core-config.h" -#include "utils/wrap_string.h" - #include #include "common/code_utils.hpp" diff --git a/src/core/common/debug.hpp b/src/core/common/debug.hpp index 387c6fd95..1c3f3d477 100644 --- a/src/core/common/debug.hpp +++ b/src/core/common/debug.hpp @@ -38,7 +38,6 @@ #include #include -#include "utils/wrap_string.h" #if defined(OPENTHREAD_TARGET_DARWIN) || defined(OPENTHREAD_TARGET_LINUX) diff --git a/src/core/common/logging.hpp b/src/core/common/logging.hpp index ed0e3bf1b..d5d886c67 100644 --- a/src/core/common/logging.hpp +++ b/src/core/common/logging.hpp @@ -38,7 +38,6 @@ #include #include -#include "utils/wrap_string.h" #include #include diff --git a/src/core/common/message.hpp b/src/core/common/message.hpp index 837f29c81..97f7c9809 100644 --- a/src/core/common/message.hpp +++ b/src/core/common/message.hpp @@ -38,8 +38,6 @@ #include -#include "utils/wrap_string.h" - #include #include diff --git a/src/core/common/settings.cpp b/src/core/common/settings.cpp index 473cdc4d7..9956d918f 100644 --- a/src/core/common/settings.cpp +++ b/src/core/common/settings.cpp @@ -35,8 +35,6 @@ #include -#include "utils/wrap_string.h" - #include "common/code_utils.hpp" #include "common/instance.hpp" #include "common/logging.hpp" diff --git a/src/core/common/string.hpp b/src/core/common/string.hpp index 0db897f60..b7619bfaa 100644 --- a/src/core/common/string.hpp +++ b/src/core/common/string.hpp @@ -39,7 +39,6 @@ #include #include #include -#include "utils/wrap_string.h" #include diff --git a/src/core/common/tlvs.hpp b/src/core/common/tlvs.hpp index 1bfa330f1..093192909 100644 --- a/src/core/common/tlvs.hpp +++ b/src/core/common/tlvs.hpp @@ -36,8 +36,6 @@ #include "openthread-core-config.h" -#include "utils/wrap_string.h" - #include #include diff --git a/src/core/crypto/pbkdf2_cmac.cpp b/src/core/crypto/pbkdf2_cmac.cpp index 992cbf85d..ef14ee189 100644 --- a/src/core/crypto/pbkdf2_cmac.cpp +++ b/src/core/crypto/pbkdf2_cmac.cpp @@ -33,8 +33,9 @@ #include "pbkdf2_cmac.h" +#include + #include "common/debug.hpp" -#include "utils/wrap_string.h" #include diff --git a/src/core/diags/factory_diags.hpp b/src/core/diags/factory_diags.hpp index 49f0a7ef8..56c31128a 100644 --- a/src/core/diags/factory_diags.hpp +++ b/src/core/diags/factory_diags.hpp @@ -36,10 +36,11 @@ #include "openthread-core-config.h" +#include + #include #include "common/locator.hpp" -#include "utils/wrap_string.h" namespace ot { namespace FactoryDiags { diff --git a/src/core/mac/mac.cpp b/src/core/mac/mac.cpp index 5e6588808..ebc68f92f 100644 --- a/src/core/mac/mac.cpp +++ b/src/core/mac/mac.cpp @@ -34,7 +34,6 @@ #include "mac.hpp" #include -#include "utils/wrap_string.h" #include "common/code_utils.hpp" #include "common/debug.hpp" diff --git a/src/core/mac/mac_filter.cpp b/src/core/mac/mac_filter.cpp index 8c0262474..82703c3c4 100644 --- a/src/core/mac/mac_filter.cpp +++ b/src/core/mac/mac_filter.cpp @@ -33,8 +33,6 @@ #include "mac_filter.hpp" -#include "utils/wrap_string.h" - #include "common/code_utils.hpp" #if OPENTHREAD_CONFIG_MAC_FILTER_ENABLE diff --git a/src/core/mac/mac_frame.hpp b/src/core/mac/mac_frame.hpp index 5259dc14d..3be2c3f67 100644 --- a/src/core/mac/mac_frame.hpp +++ b/src/core/mac/mac_frame.hpp @@ -39,8 +39,6 @@ #include #include -#include "utils/wrap_string.h" - #include "common/encoding.hpp" #include "mac/mac_types.hpp" diff --git a/src/core/mac/mac_types.cpp b/src/core/mac/mac_types.cpp index 643a2cc41..c2ef35259 100644 --- a/src/core/mac/mac_types.cpp +++ b/src/core/mac/mac_types.cpp @@ -34,10 +34,10 @@ #include "mac_types.hpp" #include -#include "utils/wrap_string.h" #include "common/code_utils.hpp" #include "common/random.hpp" +#include "common/string.hpp" namespace ot { namespace Mac { diff --git a/src/core/mac/mac_types.hpp b/src/core/mac/mac_types.hpp index 6be11de13..cc6ed17ba 100644 --- a/src/core/mac/mac_types.hpp +++ b/src/core/mac/mac_types.hpp @@ -37,8 +37,7 @@ #include "openthread-core-config.h" #include - -#include "utils/wrap_string.h" +#include #include diff --git a/src/core/meshcop/commissioner.cpp b/src/core/meshcop/commissioner.cpp index 46dc70887..06578bd74 100644 --- a/src/core/meshcop/commissioner.cpp +++ b/src/core/meshcop/commissioner.cpp @@ -34,13 +34,13 @@ #include "commissioner.hpp" #include -#include "utils/wrap_string.h" #include "coap/coap_message.hpp" #include "common/encoding.hpp" #include "common/instance.hpp" #include "common/locator-getters.hpp" #include "common/logging.hpp" +#include "common/string.hpp" #include "crypto/pbkdf2_cmac.h" #include "meshcop/joiner_router.hpp" #include "meshcop/meshcop.hpp" diff --git a/src/core/meshcop/meshcop_tlvs.hpp b/src/core/meshcop/meshcop_tlvs.hpp index 1e137e8ef..eb7c53a12 100644 --- a/src/core/meshcop/meshcop_tlvs.hpp +++ b/src/core/meshcop/meshcop_tlvs.hpp @@ -37,8 +37,6 @@ #include "openthread-core-config.h" -#include "utils/wrap_string.h" - #include #include #include @@ -46,6 +44,7 @@ #include "common/crc16.hpp" #include "common/encoding.hpp" #include "common/message.hpp" +#include "common/string.hpp" #include "common/tlvs.hpp" #include "mac/mac_types.hpp" #include "meshcop/timestamp.hpp" diff --git a/src/core/meshcop/timestamp.cpp b/src/core/meshcop/timestamp.cpp index 77fc9899f..47eef7537 100644 --- a/src/core/meshcop/timestamp.cpp +++ b/src/core/meshcop/timestamp.cpp @@ -33,8 +33,6 @@ #include "timestamp.hpp" -#include "utils/wrap_string.h" - namespace ot { namespace MeshCoP { diff --git a/src/core/net/dns_client.cpp b/src/core/net/dns_client.cpp index 60d6860ae..bb928ed80 100644 --- a/src/core/net/dns_client.cpp +++ b/src/core/net/dns_client.cpp @@ -28,8 +28,6 @@ #include "dns_client.hpp" -#include "utils/wrap_string.h" - #include "common/code_utils.hpp" #include "common/debug.hpp" #include "common/instance.hpp" diff --git a/src/core/net/dns_headers.hpp b/src/core/net/dns_headers.hpp index 6d863b9c4..2c0128e5f 100644 --- a/src/core/net/dns_headers.hpp +++ b/src/core/net/dns_headers.hpp @@ -36,8 +36,6 @@ #include "openthread-core-config.h" -#include "utils/wrap_string.h" - #include "common/encoding.hpp" #include "common/message.hpp" diff --git a/src/core/net/icmp6.cpp b/src/core/net/icmp6.cpp index 9d9b48b9d..754000b5d 100644 --- a/src/core/net/icmp6.cpp +++ b/src/core/net/icmp6.cpp @@ -33,8 +33,6 @@ #include "icmp6.hpp" -#include "utils/wrap_string.h" - #include "common/code_utils.hpp" #include "common/debug.hpp" #include "common/instance.hpp" diff --git a/src/core/net/ip6_address.cpp b/src/core/net/ip6_address.cpp index bd9450430..4af51237e 100644 --- a/src/core/net/ip6_address.cpp +++ b/src/core/net/ip6_address.cpp @@ -34,7 +34,6 @@ #include "ip6_address.hpp" #include -#include "utils/wrap_string.h" #include "common/code_utils.hpp" #include "common/encoding.hpp" diff --git a/src/core/net/sntp_client.cpp b/src/core/net/sntp_client.cpp index d42bc96f5..0376f0b46 100644 --- a/src/core/net/sntp_client.cpp +++ b/src/core/net/sntp_client.cpp @@ -28,8 +28,6 @@ #include "sntp_client.hpp" -#include "utils/wrap_string.h" - #include "common/code_utils.hpp" #include "common/debug.hpp" #include "common/instance.hpp" diff --git a/src/core/thread/link_quality.cpp b/src/core/thread/link_quality.cpp index bec2727c5..90f246fa4 100644 --- a/src/core/thread/link_quality.cpp +++ b/src/core/thread/link_quality.cpp @@ -37,7 +37,6 @@ #include "common/code_utils.hpp" #include "common/instance.hpp" -#include "utils/wrap_string.h" namespace ot { diff --git a/src/core/thread/mle_router_ftd.hpp b/src/core/thread/mle_router_ftd.hpp index e2e9d9680..bc10717fd 100644 --- a/src/core/thread/mle_router_ftd.hpp +++ b/src/core/thread/mle_router_ftd.hpp @@ -36,8 +36,6 @@ #include "openthread-core-config.h" -#include "utils/wrap_string.h" - #include #include "coap/coap.hpp" diff --git a/src/core/thread/mle_router_mtd.hpp b/src/core/thread/mle_router_mtd.hpp index 7c22e561d..d0df82685 100644 --- a/src/core/thread/mle_router_mtd.hpp +++ b/src/core/thread/mle_router_mtd.hpp @@ -36,8 +36,6 @@ #include "openthread-core-config.h" -#include "utils/wrap_string.h" - #include "thread/child_table.hpp" #include "thread/mle.hpp" #include "thread/mle_tlvs.hpp" diff --git a/src/core/thread/mle_tlvs.hpp b/src/core/thread/mle_tlvs.hpp index b69d985e3..102657e06 100644 --- a/src/core/thread/mle_tlvs.hpp +++ b/src/core/thread/mle_tlvs.hpp @@ -36,8 +36,6 @@ #include "openthread-core-config.h" -#include "utils/wrap_string.h" - #include "common/encoding.hpp" #include "common/message.hpp" #include "common/tlvs.hpp" diff --git a/src/core/thread/network_data_tlvs.hpp b/src/core/thread/network_data_tlvs.hpp index 82067225d..7df17a6a8 100644 --- a/src/core/thread/network_data_tlvs.hpp +++ b/src/core/thread/network_data_tlvs.hpp @@ -36,8 +36,6 @@ #include "openthread-core-config.h" -#include "utils/wrap_string.h" - #include "common/encoding.hpp" #include "net/ip6_address.hpp" diff --git a/src/core/thread/network_diagnostic_tlvs.hpp b/src/core/thread/network_diagnostic_tlvs.hpp index 773b3027a..1dc0bcc89 100644 --- a/src/core/thread/network_diagnostic_tlvs.hpp +++ b/src/core/thread/network_diagnostic_tlvs.hpp @@ -36,8 +36,6 @@ #include "openthread-core-config.h" -#include "utils/wrap_string.h" - #include #include "common/encoding.hpp" diff --git a/src/core/utils/slaac_address.cpp b/src/core/utils/slaac_address.cpp index a2d94d3c7..e86a115ba 100644 --- a/src/core/utils/slaac_address.cpp +++ b/src/core/utils/slaac_address.cpp @@ -33,8 +33,6 @@ #include "slaac_address.hpp" -#include "utils/wrap_string.h" - #include "common/code_utils.hpp" #include "common/instance.hpp" #include "common/locator-getters.hpp" diff --git a/src/ncp/hdlc.hpp b/src/ncp/hdlc.hpp index c1f03c2aa..9e88af2b7 100644 --- a/src/ncp/hdlc.hpp +++ b/src/ncp/hdlc.hpp @@ -42,7 +42,6 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" #include "common/encoding.hpp" -#include "utils/wrap_string.h" namespace ot { diff --git a/src/ncp/ncp_buffer.cpp b/src/ncp/ncp_buffer.cpp index 6cd22fe7f..2a63f5bd4 100644 --- a/src/ncp/ncp_buffer.cpp +++ b/src/ncp/ncp_buffer.cpp @@ -34,7 +34,6 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "utils/wrap_string.h" namespace ot { namespace Ncp { diff --git a/src/ncp/spinel_encoder.cpp b/src/ncp/spinel_encoder.cpp index 75657aa59..332a04b57 100644 --- a/src/ncp/spinel_encoder.cpp +++ b/src/ncp/spinel_encoder.cpp @@ -32,8 +32,9 @@ #include "spinel_encoder.hpp" +#include + #include "common/code_utils.hpp" -#include "utils/wrap_string.h" namespace ot { namespace Ncp { diff --git a/src/ncp/spinel_platform.h b/src/ncp/spinel_platform.h index a791c8998..d0263cb31 100644 --- a/src/ncp/spinel_platform.h +++ b/src/ncp/spinel_platform.h @@ -56,7 +56,6 @@ #include #include #include - -#include "utils/wrap_string.h" +#include #endif // SPINEL_PLATFORM_OPENTHREAD_H_ diff --git a/tests/unit/test_aes.cpp b/tests/unit/test_aes.cpp index 61e856de5..b8027af6c 100644 --- a/tests/unit/test_aes.cpp +++ b/tests/unit/test_aes.cpp @@ -30,7 +30,6 @@ #include "common/debug.hpp" #include "crypto/aes_ccm.hpp" -#include "utils/wrap_string.h" #include "test_platform.h" #include "test_util.h" diff --git a/tests/unit/test_heap.cpp b/tests/unit/test_heap.cpp index a97d08922..f95a6b2fe 100644 --- a/tests/unit/test_heap.cpp +++ b/tests/unit/test_heap.cpp @@ -34,7 +34,6 @@ #include "common/debug.hpp" #include "crypto/aes_ccm.hpp" -#include "utils/wrap_string.h" #include "test_platform.h" #include "test_util.h" diff --git a/tests/unit/test_hmac_sha256.cpp b/tests/unit/test_hmac_sha256.cpp index fde654c41..35fcb58a5 100644 --- a/tests/unit/test_hmac_sha256.cpp +++ b/tests/unit/test_hmac_sha256.cpp @@ -30,7 +30,6 @@ #include "common/debug.hpp" #include "crypto/hmac_sha256.hpp" -#include "utils/wrap_string.h" #include "test_platform.h" #include "test_util.h" diff --git a/tests/unit/test_ip6_address.cpp b/tests/unit/test_ip6_address.cpp index 81340e827..ffbf8548d 100644 --- a/tests/unit/test_ip6_address.cpp +++ b/tests/unit/test_ip6_address.cpp @@ -27,7 +27,6 @@ */ #include "net/ip6_address.hpp" -#include "utils/wrap_string.h" #include "test_util.h" diff --git a/tests/unit/test_link_quality.cpp b/tests/unit/test_link_quality.cpp index d86a0fd0a..f352f2c15 100644 --- a/tests/unit/test_link_quality.cpp +++ b/tests/unit/test_link_quality.cpp @@ -28,7 +28,6 @@ #include "common/code_utils.hpp" #include "thread/link_quality.hpp" -#include "utils/wrap_string.h" #include "test_platform.h" #include "test_util.h" diff --git a/tests/unit/test_mac_frame.cpp b/tests/unit/test_mac_frame.cpp index d55fcd148..e573645c2 100644 --- a/tests/unit/test_mac_frame.cpp +++ b/tests/unit/test_mac_frame.cpp @@ -31,7 +31,6 @@ #include "mac/mac.hpp" #include "mac/mac_frame.hpp" #include "radio/radio.hpp" -#include "utils/wrap_string.h" #include "test_platform.h" #include "test_util.h" diff --git a/tests/unit/test_message.cpp b/tests/unit/test_message.cpp index f078eaaec..80cf7d8bf 100644 --- a/tests/unit/test_message.cpp +++ b/tests/unit/test_message.cpp @@ -29,7 +29,6 @@ #include "common/debug.hpp" #include "common/instance.hpp" #include "common/message.hpp" -#include "utils/wrap_string.h" #include "test_platform.h" #include "test_util.h" diff --git a/tests/unit/test_message_queue.cpp b/tests/unit/test_message_queue.cpp index 0f4dece11..911b07c5a 100644 --- a/tests/unit/test_message_queue.cpp +++ b/tests/unit/test_message_queue.cpp @@ -35,7 +35,6 @@ #include "common/debug.hpp" #include "common/instance.hpp" #include "common/message.hpp" -#include "utils/wrap_string.h" #include "test_util.h" diff --git a/tests/unit/test_priority_queue.cpp b/tests/unit/test_priority_queue.cpp index 1568df37c..914db28e4 100644 --- a/tests/unit/test_priority_queue.cpp +++ b/tests/unit/test_priority_queue.cpp @@ -31,7 +31,6 @@ #include "common/debug.hpp" #include "common/instance.hpp" #include "common/message.hpp" -#include "utils/wrap_string.h" #include "test_platform.h" #include "test_util.h" diff --git a/tests/unit/test_pskc.cpp b/tests/unit/test_pskc.cpp index bc0d3cb43..e80d0cdb3 100644 --- a/tests/unit/test_pskc.cpp +++ b/tests/unit/test_pskc.cpp @@ -29,7 +29,6 @@ #include "common/logging.hpp" #include "meshcop/commissioner.hpp" -#include "utils/wrap_string.h" #include "test_platform.h" #include "test_util.h"