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

Avoid unnecessary type names in return statements

Browse source
This commit is contained in:
Tim Wojtulewicz 2023-07-06 14:07:43 -07:00
parent 4957dace64
commit de13bb6361
12 changed files with 35 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/module_util.cc
View file

@ -39,7 +39,7 @@ string extract_module_name(const char* name)
string::size_type pos = module_name.rfind("::");
if ( pos == string::npos )
return string(GLOBAL_MODULE_NAME);
return GLOBAL_MODULE_NAME;
module_name.erase(pos);
@ -63,7 +63,7 @@ string extract_var_name(const char* name)
return var_name;
if ( pos + 2 > var_name.size() )
return string("");
return "";
return var_name.substr(pos + 2);
}
@ -81,7 +81,7 @@ string normalized_module_name(const char* module_name)
if ( (mod_len = strlen(module_name)) >= 2 && streq(module_name + mod_len - 2, "::") )
mod_len -= 2;
return string(module_name, mod_len);
return {module_name, static_cast<size_t>(mod_len)};
}
TEST_CASE("module_util make_full_var_name")
@ -103,7 +103,7 @@ string make_full_var_name(const char* module_name, const char* var_name)
if ( streq(GLOBAL_MODULE_NAME, extract_module_name(var_name).c_str()) )
return extract_var_name(var_name);
return string(var_name);
return var_name;
}
string full_name = normalized_module_name(module_name);