Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-14 04:28:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

switched CPPCompile::Canonicalize() to take std::string instead of const char*

Browse source
This commit is contained in:
Vern Paxson 2024-11-04 08:22:37 -08:00
parent 84d8e74884
commit 519fec2592
6 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/script_opt/CPP/Vars.cc
View file

@ -129,7 +129,7 @@ static string trim_name(const ID* id) {
return ns;
}
string CPPCompile::LocalName(const ID* l) const { return Canonicalize(trim_name(l).c_str()); }
string CPPCompile::LocalName(const ID* l) const { return Canonicalize(trim_name(l)); }
string CPPCompile::CaptureName(const ID* c) const {
// We want to strip both the module and any inlining appendage.
@ -139,15 +139,13 @@ string CPPCompile::CaptureName(const ID* c) const {
if ( appendage != string::npos )
tn.erase(tn.begin() + appendage, tn.end());
return Canonicalize(tn.c_str());
return Canonicalize(tn);
}
string CPPCompile::Canonicalize(const char* name) const {
string CPPCompile::Canonicalize(const std::string& name) const {
string cname;
for ( int i = 0; name[i]; ++i ) {
auto c = name[i];
for ( auto c : name ) {
// Strip <>'s - these get introduced for lambdas.
if ( c == '<' || c == '>' )
continue;