From 231afab8b0ba6c8c9eff879681c52724b6688c18 Mon Sep 17 00:00:00 2001 From: Peter LaFosse Date: Mon, 3 Dec 2018 22:20:28 -0500 Subject: Commonize all InstructionTextToken generation --- type.cpp | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) (limited to 'type.cpp') diff --git a/type.cpp b/type.cpp index ef9036aa..d7c65897 100644 --- a/type.cpp +++ b/type.cpp @@ -684,14 +684,7 @@ vector Type::GetTokens(Platform* platform, uint8_t baseCon BNInstructionTextToken* tokens = BNGetTypeTokens(m_object, platform ? platform->GetObject() : nullptr, baseConfidence, &count); - vector result; - result.reserve(count); - for (size_t i = 0; i < count; i++) - result.emplace_back(tokens[i].type, tokens[i].context, tokens[i].text, tokens[i].address, tokens[i].value, tokens[i].size, - tokens[i].operand, tokens[i].confidence); - - BNFreeTokenList(tokens, count); - return result; + return InstructionTextToken::ConvertAndFreeInstructionTextTokenList(tokens, count); } @@ -700,15 +693,7 @@ vector Type::GetTokensBeforeName(Platform* platform, uint8 size_t count; BNInstructionTextToken* tokens = BNGetTypeTokensBeforeName(m_object, platform ? platform->GetObject() : nullptr, baseConfidence, &count); - - vector result; - result.reserve(count); - for (size_t i = 0; i < count; i++) - result.emplace_back(tokens[i].type, tokens[i].context, tokens[i].text, tokens[i].address, tokens[i].value, tokens[i].size, - tokens[i].operand, tokens[i].confidence); - - BNFreeTokenList(tokens, count); - return result; + return InstructionTextToken::ConvertAndFreeInstructionTextTokenList(tokens, count); } @@ -718,14 +703,7 @@ vector Type::GetTokensAfterName(Platform* platform, uint8_ BNInstructionTextToken* tokens = BNGetTypeTokensAfterName(m_object, platform ? platform->GetObject() : nullptr, baseConfidence, &count); - vector result; - result.reserve(count); - for (size_t i = 0; i < count; i++) - result.emplace_back(tokens[i].type, tokens[i].context, tokens[i].text, tokens[i].address, tokens[i].value, tokens[i].size, - tokens[i].operand, tokens[i].confidence); - - BNFreeTokenList(tokens, count); - return result; + return InstructionTextToken::ConvertAndFreeInstructionTextTokenList(tokens, count); } -- cgit v1.3.1