Use UPPERCASE for string constants

Author: joto

src/lua-utils.cpp

@@ -36,23 +36,23 @@ void *luaX_get_context(lua_State *lua_state) noexcept
 namespace {
 
 // Unique key for lua registry
-constexpr char const *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
 {
     assert(lua_state);
     assert(ptr);
-    lua_pushlightuserdata(lua_state, (void *)osm2pgsql_output_flex);
+    lua_pushlightuserdata(lua_state, (void *)OSM2PGSQL_OUTPUT_FLEX);
     lua_pushlightuserdata(lua_state, ptr);
     lua_settable(lua_state, LUA_REGISTRYINDEX);
 }
 
 void *luaX_get_context(lua_State *lua_state) noexcept
 {
     assert(lua_state);
-    lua_pushlightuserdata(lua_state, (void *)osm2pgsql_output_flex);
+    lua_pushlightuserdata(lua_state, (void *)OSM2PGSQL_OUTPUT_FLEX);
     lua_gettable(lua_state, LUA_REGISTRYINDEX);
     auto *const ptr = lua_touserdata(lua_state, -1);
     assert(ptr);

src/properties.cpp

@@ -19,18 +19,18 @@
 
 namespace {
 
-constexpr char const *const properties_table = "osm2pgsql_properties";
+constexpr char const *const PROPERTIES_TABLE = "osm2pgsql_properties";
 
 } // anonymous namespace
 
 properties_t::properties_t(connection_params_t connection_params,
                            std::string schema)
 : m_connection_params(std::move(connection_params)),
   m_schema(std::move(schema)),
-  m_has_properties_table(has_table(m_schema, properties_table))
+  m_has_properties_table(has_table(m_schema, PROPERTIES_TABLE))
 {
     assert(!m_schema.empty());
-    log_debug("Found properties table '{}': {}.", properties_table,
+    log_debug("Found properties table '{}': {}.", PROPERTIES_TABLE,
               m_has_properties_table);
 }
 
@@ -159,5 +159,5 @@ bool properties_t::load()
 
 std::string properties_t::table_name() const
 {
-    return qualified_name(m_schema, properties_table);
+    return qualified_name(m_schema, PROPERTIES_TABLE);
 }

src/tagtransform-lua.cpp

@@ -24,10 +24,10 @@ lua_tagtransform_t::lua_tagtransform_t(std::string const *tag_transform_script,
                         lua_tostring(lua_state(), -1));
     }
 
-    check_lua_function_exists(node_func);
-    check_lua_function_exists(way_func);
-    check_lua_function_exists(rel_func);
-    check_lua_function_exists(rel_mem_func);
+    check_lua_function_exists(NODE_FUNC);
+    check_lua_function_exists(WAY_FUNC);
+    check_lua_function_exists(REL_FUNC);
+    check_lua_function_exists(REL_MEM_FUNC);
 }
 
 std::unique_ptr<tagtransform_t> lua_tagtransform_t::clone() const
@@ -86,13 +86,13 @@ bool lua_tagtransform_t::filter_tags(osmium::OSMObject const &o, bool *polygon,
 {
     switch (o.type()) {
     case osmium::item_type::node:
-        lua_getglobal(lua_state(), node_func);
+        lua_getglobal(lua_state(), NODE_FUNC);
         break;
     case osmium::item_type::way:
-        lua_getglobal(lua_state(), way_func);
+        lua_getglobal(lua_state(), WAY_FUNC);
         break;
     case osmium::item_type::relation:
-        lua_getglobal(lua_state(), rel_func);
+        lua_getglobal(lua_state(), REL_FUNC);
         break;
     default:
         throw std::runtime_error{"Unknown OSM type."};
@@ -153,7 +153,7 @@ bool lua_tagtransform_t::filter_rel_member_tags(
     bool *roads, taglist_t *out_tags)
 {
     size_t const num_members = member_roles.size();
-    lua_getglobal(lua_state(), rel_mem_func);
+    lua_getglobal(lua_state(), REL_MEM_FUNC);
 
     lua_newtable(lua_state()); /* relations key value table */
 

src/tagtransform-lua.hpp

@@ -36,10 +36,10 @@ class lua_tagtransform_t : public tagtransform_t
                                 bool *roads, taglist_t *out_tags) override;
 
 private:
-    constexpr static char const *const node_func = "filter_tags_node";
-    constexpr static char const *const way_func = "filter_tags_way";
-    constexpr static char const *const rel_func = "filter_basic_tags_rel";
-    constexpr static char const *const rel_mem_func =
+    constexpr static char const *const NODE_FUNC = "filter_tags_node";
+    constexpr static char const *const WAY_FUNC = "filter_tags_way";
+    constexpr static char const *const REL_FUNC = "filter_basic_tags_rel";
+    constexpr static char const *const REL_MEM_FUNC =
         "filter_tags_relation_member";
 
     void check_lua_function_exists(char const *func_name);