Skip to content

Commit 23b6634

Browse files
lonvialonvia
authored
Merge pull request #2203 from joto/static-to-anon-ns
Use anonymous namespaces instead of declaring static functions
2 parents 03eedd4 + eee1cd5 commit 23b6634

31 files changed

+683
-554
lines changed

‎src/command-line-parser.cpp‎

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@
3131
#include <thread> // for number of threads
3232
#include <vector>
3333

34-
static osmium::Box parse_bbox_param(std::string const &arg)
34+
namespace {
35+
36+
osmium::Box parse_bbox_param(std::string const &arg)
3537
{
3638
double minx = NAN;
3739
double maxx = NAN;
@@ -61,9 +63,8 @@ static osmium::Box parse_bbox_param(std::string const &arg)
6163
return osmium::Box{minx, miny, maxx, maxy};
6264
}
6365

64-
static void parse_expire_tiles_param(char const *arg,
65-
uint32_t *expire_tiles_zoom_min,
66-
uint32_t *expire_tiles_zoom)
66+
void parse_expire_tiles_param(char const *arg, uint32_t *expire_tiles_zoom_min,
67+
uint32_t *expire_tiles_zoom)
6768
{
6869
if (!arg || arg[0] == '-') {
6970
throw std::runtime_error{"Missing argument for option --expire-tiles."
@@ -110,20 +111,7 @@ static void parse_expire_tiles_param(char const *arg,
110111
" tile expiry must be separated by '-'."};
111112
}
112113

113-
void print_version()
114-
{
115-
fmt::print(stderr, "Build: {}\n", get_build_type());
116-
fmt::print(stderr, "Compiled using the following library versions:\n");
117-
fmt::print(stderr, "Libosmium {}\n", LIBOSMIUM_VERSION_STRING);
118-
fmt::print(stderr, "Proj {}\n", get_proj_version());
119-
#ifdef HAVE_LUAJIT
120-
fmt::print(stderr, "{} ({})\n", LUA_RELEASE, LUAJIT_VERSION);
121-
#else
122-
fmt::print(stderr, "{}\n", LUA_RELEASE);
123-
#endif
124-
}
125-
126-
static void check_options_non_slim(CLI::App const &app)
114+
void check_options_non_slim(CLI::App const &app)
127115
{
128116
std::vector<std::string> const slim_options = {
129117
"--flat-nodes", "--middle-schema",
@@ -138,7 +126,7 @@ static void check_options_non_slim(CLI::App const &app)
138126
}
139127
}
140128

141-
static void check_options_output_flex(CLI::App const &app)
129+
void check_options_output_flex(CLI::App const &app)
142130
{
143131
auto const ignored_options = app.get_options([](CLI::Option const *option) {
144132
return option->get_group() == "Pgsql output options" ||
@@ -154,7 +142,7 @@ static void check_options_output_flex(CLI::App const &app)
154142
}
155143
}
156144

157-
static void check_options_output_null(CLI::App const &app)
145+
void check_options_output_null(CLI::App const &app)
158146
{
159147
auto const ignored_options = app.get_options([](CLI::Option const *option) {
160148
return option->get_group() == "Pgsql output options" ||
@@ -172,7 +160,7 @@ static void check_options_output_null(CLI::App const &app)
172160
}
173161
}
174162

175-
static void check_options_output_pgsql(CLI::App const &app, options_t *options)
163+
void check_options_output_pgsql(CLI::App const &app, options_t *options)
176164
{
177165
if (app.count("--latlong") + app.count("--merc") + app.count("--proj") >
178166
1) {
@@ -196,7 +184,7 @@ static void check_options_output_pgsql(CLI::App const &app, options_t *options)
196184
}
197185
}
198186

199-
static void check_options(options_t *options)
187+
void check_options(options_t *options)
200188
{
201189
if (options->append && !options->slim) {
202190
throw std::runtime_error{"--append can only be used with slim mode!"};
@@ -223,7 +211,7 @@ static void check_options(options_t *options)
223211
}
224212
}
225213

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

237+
} // anonymous namespace
238+
239+
void print_version()
240+
{
241+
fmt::print(stderr, "Build: {}\n", get_build_type());
242+
fmt::print(stderr, "Compiled using the following library versions:\n");
243+
fmt::print(stderr, "Libosmium {}\n", LIBOSMIUM_VERSION_STRING);
244+
fmt::print(stderr, "Proj {}\n", get_proj_version());
245+
#ifdef HAVE_LUA
246+
#ifdef HAVE_LUAJIT
247+
fmt::print(stderr, "{} ({})\n", LUA_RELEASE, LUAJIT_VERSION);
248+
#else
249+
fmt::print(stderr, "{}\n", LUA_RELEASE);
250+
#endif
251+
#else
252+
fmt::print(stderr, "Lua support not included\n");
253+
#endif
254+
}
255+
249256
// NOLINTNEXTLINE(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
250257
options_t parse_command_line(int argc, char *argv[])
251258
{

‎src/flex-lua-expire-output.cpp‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717

1818
#include <lua.hpp>
1919

20-
static expire_output_t &
20+
namespace {
21+
22+
expire_output_t &
2123
create_expire_output(lua_State *lua_state, std::string const &default_schema,
2224
std::vector<expire_output_t> *expire_outputs)
2325
{
@@ -65,6 +67,8 @@ create_expire_output(lua_State *lua_state, std::string const &default_schema,
6567
return new_expire_output;
6668
}
6769

70+
} // anonymous namespace
71+
6872
int setup_flex_expire_output(lua_State *lua_state,
6973
std::string const &default_schema,
7074
std::vector<expire_output_t> *expire_outputs)

‎src/flex-lua-geom.cpp‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,12 @@ int geom_gc(lua_State *lua_state) noexcept
5050
return 0;
5151
}
5252

53+
namespace {
54+
5355
// The following functions are called when their counterparts in Lua are
5456
// called on geometry objects.
5557

56-
static int geom_area(lua_State *lua_state)
58+
int geom_area(lua_State *lua_state)
5759
{
5860
auto const *const input_geometry = unpack_geometry(lua_state);
5961

@@ -66,7 +68,7 @@ static int geom_area(lua_State *lua_state)
6668
return 1;
6769
}
6870

69-
static int geom_spherical_area(lua_State *lua_state)
71+
int geom_spherical_area(lua_State *lua_state)
7072
{
7173
auto const *const input_geometry = unpack_geometry(lua_state);
7274

@@ -84,7 +86,7 @@ static int geom_spherical_area(lua_State *lua_state)
8486
return 1;
8587
}
8688

87-
static int geom_length(lua_State *lua_state)
89+
int geom_length(lua_State *lua_state)
8890
{
8991
auto const *const input_geometry = unpack_geometry(lua_state);
9092
try {
@@ -96,7 +98,7 @@ static int geom_length(lua_State *lua_state)
9698
return 1;
9799
}
98100

99-
static int geom_centroid(lua_State *lua_state)
101+
int geom_centroid(lua_State *lua_state)
100102
{
101103
auto const *const input_geometry = unpack_geometry(lua_state);
102104

@@ -110,7 +112,7 @@ static int geom_centroid(lua_State *lua_state)
110112
return 1;
111113
}
112114

113-
static int geom_geometry_n(lua_State *lua_state)
115+
int geom_geometry_n(lua_State *lua_state)
114116
{
115117
auto const *const input_geometry = unpack_geometry(lua_state);
116118
auto const index = static_cast<int>(luaL_checkinteger(lua_state, 2));
@@ -125,7 +127,7 @@ static int geom_geometry_n(lua_State *lua_state)
125127
return 1;
126128
}
127129

128-
static int geom_geometry_type(lua_State *lua_state)
130+
int geom_geometry_type(lua_State *lua_state)
129131
{
130132
auto const *const input_geometry = unpack_geometry(lua_state);
131133

@@ -139,14 +141,14 @@ static int geom_geometry_type(lua_State *lua_state)
139141
return 1;
140142
}
141143

142-
static int geom_is_null(lua_State *lua_state)
144+
int geom_is_null(lua_State *lua_state)
143145
{
144146
auto const *const input_geometry = unpack_geometry(lua_state);
145147
lua_pushboolean(lua_state, input_geometry->is_null());
146148
return 1;
147149
}
148150

149-
static int geom_reverse(lua_State *lua_state)
151+
int geom_reverse(lua_State *lua_state)
150152
{
151153
auto const *const input_geometry = unpack_geometry(lua_state);
152154

@@ -160,7 +162,7 @@ static int geom_reverse(lua_State *lua_state)
160162
return 1;
161163
}
162164

163-
static int geom_line_merge(lua_State *lua_state)
165+
int geom_line_merge(lua_State *lua_state)
164166
{
165167
auto const *const input_geometry = unpack_geometry(lua_state);
166168

@@ -174,15 +176,15 @@ static int geom_line_merge(lua_State *lua_state)
174176
return 1;
175177
}
176178

177-
static int geom_num_geometries(lua_State *lua_state)
179+
int geom_num_geometries(lua_State *lua_state)
178180
{
179181
auto const *const input_geometry = unpack_geometry(lua_state);
180182
lua_pushinteger(lua_state,
181183
static_cast<lua_Integer>(num_geometries(*input_geometry)));
182184
return 1;
183185
}
184186

185-
static int geom_pole_of_inaccessibility(lua_State *lua_state)
187+
int geom_pole_of_inaccessibility(lua_State *lua_state)
186188
{
187189
auto const *const input_geometry = unpack_geometry(lua_state);
188190

@@ -210,7 +212,7 @@ static int geom_pole_of_inaccessibility(lua_State *lua_state)
210212
return 1;
211213
}
212214

213-
static int geom_segmentize(lua_State *lua_state)
215+
int geom_segmentize(lua_State *lua_state)
214216
{
215217
auto const *const input_geometry = unpack_geometry(lua_state);
216218
double const max_segment_length = luaL_checknumber(lua_state, 2);
@@ -225,7 +227,7 @@ static int geom_segmentize(lua_State *lua_state)
225227
return 1;
226228
}
227229

228-
static int geom_simplify(lua_State *lua_state)
230+
int geom_simplify(lua_State *lua_state)
229231
{
230232
auto const *const input_geometry = unpack_geometry(lua_state);
231233
double const tolerance = luaL_checknumber(lua_state, 2);
@@ -240,7 +242,7 @@ static int geom_simplify(lua_State *lua_state)
240242
return 1;
241243
}
242244

243-
static int geom_srid(lua_State *lua_state)
245+
int geom_srid(lua_State *lua_state)
244246
{
245247
auto const *const input_geometry = unpack_geometry(lua_state);
246248
lua_pushinteger(lua_state,
@@ -251,12 +253,12 @@ static int geom_srid(lua_State *lua_state)
251253
// XXX Implementation for Lua __tostring function on geometries. Currently
252254
// just returns the type as string. This could be improved, for instance by
253255
// showing a WKT representation of the geometry.
254-
static int geom_tostring(lua_State *lua_state)
256+
int geom_tostring(lua_State *lua_state)
255257
{
256258
return geom_geometry_type(lua_state);
257259
}
258260

259-
static int geom_transform(lua_State *lua_state)
261+
int geom_transform(lua_State *lua_state)
260262
{
261263
auto const *const input_geometry = unpack_geometry(lua_state);
262264
auto const srid = static_cast<int>(luaL_checkinteger(lua_state, 2));
@@ -275,6 +277,8 @@ static int geom_transform(lua_State *lua_state)
275277
return 1;
276278
}
277279

280+
} // anonymous namespace
281+
278282
void init_geometry_class(lua_State *lua_state)
279283
{
280284
lua_getglobal(lua_state, "osm2pgsql");

‎src/flex-lua-index.cpp‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@
1616
#include <string>
1717
#include <vector>
1818

19-
static void check_and_add_column(flex_table_t const &table,
20-
std::vector<std::string> *columns,
21-
char const *column_name)
19+
namespace {
20+
21+
void check_and_add_column(flex_table_t const &table,
22+
std::vector<std::string> *columns,
23+
char const *column_name)
2224
{
2325
auto const *column = util::find_by_name(table.columns(), column_name);
2426
if (!column) {
@@ -28,9 +30,9 @@ static void check_and_add_column(flex_table_t const &table,
2830
columns->emplace_back(column_name);
2931
}
3032

31-
static void check_and_add_columns(flex_table_t const &table,
32-
std::vector<std::string> *columns,
33-
lua_State *lua_state)
33+
void check_and_add_columns(flex_table_t const &table,
34+
std::vector<std::string> *columns,
35+
lua_State *lua_state)
3436
{
3537
if (!luaX_is_array(lua_state)) {
3638
throw std::runtime_error{
@@ -46,6 +48,8 @@ static void check_and_add_columns(flex_table_t const &table,
4648
});
4749
}
4850

51+
} // anonymous namespace
52+
4953
void flex_lua_setup_index(lua_State *lua_state, flex_table_t *table)
5054
{
5155
// get method

0 commit comments

Comments
 (0)