From d08f09c1130acc528cf5f417bcf9f9de4dd4b27d Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Tue, 30 Aug 2016 18:12:11 +0000 Subject: Convert some StringExtractor functions to accept MutableArrayRefs. MutableArrayRef is essentially a safer version of passing around (T*, length) pairs and provides some convenient functions for working with the data without having to manually manipulate indices. This is a minor NFC. llvm-svn: 280123 --- lldb/unittests/Utility/StringExtractorTest.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lldb/unittests/Utility/StringExtractorTest.cpp') diff --git a/lldb/unittests/Utility/StringExtractorTest.cpp b/lldb/unittests/Utility/StringExtractorTest.cpp index 5bcf10eb59a..79e6e78d75b 100644 --- a/lldb/unittests/Utility/StringExtractorTest.cpp +++ b/lldb/unittests/Utility/StringExtractorTest.cpp @@ -243,7 +243,7 @@ TEST_F (StringExtractorTest, GetHexBytes) StringExtractor ex(kHexEncodedBytes); uint8_t dst[kValidHexPairs]; - ASSERT_EQ(kValidHexPairs, ex.GetHexBytes (dst, kValidHexPairs, 0xde)); + ASSERT_EQ(kValidHexPairs, ex.GetHexBytes (dst, 0xde)); EXPECT_EQ(0xab,dst[0]); EXPECT_EQ(0xcd,dst[1]); EXPECT_EQ(0xef,dst[2]); @@ -267,7 +267,7 @@ TEST_F (StringExtractorTest, GetHexBytes_Underflow) StringExtractor ex(kHexEncodedBytes); uint8_t dst[12]; - ASSERT_EQ(kValidHexPairs, ex.GetHexBytes (dst, sizeof(dst), 0xde)); + ASSERT_EQ(kValidHexPairs, ex.GetHexBytes (dst, 0xde)); EXPECT_EQ(0xab,dst[0]); EXPECT_EQ(0xcd,dst[1]); EXPECT_EQ(0xef,dst[2]); @@ -297,7 +297,7 @@ TEST_F (StringExtractorTest, GetHexBytes_Partial) uint8_t dst[12]; memset(dst, 0xab, sizeof(dst)); - ASSERT_EQ(kReadBytes, ex.GetHexBytes (dst, kReadBytes, 0xde)); + ASSERT_EQ(kReadBytes, ex.GetHexBytes (llvm::MutableArrayRef(dst, kReadBytes), 0xde)); EXPECT_EQ(0xab,dst[0]); EXPECT_EQ(0xcd,dst[1]); EXPECT_EQ(0xef,dst[2]); @@ -326,7 +326,7 @@ TEST_F (StringExtractorTest, GetHexBytesAvail) StringExtractor ex(kHexEncodedBytes); uint8_t dst[kValidHexPairs]; - ASSERT_EQ(kValidHexPairs, ex.GetHexBytesAvail (dst, kValidHexPairs)); + ASSERT_EQ(kValidHexPairs, ex.GetHexBytesAvail (dst)); EXPECT_EQ(0xab,dst[0]); EXPECT_EQ(0xcd,dst[1]); EXPECT_EQ(0xef,dst[2]); @@ -351,7 +351,7 @@ TEST_F (StringExtractorTest, GetHexBytesAvail_Underflow) uint8_t dst[12]; memset(dst, 0xef, sizeof(dst)); - ASSERT_EQ(kValidHexPairs, ex.GetHexBytesAvail (dst, sizeof(dst))); + ASSERT_EQ(kValidHexPairs, ex.GetHexBytesAvail (dst)); EXPECT_EQ(0xab,dst[0]); EXPECT_EQ(0xcd,dst[1]); EXPECT_EQ(0xef,dst[2]); @@ -381,7 +381,7 @@ TEST_F (StringExtractorTest, GetHexBytesAvail_Partial) uint8_t dst[12]; memset(dst, 0xab, sizeof(dst)); - ASSERT_EQ(kReadBytes, ex.GetHexBytesAvail (dst, kReadBytes)); + ASSERT_EQ(kReadBytes, ex.GetHexBytesAvail (llvm::MutableArrayRef(dst, kReadBytes))); EXPECT_EQ(0xab,dst[0]); EXPECT_EQ(0xcd,dst[1]); EXPECT_EQ(0xef,dst[2]); -- cgit v1.2.3