Move BroSubstring to zeek::detail, rename to Substring

This commit is contained in:
Tim Wojtulewicz 2020-07-19 20:38:00 -07:00 committed by Tim Wojtulewicz
parent c7dc7fc955
commit 55d699af59
3 changed files with 74 additions and 58 deletions

View file

@ -681,12 +681,12 @@ function string_to_ascii_hex%(s: string%): string
## Returns: The result of the Smith-Waterman algorithm calculation.
function str_smith_waterman%(s1: string, s2: string, params: sw_params%) : sw_substring_vec
%{
SWParams sw_params(params->AsRecordVal()->GetField(0)->AsCount(),
SWVariant(params->AsRecordVal()->GetField(1)->AsCount()));
zeek::detail::SWParams sw_params(
params->AsRecordVal()->GetField(0)->AsCount(),
zeek::detail::SWVariant(params->AsRecordVal()->GetField(1)->AsCount()));
BroSubstring::Vec* subseq =
smith_waterman(s1->AsString(), s2->AsString(), sw_params);
auto result = zeek::VectorValPtr{zeek::AdoptRef{}, BroSubstring::VecToPolicy(subseq)};
auto* subseq = zeek::detail::smith_waterman(s1->AsString(), s2->AsString(), sw_params);
auto result = zeek::VectorValPtr{zeek::AdoptRef{}, zeek::detail::Substring::VecToPolicy(subseq)};
delete_each(subseq);
delete subseq;