Skip to content

Commit 11d3eb5

Browse files
jotojoto
committed
Switch pending_ways/relations from int to void return type
The result is never used.
1 parent 26ea60e commit 11d3eb5

8 files changed

Lines changed: 19 additions & 34 deletions

File tree

‎src/output-gazetteer.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ class output_gazetteer_t : public output_t
4747
void commit() override;
4848

4949
void enqueue_ways(pending_queue_t &, osmid_t, size_t, size_t &) override {}
50-
int pending_way(osmid_t, int) override { return 0; }
50+
void pending_way(osmid_t, int) override {}
5151

5252
void enqueue_relations(pending_queue_t &, osmid_t, size_t,
5353
size_t &) override
5454
{}
55-
int pending_relation(osmid_t, int) override { return 0; }
55+
void pending_relation(osmid_t, int) override {}
5656

5757
void node_add(osmium::Node const &node) override { process_node(node); }
5858

‎src/output-multi.cpp‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -120,18 +120,14 @@ void output_multi_t::enqueue_ways(pending_queue_t &job_queue, osmid_t id,
120120
}
121121
}
122122

123-
int output_multi_t::pending_way(osmid_t id, int exists)
123+
void output_multi_t::pending_way(osmid_t id, int exists)
124124
{
125-
int ret = 0;
126-
127125
// Try to fetch the way from the DB
128126
buffer.clear();
129127
if (m_mid->ways_get(id, buffer)) {
130128
// Output the way
131-
ret = reprocess_way(&buffer.get<osmium::Way>(0), exists);
129+
reprocess_way(&buffer.get<osmium::Way>(0), exists);
132130
}
133-
134-
return ret;
135131
}
136132

137133
void output_multi_t::enqueue_relations(pending_queue_t &job_queue, osmid_t id,
@@ -174,18 +170,14 @@ void output_multi_t::enqueue_relations(pending_queue_t &job_queue, osmid_t id,
174170
}
175171
}
176172

177-
int output_multi_t::pending_relation(osmid_t id, int exists)
173+
void output_multi_t::pending_relation(osmid_t id, int exists)
178174
{
179-
int ret = 0;
180-
181175
// Try to fetch the relation from the DB
182176
buffer.clear();
183177
if (m_mid->relations_get(id, buffer)) {
184178
auto const &rel = buffer.get<osmium::Relation>(0);
185-
ret = process_relation(rel, exists);
179+
process_relation(rel, exists);
186180
}
187-
188-
return ret;
189181
}
190182

191183
void output_multi_t::stop(osmium::thread::Pool *pool)

‎src/output-multi.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ class output_multi_t : public output_t
4848

4949
void enqueue_ways(pending_queue_t &job_queue, osmid_t id, size_t output_id,
5050
size_t &added) override;
51-
int pending_way(osmid_t id, int exists) override;
51+
void pending_way(osmid_t id, int exists) override;
5252

5353
void enqueue_relations(pending_queue_t &job_queue, osmid_t id,
5454
size_t output_id, size_t &added) override;
55-
int pending_relation(osmid_t id, int exists) override;
55+
void pending_relation(osmid_t id, int exists) override;
5656

5757
void node_add(osmium::Node const &node) override;
5858
void way_add(osmium::Way *way) override;

‎src/output-null.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,10 @@ void output_null_t::commit() {}
1212
void output_null_t::enqueue_ways(pending_queue_t &, osmid_t, size_t, size_t &)
1313
{}
1414

15-
int output_null_t::pending_way(osmid_t, int) { return 0; }
16-
1715
void output_null_t::enqueue_relations(pending_queue_t &, osmid_t, size_t,
1816
size_t &)
1917
{}
2018

21-
int output_null_t::pending_relation(osmid_t, int) { return 0; }
22-
2319
std::shared_ptr<output_t>
2420
output_null_t::clone(std::shared_ptr<middle_query_t> const &mid,
2521
std::shared_ptr<db_copy_thread_t> const &) const

‎src/output-null.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ class output_null_t : public output_t
2424

2525
void enqueue_ways(pending_queue_t &job_queue, osmid_t id, size_t output_id,
2626
size_t &added) override;
27-
int pending_way(osmid_t id, int exists) override;
27+
void pending_way(osmid_t id, int exists) override {};
2828

2929
void enqueue_relations(pending_queue_t &job_queue, osmid_t id,
3030
size_t output_id, size_t &added) override;
31-
int pending_relation(osmid_t id, int exists) override;
31+
void pending_relation(osmid_t id, int exists) override {};
3232

3333
void node_add(osmium::Node const &node) override {}
3434
void way_add(osmium::Way *way) override {}

‎src/output-pgsql.cpp‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ void output_pgsql_t::enqueue_ways(pending_queue_t &job_queue, osmid_t id,
111111
}
112112
}
113113

114-
int output_pgsql_t::pending_way(osmid_t id, int exists)
114+
void output_pgsql_t::pending_way(osmid_t id, int exists)
115115
{
116116
// Try to fetch the way from the DB
117117
buffer.clear();
@@ -136,12 +136,10 @@ int output_pgsql_t::pending_way(osmid_t id, int exists)
136136
auto nnodes = m_mid->nodes_get_list(&(way.nodes()));
137137
if (nnodes > 1) {
138138
pgsql_out_way(way, &outtags, polygon, roads);
139-
return 1;
139+
return;
140140
}
141141
}
142142
}
143-
144-
return 0;
145143
}
146144

147145
void output_pgsql_t::enqueue_relations(pending_queue_t &job_queue, osmid_t id,
@@ -184,7 +182,7 @@ void output_pgsql_t::enqueue_relations(pending_queue_t &job_queue, osmid_t id,
184182
}
185183
}
186184

187-
int output_pgsql_t::pending_relation(osmid_t id, int exists)
185+
void output_pgsql_t::pending_relation(osmid_t id, int exists)
188186
{
189187
// Try to fetch the relation from the DB
190188
// Note that we cannot use the global buffer here because
@@ -198,10 +196,9 @@ int output_pgsql_t::pending_relation(osmid_t id, int exists)
198196
}
199197

200198
auto const &rel = rels_buffer.get<osmium::Relation>(0);
201-
return pgsql_process_relation(rel);
199+
pgsql_process_relation(rel);
200+
return;
202201
}
203-
204-
return 0;
205202
}
206203

207204
void output_pgsql_t::commit()

‎src/output-pgsql.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ class output_pgsql_t : public output_t
4848

4949
void enqueue_ways(pending_queue_t &job_queue, osmid_t id, size_t output_id,
5050
size_t &added) override;
51-
int pending_way(osmid_t id, int exists) override;
51+
void pending_way(osmid_t id, int exists) override;
5252

5353
void enqueue_relations(pending_queue_t &job_queue, osmid_t id,
5454
size_t output_id, size_t &added) override;
55-
int pending_relation(osmid_t id, int exists) override;
55+
void pending_relation(osmid_t id, int exists) override;
5656

5757
void node_add(osmium::Node const &node) override;
5858
void way_add(osmium::Way *way) override;

‎src/output.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ class output_t
5353

5454
virtual void enqueue_ways(pending_queue_t &job_queue, osmid_t id,
5555
size_t output_id, size_t &added) = 0;
56-
virtual int pending_way(osmid_t id, int exists) = 0;
56+
virtual void pending_way(osmid_t id, int exists) = 0;
5757

5858
virtual void enqueue_relations(pending_queue_t &job_queue, osmid_t id,
5959
size_t output_id, size_t &added) = 0;
60-
virtual int pending_relation(osmid_t id, int exists) = 0;
60+
virtual void pending_relation(osmid_t id, int exists) = 0;
6161

6262
virtual void node_add(osmium::Node const &node) = 0;
6363
virtual void way_add(osmium::Way *way) = 0;

0 commit comments

Comments
 (0)