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

Reformat the world

Browse source
This commit is contained in:
Tim Wojtulewicz 2021-09-16 15:35:39 -07:00
parent 194cb24547
commit b2f171ec69
714 changed files with 35149 additions and 35203 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/module_util.cc
View file

@ -11,7 +11,8 @@
using namespace std;
namespace zeek::detail {
namespace zeek::detail
{
static int streq(const char* s1, const char* s2)
{
@ -53,7 +54,7 @@ TEST_CASE("module_util extract_var_name")
CHECK(extract_var_name("::var") == "var");
}
string extract_var_name(const char *name)
string extract_var_name(const char* name)
{
string var_name = name;
string::size_type pos = var_name.rfind("::");
@ -64,7 +65,7 @@ string extract_var_name(const char *name)
if ( pos + 2 > var_name.size() )
return string("");
return var_name.substr(pos+2);
return var_name.substr(pos + 2);
}
TEST_CASE("module_util normalized_module_name")
@ -77,8 +78,7 @@ TEST_CASE("module_util normalized_module_name")
string normalized_module_name(const char* module_name)
{
int mod_len;
if ( (mod_len = strlen(module_name)) >= 2 &&
streq(module_name + mod_len - 2, "::") )
if ( (mod_len = strlen(module_name)) >= 2 && streq(module_name + mod_len - 2, "::") )
mod_len -= 2;
return string(module_name, mod_len);
@ -98,8 +98,7 @@ TEST_CASE("module_util make_full_var_name")
string make_full_var_name(const char* module_name, const char* var_name)
{
if ( ! module_name || streq(module_name, GLOBAL_MODULE_NAME) ||
strstr(var_name, "::") )
if ( ! module_name || streq(module_name, GLOBAL_MODULE_NAME) || strstr(var_name, "::") )
{
if ( streq(GLOBAL_MODULE_NAME, extract_module_name(var_name).c_str()) )
return extract_var_name(var_name);
@ -114,4 +113,4 @@ string make_full_var_name(const char* module_name, const char* var_name)
return full_name;
}
} // namespace zeek::detail
} // namespace zeek::detail