diff --git a/src/strings.bif b/src/strings.bif index ed574bbea5..118bc82bb0 100644 --- a/src/strings.bif +++ b/src/strings.bif @@ -1247,8 +1247,8 @@ function reverse%(str: string%) : string ## function count_substr%(str: string, sub: string%) : count %{ - string s = str->ToStdString(); - string sub_s = sub->ToStdString(); + auto s = str->ToStdStringView(); + auto sub_s = sub->ToStdStringView(); size_t count = 0; size_t pos = s.find(sub_s); diff --git a/src/zeek.bif b/src/zeek.bif index 8086ffed48..7a62ac933b 100644 --- a/src/zeek.bif +++ b/src/zeek.bif @@ -1986,7 +1986,7 @@ function enum_names%(et: any%): string_set if ( et->GetType()->Tag() == TYPE_STRING ) { - const auto& id = zeek::detail::global_scope()->Find(et->AsStringVal()->ToStdString()); + const auto& id = zeek::detail::global_scope()->Find(et->AsStringVal()->ToStdStringView()); if ( id && id->IsType() ) t = id->GetType(); } @@ -2184,7 +2184,7 @@ function global_options%(%): string_set ## the string ``""`` or ``""`` is returned. function lookup_ID%(id: string%) : any %{ - const auto& i = zeek::detail::global_scope()->Find(id->CheckString()); + const auto& i = zeek::detail::global_scope()->Find(id->ToStdStringView()); if ( ! i ) return zeek::make_intrusive(""); @@ -2214,7 +2214,7 @@ function record_fields%(rec: any%): record_field_table if ( rec->GetType()->Tag() == zeek::TYPE_STRING ) { - const auto& id = zeek::detail::global_scope()->Find(rec->AsStringVal()->ToStdString()); + const auto& id = zeek::detail::global_scope()->Find(rec->AsStringVal()->ToStdStringView()); if ( ! id || ! id->IsType() || id->GetType()->Tag() != zeek::TYPE_RECORD ) { @@ -5106,7 +5106,7 @@ function from_json%(s: string, t: any, key_func: string_mapper &default=from_jso ## Returns: a compressed version of the input path. function compress_path%(dir: string%): string %{ - return zeek::make_intrusive(zeek::util::detail::normalize_path(dir->ToStdString())); + return zeek::make_intrusive(zeek::util::detail::normalize_path(dir->ToStdStringView())); %} ## Returns true if the given tag belongs to a protocol analyzer.