Fix several compiler and clang-tidy warnings

tstenner · tstenner · commit f62b3bd32670 · 2021-06-25T11:10:30.000+02:00
diff --git a/src/api_config.cpp b/src/api_config.cpp
@@ -208,7 +208,7 @@ void api_config::load_from_file(const std::string &filename) {
 		outlet_buffer_reserve_samples_ = pt.get("tuning.OutletBufferReserveSamples", 128);
 		inlet_buffer_reserve_ms_ = pt.get("tuning.InletBufferReserveMs", 5000);
 		inlet_buffer_reserve_samples_ = pt.get("tuning.InletBufferReserveSamples", 128);
-		smoothing_halftime_ = pt.get("tuning.SmoothingHalftime", 90.0f);
+		smoothing_halftime_ = pt.get("tuning.SmoothingHalftime", 90.0F);
 		force_default_timestamps_ = pt.get("tuning.ForceDefaultTimestamps", false);
 
 		// read the [log] settings
diff --git a/src/cancellation.cpp b/src/cancellation.cpp
@@ -1,13 +1,13 @@
 #include "cancellation.h"
 #include <loguru.hpp>
 
-lsl::cancellable_registry::~cancellable_registry() {}
+lsl::cancellable_registry::~cancellable_registry() = default;
 
 lsl::cancellable_obj::~cancellable_obj() { unregister_from_all(); }
 
 void lsl::cancellable_obj::unregister_from_all() {
 	try {
-		for (auto obj : registered_at_) obj->unregister_cancellable(this);
+		for (auto *obj : registered_at_) obj->unregister_cancellable(this);
 		registered_at_.clear();
 	} catch (std::exception &e) {
 		LOG_F(ERROR,
diff --git a/src/cast.cpp b/src/cast.cpp
@@ -5,17 +5,17 @@
 
 namespace lsl {
 
-template <> std::string to_string(double str) {
+template <> std::string to_string(double val) {
 	std::ostringstream os;
 	os.imbue(std::locale::classic());
-	os << std::setprecision(16) << std::showpoint << str;
+	os << std::setprecision(16) << std::showpoint << val;
 	return os.str();
 }
 
-template <> std::string to_string(float str) {
+template <> std::string to_string(float val) {
 	std::ostringstream os;
 	os.imbue(std::locale::classic());
-	os << std::setprecision(8) << std::showpoint << str;
+	os << std::setprecision(8) << std::showpoint << val;
 	return os.str();
 }
 
diff --git a/src/cast.h b/src/cast.h
@@ -3,12 +3,10 @@
 
 namespace lsl {
 template <typename T> std::string to_string(T val) { return std::to_string(val); }
+template <> std::string to_string(double val);
+template <> std::string to_string(float val);
 
 template <typename T> T from_string(const std::string &str);
-
-template <> std::string to_string(double str);
-template <> std::string to_string(float str);
-
 template <> inline bool from_string(const std::string &str) { return str == "1"; }
 
 } // namespace lsl
diff --git a/src/consumer_queue.cpp b/src/consumer_queue.cpp
@@ -3,11 +3,12 @@
 #include "send_buffer.h"
 #include <chrono>
 #include <loguru.hpp>
+#include <utility>
 
 using namespace lsl;
 
 consumer_queue::consumer_queue(std::size_t max_capacity, send_buffer_p registry)
-	: registry_(registry), buffer_(max_capacity) {
+	: registry_(std::move(registry)), buffer_(max_capacity) {
 	if (registry_) registry_->register_consumer(this);
 }
 
diff --git a/src/inireader.h b/src/inireader.h
@@ -11,7 +11,7 @@ class INI {
 	}
 
 public:
-	void load(std::istream &ini);
+	void load(std::istream &infile);
 
 	template <typename T> inline T get(const char *key, T defaultval = T()) {
 		auto it = values.find(key);
diff --git a/src/lsl_inlet_c.cpp b/src/lsl_inlet_c.cpp
@@ -22,7 +22,11 @@ LIBLSL_C_API void lsl_destroy_inlet(lsl_inlet in) {
 }
 
 LIBLSL_C_API lsl_streaminfo lsl_get_fullinfo(lsl_inlet in, double timeout, int32_t *ec) {
-	return create_object_noexcept<stream_info_impl>(in->info(timeout));
+	try {
+		return new stream_info_impl(in->info(timeout));
+	}
+	LSL_STORE_EXCEPTION_IN(ec)
+	return nullptr;
 }
 
 LIBLSL_C_API void lsl_open_stream(lsl_inlet in, double timeout, int32_t *ec) {
diff --git a/src/lsl_outlet_c.cpp b/src/lsl_outlet_c.cpp
@@ -2,8 +2,6 @@
 #include "stream_outlet_impl.h"
 #include <loguru.hpp>
 
-#pragma warning(disable : 4800)
-
 extern "C" {
 #include "api_types.hpp"
 // include api_types before public API header
@@ -14,8 +12,10 @@ using namespace lsl;
 // boilerplate wrapper code
 LIBLSL_C_API lsl_outlet lsl_create_outlet(
 	lsl_streaminfo info, int32_t chunk_size, int32_t max_buffered) {
-	return create_object_noexcept<stream_outlet_impl>(*info, chunk_size,
-		info->nominal_srate() ? (int)(info->nominal_srate() * max_buffered) : max_buffered * 100);
+	double buftime = info->nominal_srate();
+	if (buftime <= 0) buftime = 100;
+	return create_object_noexcept<stream_outlet_impl>(
+		*info, chunk_size, static_cast<int>(buftime * max_buffered));
 }
 
 LIBLSL_C_API void lsl_destroy_outlet(lsl_outlet out) {
diff --git a/src/lsl_streaminfo_c.cpp b/src/lsl_streaminfo_c.cpp
@@ -78,7 +78,7 @@ LIBLSL_C_API int32_t lsl_stream_info_matches_query(lsl_streaminfo info, const ch
 
 LIBLSL_C_API lsl_streaminfo lsl_streaminfo_from_xml(const char *xml) {
 	try {
-		stream_info_impl *impl = new stream_info_impl();
+		auto *impl = new stream_info_impl();
 		impl->from_fullinfo_message(xml);
 		return impl;
 	} catch (std::exception &e) {
diff --git a/src/netinterfaces.cpp b/src/netinterfaces.cpp
@@ -84,7 +84,7 @@ std::vector<lsl::netif> lsl::get_local_interfaces() {
 		LOG_F(ERROR, "Couldn't enumerate network interfaces: %d", errno);
 		return res;
 	}
-	for (auto addr = ifs; addr != nullptr; addr = addr->ifa_next) {
+	for (auto *addr = ifs; addr != nullptr; addr = addr->ifa_next) {
 		// No address? Skip.
 		if (addr->ifa_addr == nullptr) continue;
 		LOG_F(INFO, "netif '%s' (status: %d, multicast: %d, broadcast: %d)", addr->ifa_name,
diff --git a/src/resolve_attempt_udp.cpp b/src/resolve_attempt_udp.cpp
@@ -156,7 +156,7 @@ void resolve_attempt_udp::send_next_query(endpoint_list::const_iterator next) {
 				: (ep.address().is_multicast() ? multicast_socket_ : unicast_socket_);
 		// and send the query over it
 		sock.async_send_to(lslboost::asio::buffer(query_msg_), ep,
-			[shared_this = shared_from_this(), next](err_t err, size_t) {
+			[shared_this = shared_from_this(), next](err_t err, size_t /*unused*/) {
 				if (!shared_this->cancelled_ && err != asio::error::operation_aborted &&
 					err != asio::error::not_connected && err != asio::error::not_socket)
 					shared_this->send_next_query(next);
diff --git a/src/resolve_attempt_udp.h b/src/resolve_attempt_udp.h
@@ -78,7 +78,7 @@ class resolve_attempt_udp : public cancellable_obj,
 	void receive_next_result();
 
 	/// Thos function starts an async send operation for the given current endpoint.
-	void send_next_query(endpoint_list::const_iterator i);
+	void send_next_query(endpoint_list::const_iterator next);
 
 	/// Handler that gets called when a receive has completed.
 	void handle_receive_outcome(error_code err, std::size_t len);
diff --git a/src/resolver_impl.cpp b/src/resolver_impl.cpp
@@ -34,7 +34,7 @@ resolver_impl::resolver_impl()
 		try {
 			// resolve the name
 			// for each endpoint...
-			for (auto &res : udp_resolver.resolve(peer, std::to_string(cfg_->base_port()))) {
+			for (const auto &res : udp_resolver.resolve(peer, std::to_string(cfg_->base_port()))) {
 				// for each port in the range...
 				for (int p = cfg_->base_port(); p < cfg_->base_port() + cfg_->port_range(); p++)
 					// add a record
diff --git a/src/sample.cpp b/src/sample.cpp
@@ -5,6 +5,10 @@
 
 using namespace lsl;
 
+#ifdef _MSC_VER
+#pragma warning(suppress : 4291)
+#endif
+
 sample::~sample() noexcept{
 	if (format_ != cft_string) return;
 	for (std::string *p = (std::string *)&data_, *e = p + num_channels_; p < e; ++p)
@@ -187,7 +191,8 @@ void sample::save_streambuf(
 	}
 }
 
-void sample::load_streambuf(std::streambuf &sb, int, int use_byte_order, bool suppress_subnormals) {
+void sample::load_streambuf(
+	std::streambuf &sb, int /*unused*/, int use_byte_order, bool suppress_subnormals) {
 	// read sample header
 	if (load_value<uint8_t>(sb, use_byte_order) == TAG_DEDUCED_TIMESTAMP)
 		// deduce the timestamp
@@ -239,7 +244,7 @@ void sample::load_streambuf(std::streambuf &sb, int, int use_byte_order, bool su
 	}
 }
 
-template <class Archive> void sample::serialize_channels(Archive &ar, const uint32_t) {
+template <class Archive> void sample::serialize_channels(Archive &ar, const uint32_t /*unused*/) {
 	switch (format_) {
 	case cft_float32:
 		for (float *p = (float *)&data_, *e = p + num_channels_; p < e; ar & *p++)
@@ -311,7 +316,7 @@ template <typename T> void test_pattern(T *data, uint32_t num_channels, int offs
 }
 
 sample &sample::assign_test_pattern(int offset) {
-	pushthrough = 1;
+	pushthrough = true;
 	timestamp = 123456.789;
 
 	switch (format_) {
@@ -365,7 +370,6 @@ factory::factory(lsl_channel_format_t fmt, uint32_t num_chans, uint32_t num_rese
 	// pre-construct an array of samples in the storage area and chain into a freelist
 	sample *s = nullptr;
 	for (char *p = storage_, *e = p + storage_size_; p < e;) {
-#pragma warning(suppress : 4291)
 		s = new (reinterpret_cast<sample *>(p)) sample(fmt, num_chans, this);
 		s->next_ = (sample *)(p += sample_size_);
 	}
@@ -377,7 +381,6 @@ factory::factory(lsl_channel_format_t fmt, uint32_t num_chans, uint32_t num_rese
 sample_p factory::new_sample(double timestamp, bool pushthrough) {
 	sample *result = pop_freelist();
 	if (!result)
-#pragma warning(suppress : 4291)
 		result = new (new char[sample_size_]) sample(fmt_, num_chans_, this);
 	result->timestamp = timestamp;
 	result->pushthrough = pushthrough;
diff --git a/src/socket_utils.cpp b/src/socket_utils.cpp
@@ -39,16 +39,16 @@ const std::string all_ports_bound_msg(
 	"https://labstreaminglayer.readthedocs.io/info/network-connectivity.html"
 	") or you have a problem with your network configuration.");
 
-uint16_t lsl::bind_port_in_range(asio::ip::udp::socket &acc, asio::ip::udp protocol) {
-	uint16_t port = bind_port_in_range_(acc, protocol);
+uint16_t lsl::bind_port_in_range(asio::ip::udp::socket &sock, asio::ip::udp protocol) {
+	uint16_t port = bind_port_in_range_(sock, protocol);
 	if (!port) throw std::runtime_error(all_ports_bound_msg);
 	return port;
 }
 
 uint16_t lsl::bind_and_listen_to_port_in_range(
-	asio::ip::tcp::acceptor &sock, asio::ip::tcp protocol, int backlog) {
-	uint16_t port = bind_port_in_range_(sock, protocol);
+	asio::ip::tcp::acceptor &acc, asio::ip::tcp protocol, int backlog) {
+	uint16_t port = bind_port_in_range_(acc, protocol);
 	if (!port) throw std::runtime_error(all_ports_bound_msg);
-	sock.listen(backlog);
+	acc.listen(backlog);
 	return port;
 }
diff --git a/src/stream_info_impl.cpp b/src/stream_info_impl.cpp
@@ -4,6 +4,7 @@
 #include <algorithm>
 #include <loguru.hpp>
 #include <sstream>
+#include <utility>
 
 namespace lsl {
 
@@ -17,11 +18,11 @@ stream_info_impl::stream_info_impl()
 	write_xml(doc_);
 }
 
-stream_info_impl::stream_info_impl(const std::string &name, const std::string &type,
-	int channel_count, double nominal_srate, lsl_channel_format_t channel_format,
-	const std::string &source_id)
-	: name_(name), type_(type), channel_count_(channel_count), nominal_srate_(nominal_srate),
-	  channel_format_(channel_format), source_id_(source_id),
+stream_info_impl::stream_info_impl(const std::string &name, std::string type, int channel_count,
+	double nominal_srate, lsl_channel_format_t channel_format, std::string source_id)
+	: name_(name), type_(std::move(type)), channel_count_(channel_count),
+	  nominal_srate_(nominal_srate), channel_format_(channel_format),
+	  source_id_(std::move(source_id)),
 	  version_(api_config::get_instance()->use_protocol_version()), v4data_port_(0),
 	  v4service_port_(0), v6data_port_(0), v6service_port_(0), created_at_(0) {
 	if (name.empty()) throw std::invalid_argument("The name of a stream must be non-empty.");
@@ -71,7 +72,7 @@ void stream_info_impl::write_xml(xml_document &doc) {
 
 template <typename T>
 void get_bounded_child_val(xml_node &node, const char *child_name, T &target, int min, int max = 0) {
-	auto value = node.child_value(child_name);
+	const auto *value = node.child_value(child_name);
 	int intval = std::stoi(value);
 	if (intval < min || (max != 0 && intval > max)) {
 		std::string errmsg{child_name};
@@ -181,8 +182,8 @@ bool stream_info_impl::matches_query(const std::string &query, bool nocache) {
 	return cached_.matches_query(doc_, query, nocache);
 }
 
-bool query_cache::matches_query(const xml_document &doc, const std::string query, bool nocache) {
-	if(query == "") return true;
+bool query_cache::matches_query(const xml_document &doc, const std::string &query, bool nocache) {
+	if (query.empty()) return true;
 	std::lock_guard<std::mutex> lock(cache_mut_);
 
 	decltype(cache)::iterator it;
diff --git a/src/stream_info_impl.h b/src/stream_info_impl.h
@@ -15,7 +15,7 @@ class query_cache {
 	std::mutex cache_mut_;
 
 public:
-	bool matches_query(const pugi::xml_document &doc, const std::string query, bool nocache);
+	bool matches_query(const pugi::xml_document &doc, const std::string &query, bool nocache);
 };
 
 /**
@@ -46,8 +46,8 @@ class stream_info_impl {
 	 * @param source_id Unique identifier of the source or device if available (e.g., serial
 	 * number). Allows for advanced failure recovery.
 	 */
-	stream_info_impl(const std::string &name, const std::string &type, int channel_count,
-		double nominal_srate, lsl_channel_format_t channel_format, const std::string &source_id);
+	stream_info_impl(const std::string &name, std::string type, int channel_count,
+		double nominal_srate, lsl_channel_format_t channel_format, std::string source_id);
 
 	/// Copy constructor. Needs special handling because xml_document is non-copyable.
 	stream_info_impl(const stream_info_impl &rhs);
diff --git a/src/stream_outlet_impl.cpp b/src/stream_outlet_impl.cpp
@@ -128,7 +128,7 @@ stream_outlet_impl::~stream_outlet_impl() {
 
 			std::this_thread::sleep_for(std::chrono::milliseconds(25));
 			if (std::all_of(io_threads_.begin(), io_threads_.end(),
-					[](thread_p thread) { return thread->joinable(); })) {
+					[](const thread_p &thread) { return thread->joinable(); })) {
 				for (auto &thread : io_threads_) thread->join();
 				DLOG_F(INFO, "All of %s's IO threads were joined succesfully", name);
 				break;
diff --git a/src/tcp_server.cpp b/src/tcp_server.cpp
diff --git a/src/tcp_server.h b/src/tcp_server.h
diff --git a/src/time_postprocessor.cpp b/src/time_postprocessor.cpp
diff --git a/src/time_postprocessor.h b/src/time_postprocessor.h
diff --git a/src/time_receiver.cpp b/src/time_receiver.cpp
diff --git a/src/udp_server.cpp b/src/udp_server.cpp

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ class INI {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`public:`
`14`		`- void load(std::istream &ini);`
	`14`	`+ void load(std::istream &infile);`
`15`	`15`
`16`	`16`	`template <typename T> inline T get(const char *key, T defaultval = T()) {`
`17`	`17`	`auto it = values.find(key);`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,11 @@ LIBLSL_C_API void lsl_destroy_inlet(lsl_inlet in) {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`LIBLSL_C_API lsl_streaminfo lsl_get_fullinfo(lsl_inlet in, double timeout, int32_t *ec) {`
`25`		`- return create_object_noexcept<stream_info_impl>(in->info(timeout));`
	`25`	`+ try {`
	`26`	`+ return new stream_info_impl(in->info(timeout));`
	`27`	`+ }`
	`28`	`+ LSL_STORE_EXCEPTION_IN(ec)`
	`29`	`+ return nullptr;`
`26`	`30`	`}`
`27`	`31`
`28`	`32`	`LIBLSL_C_API void lsl_open_stream(lsl_inlet in, double timeout, int32_t *ec) {`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ std::vector<lsl::netif> lsl::get_local_interfaces() {`
`84`	`84`	`LOG_F(ERROR, "Couldn't enumerate network interfaces: %d", errno);`
`85`	`85`	`return res;`
`86`	`86`	`}`
`87`		`- for (auto addr = ifs; addr != nullptr; addr = addr->ifa_next) {`
	`87`	`+ for (auto *addr = ifs; addr != nullptr; addr = addr->ifa_next) {`
`88`	`88`	`// No address? Skip.`
`89`	`89`	`if (addr->ifa_addr == nullptr) continue;`
`90`	`90`	`LOG_F(INFO, "netif '%s' (status: %d, multicast: %d, broadcast: %d)", addr->ifa_name,`