[utils] remove wrap_string.h (#4483)

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
 

examples/platforms/qpg6095/radio.c

@@ -33,6 +33,9 @@
  */
 
 #include "radio_qorvo.h"
+
+#include <string.h>
+
 #include <common/logging.hpp>
 #include <openthread/platform/diag.h>
 #include <openthread/platform/radio.h>

examples/platforms/utils/settings_flash.c

@@ -37,12 +37,12 @@
 #include <assert.h>
 #include <stddef.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <openthread/instance.h>
 #include <openthread/platform/settings.h>
 
 #include "utils/code_utils.h"
-#include "utils/wrap_string.h"
 
 #include "flash.h"
 

examples/platforms/utils/soft_source_match_table.c

@@ -37,6 +37,7 @@
 #include "utils/soft_source_match_table.h"
 
 #include <stdlib.h>
+#include <string.h>
 
 #include "common/logging.hpp"
 #include "utils/code_utils.h"

src/cli/cli.cpp

@@ -37,7 +37,6 @@
 #include <stdlib.h>
 #include "mac/channel_mask.hpp"
 #include "utils/parse_cmdline.hpp"
-#include "utils/wrap_string.h"
 
 #include <openthread/icmp6.h>
 #include <openthread/link.h>
@@ -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;

src/cli/cli_console.cpp

@@ -36,7 +36,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "utils/wrap_string.h"
 
 #include "cli/cli.hpp"
 #include "common/instance.hpp"

src/cli/cli_dataset.cpp

@@ -35,7 +35,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "utils/wrap_string.h"
 
 #include <openthread/dataset.h>
 #include <openthread/dataset_ftd.h>

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 <openthread/platform/debug_uart.h>

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                             = \

src/core/coap/coap_message.hpp

@@ -36,8 +36,6 @@
 
 #include "openthread-core-config.h"
 
-#include "utils/wrap_string.h"
-
 #include <openthread/coap.h>
 
 #include "common/code_utils.hpp"

src/core/common/debug.hpp

@@ -38,7 +38,6 @@
 
 #include <ctype.h>
 #include <stdio.h>
-#include "utils/wrap_string.h"
 
 #if defined(OPENTHREAD_TARGET_DARWIN) || defined(OPENTHREAD_TARGET_LINUX)
 

src/core/common/logging.hpp

@@ -38,7 +38,6 @@
 
 #include <ctype.h>
 #include <stdio.h>
-#include "utils/wrap_string.h"
 
 #include <openthread/logging.h>
 #include <openthread/platform/logging.h>

src/core/common/message.hpp

@@ -38,8 +38,6 @@
 
 #include <stdint.h>
 
-#include "utils/wrap_string.h"
-
 #include <openthread/message.h>
 #include <openthread/platform/messagepool.h>
 

src/core/common/settings.cpp

@@ -35,8 +35,6 @@
 
 #include <openthread/platform/settings.h>
 
-#include "utils/wrap_string.h"
-
 #include "common/code_utils.hpp"
 #include "common/instance.hpp"
 #include "common/logging.hpp"

src/core/common/string.hpp

@@ -39,7 +39,6 @@
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
-#include "utils/wrap_string.h"
 
 #include <openthread/error.h>
 

src/core/common/tlvs.hpp

@@ -36,8 +36,6 @@
 
 #include "openthread-core-config.h"
 
-#include "utils/wrap_string.h"
-
 #include <openthread/error.h>
 #include <openthread/platform/toolchain.h>
 

src/core/crypto/pbkdf2_cmac.cpp

@@ -33,8 +33,9 @@
 
 #include "pbkdf2_cmac.h"
 
+#include <string.h>
+
 #include "common/debug.hpp"
-#include "utils/wrap_string.h"
 
 #include <mbedtls/cmac.h>
 

src/core/diags/factory_diags.hpp

@@ -36,10 +36,11 @@
 
 #include "openthread-core-config.h"
 
+#include <string.h>
+
 #include <openthread/platform/radio.h>
 
 #include "common/locator.hpp"
-#include "utils/wrap_string.h"
 
 namespace ot {
 namespace FactoryDiags {

src/core/mac/mac.cpp

@@ -34,7 +34,6 @@
 #include "mac.hpp"
 
 #include <stdio.h>
-#include "utils/wrap_string.h"
 
 #include "common/code_utils.hpp"
 #include "common/debug.hpp"

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

src/core/mac/mac_frame.hpp

@@ -39,8 +39,6 @@
 #include <limits.h>
 #include <stdint.h>
 
-#include "utils/wrap_string.h"
-
 #include "common/encoding.hpp"
 #include "mac/mac_types.hpp"
 

src/core/mac/mac_types.cpp

@@ -34,10 +34,10 @@
 #include "mac_types.hpp"
 
 #include <stdio.h>
-#include "utils/wrap_string.h"
 
 #include "common/code_utils.hpp"
 #include "common/random.hpp"
+#include "common/string.hpp"
 
 namespace ot {
 namespace Mac {

src/core/mac/mac_types.hpp

@@ -37,8 +37,7 @@
 #include "openthread-core-config.h"
 
 #include <stdint.h>
-
-#include "utils/wrap_string.h"
+#include <string.h>
 
 #include <openthread/link.h>
 

src/core/meshcop/commissioner.cpp

@@ -34,13 +34,13 @@
 #include "commissioner.hpp"
 
 #include <stdio.h>
-#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"

src/core/meshcop/meshcop_tlvs.hpp

@@ -37,8 +37,6 @@
 
 #include "openthread-core-config.h"
 
-#include "utils/wrap_string.h"
-
 #include <openthread/commissioner.h>
 #include <openthread/dataset.h>
 #include <openthread/platform/radio.h>
@@ -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"

src/core/meshcop/timestamp.cpp

@@ -33,8 +33,6 @@
 
 #include "timestamp.hpp"
 
-#include "utils/wrap_string.h"
-
 namespace ot {
 namespace MeshCoP {
 

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"

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"
 

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"

src/core/net/ip6_address.cpp

@@ -34,7 +34,6 @@
 #include "ip6_address.hpp"
 
 #include <stdio.h>
-#include "utils/wrap_string.h"
 
 #include "common/code_utils.hpp"
 #include "common/encoding.hpp"

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"

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 {
 

src/core/thread/mle_router_ftd.hpp

@@ -36,8 +36,6 @@
 
 #include "openthread-core-config.h"
 
-#include "utils/wrap_string.h"
-
 #include <openthread/thread_ftd.h>
 
 #include "coap/coap.hpp"

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"

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"

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"
 

src/core/thread/network_diagnostic_tlvs.hpp

@@ -36,8 +36,6 @@
 
 #include "openthread-core-config.h"
 
-#include "utils/wrap_string.h"
-
 #include <openthread/thread.h>
 
 #include "common/encoding.hpp"

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"

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 {
 

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 {

src/ncp/spinel_encoder.cpp

@@ -32,8 +32,9 @@
 
 #include "spinel_encoder.hpp"
 
+#include <string.h>
+
 #include "common/code_utils.hpp"
-#include "utils/wrap_string.h"
 
 namespace ot {
 namespace Ncp {

src/ncp/spinel_platform.h

@@ -56,7 +56,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-
-#include "utils/wrap_string.h"
+#include <string.h>
 
 #endif // SPINEL_PLATFORM_OPENTHREAD_H_

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"

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"

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"

tests/unit/test_ip6_address.cpp

@@ -27,7 +27,6 @@
  */
 
 #include "net/ip6_address.hpp"
-#include "utils/wrap_string.h"
 
 #include "test_util.h"
 

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"

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"

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"

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"
 

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"

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"