Use anonymous namespace instead of static in more places

osm2pgsql-dev · Aug 19, 2024 · 0e0590f · 0e0590f
1 parent 6a15ebd
commit 0e0590f
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 6 deletions.
diff --git a/src/gen/osm2pgsql-gen.cpp b/src/gen/osm2pgsql-gen.cpp
@@ -60,7 +60,7 @@
 // context object.
 // NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
 #define TRAMPOLINE(func_name, lua_name)                                        \
-    static int lua_trampoline_##func_name(lua_State *lua_state)                \
+    int lua_trampoline_##func_name(lua_State *lua_state)                       \
     {                                                                          \
         try {                                                                  \
             return static_cast<genproc_t *>(luaX_get_context(lua_state))       \

diff --git a/src/lua-utils.cpp b/src/lua-utils.cpp
@@ -33,8 +33,12 @@ void *luaX_get_context(lua_State *lua_state) noexcept
 
 #else
 
+namespace {
+
 // Unique key for lua registry
-static char const *osm2pgsql_output_flex = "osm2pgsql_output_flex";
+constexpr char const *const osm2pgsql_output_flex = "osm2pgsql_output_flex";
+
+} // anonymous namespace
 
 void luaX_set_context(lua_State *lua_state, void *ptr) noexcept
 {

diff --git a/src/output-flex.cpp b/src/output-flex.cpp
@@ -49,16 +49,18 @@
 #include <string>
 #include <string_view>
 
+namespace {
+
 // Mutex used to coordinate access to Lua code
-static std::mutex lua_mutex;
+std::mutex lua_mutex;
 
 // Lua can't call functions on C++ objects directly. This macro defines simple
 // C "trampoline" functions which are called from Lua which get the current
 // context (the output_flex_t object) and call the respective function on the
 // context object.
 // NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
 #define TRAMPOLINE(func_name, lua_name)                                        \
-    static int lua_trampoline_##func_name(lua_State *lua_state)                \
+    int lua_trampoline_##func_name(lua_State *lua_state)                       \
     {                                                                          \
         try {                                                                  \
             return static_cast<output_flex_t *>(luaX_get_context(lua_state))   \
@@ -98,6 +100,8 @@ TRAMPOLINE(expire_output_schema, schema)
 TRAMPOLINE(expire_output_table, table)
 TRAMPOLINE(expire_output_tostring, __tostring)
 
+} // anonymous namespace
+
 prepared_lua_function_t::prepared_lua_function_t(lua_State *lua_state,
                                                  calling_context context,
                                                  char const *name, int nresults)

diff --git a/src/properties.cpp b/src/properties.cpp
@@ -17,7 +17,11 @@
 #include <cassert>
 #include <cstdlib>
 
-static constexpr char const *const properties_table = "osm2pgsql_properties";
+namespace {
+
+constexpr char const *const properties_table = "osm2pgsql_properties";
+
+} // anonymous namespace
 
 properties_t::properties_t(connection_params_t connection_params,
                            std::string schema)

diff --git a/src/wkb.cpp b/src/wkb.cpp
@@ -576,7 +576,9 @@ geom::geometry_t ewkb_to_geom(std::string_view wkb)
     return geom;
 }
 
-static constexpr std::array<char, 256> const hex_table = {
+namespace {
+
+constexpr std::array<char, 256> const hex_table = {
     0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,
     0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,
     0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,
@@ -587,6 +589,8 @@ static constexpr std::array<char, 256> const hex_table = {
     0, 10, 11, 12,   13, 14, 15, 0,   0, 0, 0, 0,   0, 0, 0, 0,
 };
 
+} // anonymous namespace
+
 unsigned char decode_hex_char(char c) noexcept
 {
     // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-constant-array-index)