Skip to content

Commit

Permalink
Use anonymous namespaces instead of declaring static functions
Browse files Browse the repository at this point in the history 
This is recommended in C++ Core Guidelines SF.22
https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Rs-unnamed2
  • Loading branch information
@joto
joto committed Jun 16, 2024
1 parent 03eedd4 commit eee1cd5
Show file tree
Hide file tree
Showing 31 changed files with 683 additions and 554 deletions.
53 changes: 30 additions & 23 deletions src/command-line-parser.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
#include <thread> // for number of threads
#include <vector>

static osmium::Box parse_bbox_param(std::string const &arg)
namespace {

osmium::Box parse_bbox_param(std::string const &arg)
{
double minx = NAN;
double maxx = NAN;
Expand Down Expand Up @@ -61,9 +63,8 @@ static osmium::Box parse_bbox_param(std::string const &arg)
return osmium::Box{minx, miny, maxx, maxy};
}

static void parse_expire_tiles_param(char const *arg,
uint32_t *expire_tiles_zoom_min,
uint32_t *expire_tiles_zoom)
void parse_expire_tiles_param(char const *arg, uint32_t *expire_tiles_zoom_min,
uint32_t *expire_tiles_zoom)
{
if (!arg || arg[0] == '-') {
throw std::runtime_error{"Missing argument for option --expire-tiles."
Expand Down Expand Up @@ -110,20 +111,7 @@ static void parse_expire_tiles_param(char const *arg,
" tile expiry must be separated by '-'."};
}

void print_version()
{
fmt::print(stderr, "Build: {}\n", get_build_type());
fmt::print(stderr, "Compiled using the following library versions:\n");
fmt::print(stderr, "Libosmium {}\n", LIBOSMIUM_VERSION_STRING);
fmt::print(stderr, "Proj {}\n", get_proj_version());
#ifdef HAVE_LUAJIT
fmt::print(stderr, "{} ({})\n", LUA_RELEASE, LUAJIT_VERSION);
#else
fmt::print(stderr, "{}\n", LUA_RELEASE);
#endif
}

static void check_options_non_slim(CLI::App const &app)
void check_options_non_slim(CLI::App const &app)
{
std::vector<std::string> const slim_options = {
"--flat-nodes", "--middle-schema",
Expand All @@ -138,7 +126,7 @@ static void check_options_non_slim(CLI::App const &app)
}
}

static void check_options_output_flex(CLI::App const &app)
void check_options_output_flex(CLI::App const &app)
{
auto const ignored_options = app.get_options([](CLI::Option const *option) {
return option->get_group() == "Pgsql output options" ||
Expand All @@ -154,7 +142,7 @@ static void check_options_output_flex(CLI::App const &app)
}
}

static void check_options_output_null(CLI::App const &app)
void check_options_output_null(CLI::App const &app)
{
auto const ignored_options = app.get_options([](CLI::Option const *option) {
return option->get_group() == "Pgsql output options" ||
Expand All @@ -172,7 +160,7 @@ static void check_options_output_null(CLI::App const &app)
}
}

static void check_options_output_pgsql(CLI::App const &app, options_t *options)
void check_options_output_pgsql(CLI::App const &app, options_t *options)
{
if (app.count("--latlong") + app.count("--merc") + app.count("--proj") >
1) {
Expand All @@ -196,7 +184,7 @@ static void check_options_output_pgsql(CLI::App const &app, options_t *options)
}
}

static void check_options(options_t *options)
void check_options(options_t *options)
{
if (options->append && !options->slim) {
throw std::runtime_error{"--append can only be used with slim mode!"};
Expand All @@ -223,7 +211,7 @@ static void check_options(options_t *options)
}
}

static void check_options_expire(options_t *options) {
void check_options_expire(options_t *options) {
// Zoom level 31 is the technical limit because we use 32-bit integers for
// the x and y index of a tile ID.
if (options->expire_tiles_zoom_min > 31) {
Expand All @@ -246,6 +234,25 @@ static void check_options_expire(options_t *options) {
}
}

} // anonymous namespace

void print_version()
{
fmt::print(stderr, "Build: {}\n", get_build_type());
fmt::print(stderr, "Compiled using the following library versions:\n");
fmt::print(stderr, "Libosmium {}\n", LIBOSMIUM_VERSION_STRING);
fmt::print(stderr, "Proj {}\n", get_proj_version());
#ifdef HAVE_LUA
#ifdef HAVE_LUAJIT
fmt::print(stderr, "{} ({})\n", LUA_RELEASE, LUAJIT_VERSION);
#else
fmt::print(stderr, "{}\n", LUA_RELEASE);
#endif
#else
fmt::print(stderr, "Lua support not included\n");
#endif
}

// NOLINTNEXTLINE(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
options_t parse_command_line(int argc, char *argv[])
{
Expand Down
6 changes: 5 additions & 1 deletion src/flex-lua-expire-output.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@

#include <lua.hpp>

static expire_output_t &
namespace {

expire_output_t &
create_expire_output(lua_State *lua_state, std::string const &default_schema,
std::vector<expire_output_t> *expire_outputs)
{
Expand Down Expand Up @@ -65,6 +67,8 @@ create_expire_output(lua_State *lua_state, std::string const &default_schema,
return new_expire_output;
}

} // anonymous namespace

int setup_flex_expire_output(lua_State *lua_state,
std::string const &default_schema,
std::vector<expire_output_t> *expire_outputs)
Expand Down
36 changes: 20 additions & 16 deletions src/flex-lua-geom.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,12 @@ int geom_gc(lua_State *lua_state) noexcept
return 0;
}

namespace {

// The following functions are called when their counterparts in Lua are
// called on geometry objects.

static int geom_area(lua_State *lua_state)
int geom_area(lua_State *lua_state)
{
auto const *const input_geometry = unpack_geometry(lua_state);

Expand All @@ -66,7 +68,7 @@ static int geom_area(lua_State *lua_state)
return 1;
}

static int geom_spherical_area(lua_State *lua_state)
int geom_spherical_area(lua_State *lua_state)
{
auto const *const input_geometry = unpack_geometry(lua_state);

Expand All @@ -84,7 +86,7 @@ static int geom_spherical_area(lua_State *lua_state)
return 1;
}

static int geom_length(lua_State *lua_state)
int geom_length(lua_State *lua_state)
{
auto const *const input_geometry = unpack_geometry(lua_state);
try {
Expand All @@ -96,7 +98,7 @@ static int geom_length(lua_State *lua_state)
return 1;
}

static int geom_centroid(lua_State *lua_state)
int geom_centroid(lua_State *lua_state)
{
auto const *const input_geometry = unpack_geometry(lua_state);

Expand All @@ -110,7 +112,7 @@ static int geom_centroid(lua_State *lua_state)
return 1;
}

static int geom_geometry_n(lua_State *lua_state)
int geom_geometry_n(lua_State *lua_state)
{
auto const *const input_geometry = unpack_geometry(lua_state);
auto const index = static_cast<int>(luaL_checkinteger(lua_state, 2));
Expand All @@ -125,7 +127,7 @@ static int geom_geometry_n(lua_State *lua_state)
return 1;
}

static int geom_geometry_type(lua_State *lua_state)
int geom_geometry_type(lua_State *lua_state)
{
auto const *const input_geometry = unpack_geometry(lua_state);

Expand All @@ -139,14 +141,14 @@ static int geom_geometry_type(lua_State *lua_state)
return 1;
}

static int geom_is_null(lua_State *lua_state)
int geom_is_null(lua_State *lua_state)
{
auto const *const input_geometry = unpack_geometry(lua_state);
lua_pushboolean(lua_state, input_geometry->is_null());
return 1;
}

static int geom_reverse(lua_State *lua_state)
int geom_reverse(lua_State *lua_state)
{
auto const *const input_geometry = unpack_geometry(lua_state);

Expand All @@ -160,7 +162,7 @@ static int geom_reverse(lua_State *lua_state)
return 1;
}

static int geom_line_merge(lua_State *lua_state)
int geom_line_merge(lua_State *lua_state)
{
auto const *const input_geometry = unpack_geometry(lua_state);

Expand All @@ -174,15 +176,15 @@ static int geom_line_merge(lua_State *lua_state)
return 1;
}

static int geom_num_geometries(lua_State *lua_state)
int geom_num_geometries(lua_State *lua_state)
{
auto const *const input_geometry = unpack_geometry(lua_state);
lua_pushinteger(lua_state,
static_cast<lua_Integer>(num_geometries(*input_geometry)));
return 1;
}

static int geom_pole_of_inaccessibility(lua_State *lua_state)
int geom_pole_of_inaccessibility(lua_State *lua_state)
{
auto const *const input_geometry = unpack_geometry(lua_state);

Expand Down Expand Up @@ -210,7 +212,7 @@ static int geom_pole_of_inaccessibility(lua_State *lua_state)
return 1;
}

static int geom_segmentize(lua_State *lua_state)
int geom_segmentize(lua_State *lua_state)
{
auto const *const input_geometry = unpack_geometry(lua_state);
double const max_segment_length = luaL_checknumber(lua_state, 2);
Expand All @@ -225,7 +227,7 @@ static int geom_segmentize(lua_State *lua_state)
return 1;
}

static int geom_simplify(lua_State *lua_state)
int geom_simplify(lua_State *lua_state)
{
auto const *const input_geometry = unpack_geometry(lua_state);
double const tolerance = luaL_checknumber(lua_state, 2);
Expand All @@ -240,7 +242,7 @@ static int geom_simplify(lua_State *lua_state)
return 1;
}

static int geom_srid(lua_State *lua_state)
int geom_srid(lua_State *lua_state)
{
auto const *const input_geometry = unpack_geometry(lua_state);
lua_pushinteger(lua_state,
Expand All @@ -251,12 +253,12 @@ static int geom_srid(lua_State *lua_state)
// XXX Implementation for Lua __tostring function on geometries. Currently
// just returns the type as string. This could be improved, for instance by
// showing a WKT representation of the geometry.
static int geom_tostring(lua_State *lua_state)
int geom_tostring(lua_State *lua_state)
{
return geom_geometry_type(lua_state);
}

static int geom_transform(lua_State *lua_state)
int geom_transform(lua_State *lua_state)
{
auto const *const input_geometry = unpack_geometry(lua_state);
auto const srid = static_cast<int>(luaL_checkinteger(lua_state, 2));
Expand All @@ -275,6 +277,8 @@ static int geom_transform(lua_State *lua_state)
return 1;
}

} // anonymous namespace

void init_geometry_class(lua_State *lua_state)
{
lua_getglobal(lua_state, "osm2pgsql");
Expand Down
16 changes: 10 additions & 6 deletions src/flex-lua-index.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@
#include <string>
#include <vector>

static void check_and_add_column(flex_table_t const &table,
std::vector<std::string> *columns,
char const *column_name)
namespace {

void check_and_add_column(flex_table_t const &table,
std::vector<std::string> *columns,
char const *column_name)
{
auto const *column = util::find_by_name(table.columns(), column_name);
if (!column) {
Expand All @@ -28,9 +30,9 @@ static void check_and_add_column(flex_table_t const &table,
columns->emplace_back(column_name);
}

static void check_and_add_columns(flex_table_t const &table,
std::vector<std::string> *columns,
lua_State *lua_state)
void check_and_add_columns(flex_table_t const &table,
std::vector<std::string> *columns,
lua_State *lua_state)
{
if (!luaX_is_array(lua_state)) {
throw std::runtime_error{
Expand All @@ -46,6 +48,8 @@ static void check_and_add_columns(flex_table_t const &table,
});
}

} // anonymous namespace

void flex_lua_setup_index(lua_State *lua_state, flex_table_t *table)
{
// get method
Expand Down
Loading

0 comments on commit eee1cd5

Please sign in to comment.