Skip to content

Commit 62b8ebe

Browse files
committed
Various cleanups based on clang-tidy warnings
1 parent 95016bf commit 62b8ebe

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

include/osmium/index/map.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ namespace osmium {
236236

237237
std::vector<std::string> map_types() const {
238238
std::vector<std::string> result;
239+
result.reserve(m_callbacks.size());
239240

240241
for (const auto& cb : m_callbacks) {
241242
result.push_back(cb.first);

include/osmium/io/bzip2_compression.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ namespace osmium {
112112
#ifdef _MSC_VER
113113
osmium::detail::disable_invalid_parameter_handler diph;
114114
#endif
115-
m_file = fdopen(fd, mode);
115+
m_file = fdopen(fd, mode); // NOLINT(cppcoreguidelines-prefer-member-initializer)
116116
if (!m_file) {
117117

118118
// Do not close stdout
@@ -134,7 +134,7 @@ namespace osmium {
134134
osmium::detail::disable_invalid_parameter_handler diph;
135135
#endif
136136
if (m_file) {
137-
fclose(m_file);
137+
(void)fclose(m_file);
138138
}
139139
}
140140

include/osmium/io/gzip_compression.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ namespace osmium {
116116
#ifdef _MSC_VER
117117
osmium::detail::disable_invalid_parameter_handler diph;
118118
#endif
119-
m_gzfile = ::gzdopen(osmium::io::detail::reliable_dup(fd), "wb");
119+
m_gzfile = ::gzdopen(osmium::io::detail::reliable_dup(fd), "wb"); // NOLINT(cppcoreguidelines-prefer-member-initializer)
120120
if (!m_gzfile) {
121121
throw gzip_error{"gzip error: write initialization failed"};
122122
}
@@ -192,7 +192,7 @@ namespace osmium {
192192
#ifdef _MSC_VER
193193
osmium::detail::disable_invalid_parameter_handler diph;
194194
#endif
195-
m_gzfile = ::gzdopen(fd, "rb");
195+
m_gzfile = ::gzdopen(fd, "rb"); // NOLINT(cppcoreguidelines-prefer-member-initializer)
196196
if (!m_gzfile) {
197197
try {
198198
osmium::io::detail::reliable_close(fd);

0 commit comments

Comments
 (0)