From 867d91b5350879d183a6c21024f113febc793624 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Wed, 21 May 2025 10:05:10 -0700
Subject: [PATCH] bifcl: Some other minor cleanup

---
 tools/bifcl/builtin-func.y        |  2 +-
 tools/bifcl/include/bif_arg.h     |  2 +-
 tools/bifcl/include/module_util.h |  2 +-
 tools/bifcl/module_util.cc        | 10 +++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/bifcl/builtin-func.y b/tools/bifcl/builtin-func.y
index 46dd4fb4fa..453b300eb1 100644
--- a/tools/bifcl/builtin-func.y
+++ b/tools/bifcl/builtin-func.y
@@ -37,7 +37,7 @@ string type_name;
 // already been defined/written to the C++ files.
 static std::set<std::string> events;
 
-enum {
+enum : uint8_t {
 	C_SEGMENT_DEF,
 	FUNC_DEF,
 	EVENT_DEF,
diff --git a/tools/bifcl/include/bif_arg.h b/tools/bifcl/include/bif_arg.h
index 7a62d34af8..a9febd013b 100644
--- a/tools/bifcl/include/bif_arg.h
+++ b/tools/bifcl/include/bif_arg.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <cstdio>
 
-enum builtin_func_arg_type {
+enum builtin_func_arg_type : uint8_t {
 #define DEFINE_BIF_TYPE(id, bif_type, bro_type, c_type, c_type_smart, accessor, accessor_smart, cast_smart,            \
                         constructor, ctor_smart)                                                                       \
     id,
diff --git a/tools/bifcl/include/module_util.h b/tools/bifcl/include/module_util.h
index 7b85f81c23..30015e527c 100644
--- a/tools/bifcl/include/module_util.h
+++ b/tools/bifcl/include/module_util.h
@@ -6,7 +6,7 @@
 
 #include <string>
 
-static const char* GLOBAL_MODULE_NAME = "GLOBAL";
+static constexpr const char* GLOBAL_MODULE_NAME = "GLOBAL";
 
 extern std::string extract_module_name(const char* name);
 extern std::string extract_var_name(const char* name);
diff --git a/tools/bifcl/module_util.cc b/tools/bifcl/module_util.cc
index b3997cd1d6..10ee280994 100644
--- a/tools/bifcl/module_util.cc
+++ b/tools/bifcl/module_util.cc
@@ -16,7 +16,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);
 
@@ -31,17 +31,17 @@ 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);
 }
 
 string normalized_module_name(const char* module_name) {
-    int mod_len;
+    size_t mod_len;
     if ( mod_len = strlen(module_name); mod_len >= 2 && streq(module_name + mod_len - 2, "::") )
         mod_len -= 2;
 
-    return string(module_name, mod_len);
+    return {module_name, mod_len};
 }
 
 string make_full_var_name(const char* module_name, const char* var_name) {
@@ -49,7 +49,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);