code style

8 files changed, 81 insertions, 78 deletions

diff --git a/libnvxx/const_nv_list.cc b/libnvxx/const_nv_list.cc
index 0ed83b2..60605fa 100644
--- a/libnvxx/const_nv_list.cc
+++ b/libnvxx/const_nv_list.cc
@@ -40,7 +40,7 @@ const_nv_list::operator=(const_nv_list const &other) noexcept
 		__m_nv = other.__m_nv;
 	}
 
-	return *this;
+	return (*this);
 }
 
 const_nv_list &
@@ -48,13 +48,13 @@ const_nv_list::operator=(nv_list const &other) noexcept
 {
 	/* This is not a leak since we never own the nvlist_t. */
 	__m_nv = other.__m_nv;
-	return *this;
+	return (*this);
 }
 
 ::nvlist_t const *
 const_nv_list::ptr() const
 {
-	return __m_nv;
+	return (__m_nv);
 }
 
 namespace __detail {
@@ -63,43 +63,43 @@ std::error_code
 __const_nv_list::error() const noexcept
 {
 	if (auto const err = nvlist_error(__m_nv); err != 0)
-		return std::make_error_code(std::errc(err));
+		return (std::make_error_code(std::errc(err)));
 	return {};
 }
 
 bool
 __const_nv_list::exists(std::string_view key) const
 {
-	return ::nvlist_exists(__m_nv, std::string(key).c_str());
+	return (::nvlist_exists(__m_nv, std::string(key).c_str()));
 }
 
 bool
 __const_nv_list::exists_type(std::string_view key, int type) const
 {
-	return ::nvlist_exists_type(__m_nv, std::string(key).c_str(), type);
+	return (::nvlist_exists_type(__m_nv, std::string(key).c_str(), type));
 }
 
 bool
 __const_nv_list::empty() const noexcept
 {
-	return ::nvlist_empty(__m_nv);
+	return (::nvlist_empty(__m_nv));
 }
 
 int
 __const_nv_list::flags() const noexcept
 {
-	return ::nvlist_flags(__m_nv);
+	return (::nvlist_flags(__m_nv));
 }
 
 bool
 __const_nv_list::in_array() const noexcept
 {
-	return ::nvlist_in_array(__m_nv);
+	return (::nvlist_in_array(__m_nv));
 }
 
 __const_nv_list::operator bool() const noexcept
 {
-	return ::nvlist_error(__m_nv) == 0;
+	return (::nvlist_error(__m_nv) == 0);
 }
 
 void
@@ -128,7 +128,7 @@ __const_nv_list::fdump(std::FILE *__fp) const noexcept
 std::size_t
 __const_nv_list::packed_size() const noexcept
 {
-	return ::nvlist_size(__m_nv);
+	return (::nvlist_size(__m_nv));
 }
 
 std::vector<std::byte>
@@ -151,7 +151,7 @@ __const_nv_list::pack() const
 bool
 __const_nv_list::exists_null(std::string_view key) const
 {
-	return ::nvlist_exists_null(__m_nv, std::string(key).c_str());
+	return (::nvlist_exists_null(__m_nv, std::string(key).c_str()));
 }
 
 /*
@@ -161,7 +161,7 @@ __const_nv_list::exists_null(std::string_view key) const
 bool
 __const_nv_list::exists_bool(std::string_view key) const
 {
-	return ::nvlist_exists_bool(__m_nv, std::string(key).c_str());
+	return (::nvlist_exists_bool(__m_nv, std::string(key).c_str()));
 }
 
 bool
@@ -172,13 +172,13 @@ __const_nv_list::get_bool(std::string_view key) const
 	if (!::nvlist_exists_bool(__m_nv, skey.c_str()))
 		throw nv_key_not_found(skey);
 
-	return ::nvlist_get_bool(__m_nv, skey.c_str());
+	return (::nvlist_get_bool(__m_nv, skey.c_str()));
 }
 
 bool
 __const_nv_list::exists_bool_array(std::string_view key) const
 {
-	return ::nvlist_exists_bool_array(__m_nv, std::string(key).c_str());
+	return (::nvlist_exists_bool_array(__m_nv, std::string(key).c_str()));
 }
 
 std::span<bool const>
@@ -201,7 +201,7 @@ __const_nv_list::get_bool_array(std::string_view key) const
 bool
 __const_nv_list::exists_number(std::string_view key) const
 {
-	return ::nvlist_exists_number(__m_nv, std::string(key).c_str());
+	return (::nvlist_exists_number(__m_nv, std::string(key).c_str()));
 }
 
 std::uint64_t
@@ -212,13 +212,14 @@ __const_nv_list::get_number(std::string_view key) const
 	if (!::nvlist_exists_number(__m_nv, skey.c_str()))
 		throw nv_key_not_found(skey);
 
-	return ::nvlist_get_number(__m_nv, skey.c_str());
+	return (::nvlist_get_number(__m_nv, skey.c_str()));
 }
 
 bool
 __const_nv_list::exists_number_array(std::string_view key) const
 {
-	return ::nvlist_exists_number_array(__m_nv, std::string(key).c_str());
+	return (::nvlist_exists_number_array(__m_nv,
+					     std::string(key).c_str()));
 }
 
 std::span<std::uint64_t const>
@@ -241,7 +242,7 @@ __const_nv_list::get_number_array(std::string_view key) const
 bool
 __const_nv_list::exists_string(std::string_view key) const
 {
-	return ::nvlist_exists_string(__m_nv, std::string(key).c_str());
+	return (::nvlist_exists_string(__m_nv, std::string(key).c_str()));
 }
 
 std::string_view
@@ -252,13 +253,14 @@ __const_nv_list::get_string(std::string_view key) const
 	if (!::nvlist_exists_string(__m_nv, skey.c_str()))
 		throw nv_key_not_found(skey);
 
-	return nvlist_get_string(__m_nv, skey.c_str());
+	return (::nvlist_get_string(__m_nv, skey.c_str()));
 }
 
 bool
 __const_nv_list::exists_string_array(std::string_view key) const
 {
-	return nvlist_exists_string_array(__m_nv, std::string(key).c_str());
+	return (::nvlist_exists_string_array(__m_nv,
+					     std::string(key).c_str()));
 }
 
 std::vector<std::string_view>
@@ -271,9 +273,9 @@ __const_nv_list::get_string_array(std::string_view key) const
 
 	auto nitems = std::size_t{};
 	auto *data = nvlist_get_string_array(__m_nv, skey.c_str(), &nitems);
-	return std::span(data, data + nitems)
+	return (std::span(data, data + nitems)
 		| construct<std::string_view>()
-		| std::ranges::to<std::vector>();
+		| std::ranges::to<std::vector>());
 }
 
 /*
@@ -283,7 +285,7 @@ __const_nv_list::get_string_array(std::string_view key) const
 bool
 __const_nv_list::exists_nvlist(std::string_view key) const
 {
-	return nvlist_exists_nvlist(__m_nv, std::string(key).c_str());
+	return (::nvlist_exists_nvlist(__m_nv, std::string(key).c_str()));
 }
 
 const_nv_list
@@ -295,13 +297,14 @@ __const_nv_list::get_nvlist(std::string_view key) const
 		throw nv_key_not_found(skey);
 
 	auto nvl = ::nvlist_get_nvlist(__m_nv, skey.c_str());
-	return const_nv_list(nvl);
+	return (const_nv_list(nvl));
 }
 
 bool
 __const_nv_list::exists_nvlist_array(std::string_view key) const
 {
-	return nvlist_exists_nvlist_array(__m_nv, std::string(key).c_str());
+	return (::nvlist_exists_nvlist_array(__m_nv,
+					     std::string(key).c_str()));
 }
 
 std::vector<const_nv_list>
@@ -330,7 +333,7 @@ __const_nv_list::get_descriptor(std::string_view key) const
 	if (!::nvlist_exists_descriptor(__m_nv, skey.c_str()))
 		throw nv_key_not_found(skey);
 
-	return ::nvlist_get_descriptor(__m_nv, skey.c_str());
+	return (::nvlist_get_descriptor(__m_nv, skey.c_str()));
 }
 
 std::span<int const>
@@ -350,14 +353,14 @@ __const_nv_list::get_descriptor_array(std::string_view key) const
 bool
 __const_nv_list::exists_descriptor(std::string_view key) const
 {
-	return ::nvlist_exists_descriptor(__m_nv, std::string(key).c_str());
+	return (::nvlist_exists_descriptor(__m_nv, std::string(key).c_str()));
 }
 
 bool
 __const_nv_list::exists_descriptor_array(std::string_view key) const
 {
-	return ::nvlist_exists_descriptor_array(__m_nv,
-						std::string(key).c_str());
+	return (::nvlist_exists_descriptor_array(__m_nv,
+						 std::string(key).c_str()));
 }
 
 /*
@@ -367,7 +370,7 @@ __const_nv_list::exists_descriptor_array(std::string_view key) const
 bool
 __const_nv_list::exists_binary(std::string_view key) const
 {
-	return ::nvlist_exists_binary(__m_nv, std::string(key).c_str());
+	return (::nvlist_exists_binary(__m_nv, std::string(key).c_str()));
 }
 
 std::span<std::byte const>
diff --git a/libnvxx/nv_list.cc b/libnvxx/nv_list.cc
index 742ac0e..c66c08f 100644
--- a/libnvxx/nv_list.cc
+++ b/libnvxx/nv_list.cc
@@ -65,7 +65,7 @@ nv_list::operator=(nv_list const &other)
 		__m_owning = __detail::__nvlist_owning::__owning;
 	}
 
-	return *this;
+	return (*this);
 }
 
 nv_list &
@@ -76,25 +76,25 @@ nv_list::operator=(nv_list &&other) noexcept
 		__m_owning = __detail::__nvlist_owning::__owning;
 	}
 
-	return *this;
+	return (*this);
 }
 
 ::nvlist_t *
 nv_list::ptr()
 {
-	return __m_nv;
+	return (__m_nv);
 }
 
 ::nvlist_t const *
 nv_list::ptr() const
 {
-	return __m_nv;
+	return (__m_nv);
 }
 
 ::nvlist_t *
 nv_list::release() &&
 {
-	return std::exchange(__m_nv, nullptr);
+	return (std::exchange(__m_nv, nullptr));
 }
 
 nv_list
@@ -104,7 +104,7 @@ nv_list::unpack(std::span<std::byte> data, int flags)
 				      std::ranges::size(data),
 				      flags);
 	    nv != nullptr) {
-		return nv_list(nv);
+		return (nv_list(nv));
 	}
 
 	throw std::system_error(
@@ -115,7 +115,7 @@ nv_list
 nv_list::recv(int fd, int flags)
 {
 	if (auto *nv = ::nvlist_recv(fd, flags); nv != nullptr)
-		return nv_list(nv);
+		return (nv_list(nv));
 
 	throw std::system_error(
 		std::error_code(errno, std::system_category()));
@@ -128,7 +128,7 @@ nv_list::xfer(int fd, nv_list &&nvl, int flags)
 	    nv != nullptr) {
 		// nvlist_xfer destroys the original list
 		nvl.__m_nv = nullptr;
-		return nv_list(nv);
+		return (nv_list(nv));
 	}
 
 	throw std::system_error(
@@ -149,7 +149,7 @@ __nv_list::set_error(int error) noexcept
 
 __nv_list::operator const_nv_list() const
 {
-	return const_nv_list(__m_nv);
+	return (const_nv_list(__m_nv));
 }
 
 void
@@ -237,7 +237,7 @@ __nv_list::take_bool(std::string_view key)
 	if (!::nvlist_exists_bool(__m_nv, skey.c_str()))
 		throw nv_key_not_found(skey);
 
-	return ::nvlist_take_bool(__m_nv, skey.c_str());
+	return (::nvlist_take_bool(__m_nv, skey.c_str()));
 }
 
 void
@@ -252,7 +252,7 @@ __nv_list::take_bool_array(std::string_view key)
 	auto nitems = std::size_t{};
 	auto ptr = __ptr_guard(::nvlist_take_bool_array(
 			__m_nv, std::string(key).c_str(), &nitems));
-	return std::vector<bool>(ptr.__ptr, ptr.__ptr + nitems);
+	return (std::vector<bool>(ptr.__ptr, ptr.__ptr + nitems));
 }
 
 void
@@ -334,7 +334,7 @@ __nv_list::take_number(std::string_view key)
 	if (!::nvlist_exists_number(__m_nv, skey.c_str()))
 		throw nv_key_not_found(skey);
 
-	return ::nvlist_take_number(__m_nv, skey.c_str());
+	return (::nvlist_take_number(__m_nv, skey.c_str()));
 }
 
 void
@@ -440,7 +440,7 @@ __nv_list::take_string(std::string_view key)
 	if (!::nvlist_exists_string(__m_nv, skey.c_str()))
 		throw nv_key_not_found(skey);
 
-	return nvlist_take_string(__m_nv, skey.c_str());
+	return (::nvlist_take_string(__m_nv, skey.c_str()));
 }
 
 void
@@ -507,9 +507,9 @@ __nv_list::take_string_array(std::string_view key)
 	auto nitems = std::size_t{};
 	auto *data = nvlist_take_string_array(__m_nv, std::string(key).c_str(),
 					      &nitems);
-	return std::span(data, data + nitems)
+	return (std::span(data, data + nitems)
 		| construct<std::string>()
-		| std::ranges::to<std::vector>();
+		| std::ranges::to<std::vector>());
 }
 
 void
@@ -566,7 +566,7 @@ __nv_list::take_nvlist(std::string_view key)
 		throw nv_key_not_found(skey);
 
 	auto nvl = nvlist_take_nvlist(__m_nv, skey.c_str());
-	return nv_list(nvl);
+	return (nv_list(nvl));
 }
 
 void
@@ -615,8 +615,8 @@ __nv_list::add_nvlist_array(std::string_view key,
 		| std::views::transform(&nv_list::__m_nv)
 		| std::ranges::to<std::vector>();
 
-	nvlist_add_nvlist_array(__m_nv, skey.c_str(),
-				ptrs.data(), ptrs.size());
+	::nvlist_add_nvlist_array(__m_nv, skey.c_str(),
+				  ptrs.data(), ptrs.size());
 
 	switch (auto err = ::nvlist_error(__m_nv)) {
 	case 0:
@@ -673,7 +673,7 @@ __nv_list::free_nvlist_array(std::string_view key)
 int
 __nv_list::take_descriptor(std::string_view key)
 {
-	return ::nvlist_take_descriptor(__m_nv, std::string(key).c_str());
+	return (::nvlist_take_descriptor(__m_nv, std::string(key).c_str()));
 }
 
 void
diff --git a/libnvxx/nvxx_base.h b/libnvxx/nvxx_base.h
index de62d62..da2978b 100644
--- a/libnvxx/nvxx_base.h
+++ b/libnvxx/nvxx_base.h
@@ -631,7 +631,7 @@ struct nv_list final
 	[[nodiscard]] static nv_list
 		unpack(_Range const &__data, int __flags = 0)
 	{
-		return unpack(std::span<std::byte>(__data), __flags);
+		return (unpack(std::span<std::byte>(__data), __flags));
 	}
 
 	/*
diff --git a/libnvxx/nvxx_iterator.cc b/libnvxx/nvxx_iterator.cc
index 8f40d4f..e289f98 100644
--- a/libnvxx/nvxx_iterator.cc
+++ b/libnvxx/nvxx_iterator.cc
@@ -10,13 +10,13 @@ namespace bsd {
 nv_list_iterator
 begin(const_nv_list const &nvl)
 {
-	return nv_list_iterator(nvl);
+	return (nv_list_iterator(nvl));
 }
 
 nv_list_iterator
 begin(nv_list const &nvl)
 {
-	return nv_list_iterator(nvl);
+	return (nv_list_iterator(nvl));
 }
 
 std::default_sentinel_t
@@ -51,7 +51,7 @@ nv_list_iterator &
 nv_list_iterator::operator++()
 {
 	__advance();
-	return *this;
+	return (*this);
 }
 
 nv_list_iterator
@@ -59,32 +59,32 @@ nv_list_iterator::operator++(int)
 {
 	nv_list_iterator tmp = *this;
 	++(*this);
-	return tmp;
+	return (tmp);
 }
 
 bool
 nv_list_iterator::operator==(nv_list_iterator const &other) const
 {
-	return (__nvlist == other.__nvlist)
-		&& (__cookie == other.__cookie);
+	return ((__nvlist == other.__nvlist)
+		&& (__cookie == other.__cookie));
 }
 
 bool
 nv_list_iterator::operator==(std::default_sentinel_t) const 
 {
-	return __cookie == nullptr;
+	return (__cookie == nullptr);
 }
 
 nv_list_iterator::const_reference
 nv_list_iterator::operator*() const
 {
-	return __current;
+	return (__current);
 }
 
 nv_list_iterator::const_pointer
 nv_list_iterator::operator->() const
 {
-	return &__current;
+	return (&__current);
 }
 
 void
@@ -160,7 +160,7 @@ nv_list_iterator::__advance()
 		auto vector =
 			span
 			| std::views::transform([] (char const *ptr) {
-				return std::string_view(ptr);
+				return (std::string_view(ptr));
 			})
 			| std::ranges::to<std::vector>();
 		__current = std::make_pair(name, vector);
@@ -182,7 +182,7 @@ nv_list_iterator::__advance()
 		auto vector =
 			span
 			| std::views::transform([] (::nvlist_t const *ptr) {
-				return const_nv_list(ptr);
+				return (const_nv_list(ptr));
 			})
 			| std::ranges::to<std::vector>();
 		__current = std::make_pair(name, vector);
diff --git a/libnvxx/nvxx_serialize.h b/libnvxx/nvxx_serialize.h
index f93b191..39a09fd 100644
--- a/libnvxx/nvxx_serialize.h
+++ b/libnvxx/nvxx_serialize.h
@@ -79,7 +79,7 @@ struct nv_decoder<bool> {
 template<__detail::__from_range_container_of<bool> _C>
 struct nv_decoder<_C> {
 	auto decode(const_nv_list const &__nvl, std::string_view __key) -> _C {
-		return _C(std::from_range, __nvl.get_bool_array(__key));
+		return (_C(std::from_range, __nvl.get_bool_array(__key)));
 	}
 };
 
@@ -106,7 +106,7 @@ struct nv_decoder<std::uint64_t> {
 template<__detail::__from_range_container_of<std::uint64_t> _C>
 struct nv_decoder<_C> {
 	auto decode(const_nv_list const &__nvl, std::string_view __key) -> _C {
-		return _C(std::from_range, __nvl.get_number_array(__key));
+		return (_C(std::from_range, __nvl.get_number_array(__key)));
 	}
 };
 
@@ -123,7 +123,7 @@ struct nv_encoder<_R> {
 	void encode(nv_list &__nvl, std::string_view __key, _U &&__range) {
 		__nvl.add_string_range(__key,
 		       __range | std::views::transform([] (auto const &__s) {
-			       return std::string_view(__s);
+			       return (std::string_view(__s));
 		       }));
 	}
 };
@@ -136,11 +136,11 @@ struct nv_decoder<std::string> {
 template<__detail::__from_range_container_of<std::string> _C>
 struct nv_decoder<_C> {
 	auto decode(const_nv_list const &__nvl, std::string_view __key) -> _C {
-		return _C(std::from_range,
+		return (_C(std::from_range,
 			  __nvl.get_string_array(__key)
 			  | std::views::transform([] (auto const &__s) {
 				  return std::string(__s);
-			  }));
+			  })));
 	}
 };
 
@@ -168,7 +168,7 @@ struct nv_decoder<std::string_view> {
 template<__detail::__from_range_container_of<std::string_view> _C>
 struct nv_decoder<_C> {
 	auto decode(const_nv_list const &__nvl, std::string_view __key) -> _C {
-		return _C(std::from_range, __nvl.get_string_array(__key));
+		return (_C(std::from_range, __nvl.get_string_array(__key)));
 	}
 };
 
@@ -197,11 +197,11 @@ struct nv_decoder<nv_list> {
 template<__detail::__from_range_container_of<nv_list> _C>
 struct nv_decoder<_C> {
 	auto decode(const_nv_list const &__nvl, std::string_view __key) -> _C {
-		return _C(std::from_range,
+		return (_C(std::from_range,
 			  __nvl.get_nvlist_array(__key)
 			  | std::views::transform([] (auto const &__s) {
 				  return nv_list(__s);
-			  }));
+			  })));
 	}
 };
 
@@ -230,7 +230,7 @@ struct nv_decoder<const_nv_list> {
 template<__detail::__from_range_container_of<const_nv_list> _C>
 struct nv_decoder<_C> {
 	auto decode(const_nv_list const &__nvl, std::string_view __key) -> _C {
-		return _C(std::from_range, __nvl.get_nvlist_array(__key));
+		return (_C(std::from_range, __nvl.get_nvlist_array(__key)));
 	}
 };
 
@@ -318,14 +318,14 @@ template<typename _Object, typename _M1, typename _M2>
 auto operator>> (nv_field<_Object, _M1> const &__f1,
 		 nv_field<_Object, _M2> const &__f2)
 {
-	return __detail::__field_sequence(__f1, __f2);
+	return (__detail::__field_sequence(__f1, __f2));
 }
 
 template<typename _Object, typename _M, typename __first, typename __second>
 auto operator>> (__detail::__field_sequence<__first, __second> const &__f1,
 		 nv_field<_Object, _M> const &__f2)
 {
-	return __detail::__field_sequence(__f1, __f2);
+	return (__detail::__field_sequence(__f1, __f2));
 }
 
 template<typename _Object, typename _Member>
@@ -343,7 +343,7 @@ auto nv_serialize(_T &&__o) -> nv_list
 	auto __nvl = nv_list();
 
 	__schema.serialize(__nvl, __o);
-	return __nvl;
+	return (__nvl);
 }
 
 template<typename _Object>
diff --git a/libnvxx/nvxx_util.h b/libnvxx/nvxx_util.h
index 5ab7247..602c30a 100644
--- a/libnvxx/nvxx_util.h
+++ b/libnvxx/nvxx_util.h
@@ -27,7 +27,7 @@ struct __ptr_guard {
 
 template<typename T>
 auto construct = std::views::transform([] (auto &&value) {
-	return T(std::forward<decltype(value)>(value));
+	return (T(std::forward<decltype(value)>(value)));
 });
 
 } // namespace bsd::__detail
diff --git a/libnvxx/tests/nvxx_basic.cc b/libnvxx/tests/nvxx_basic.cc
index bab9736..bb4debb 100644
--- a/libnvxx/tests/nvxx_basic.cc
+++ b/libnvxx/tests/nvxx_basic.cc
@@ -385,7 +385,7 @@ TEST_CASE(nvxx_add_bool_contig_range)
 
 // a literal operator to create std::uint64_ts
 constexpr std::uint64_t operator"" _u64(unsigned long long v) {
-	return static_cast<std::uint64_t>(v);
+	return (static_cast<std::uint64_t>(v));
 }
 
 TEST_CASE(nvxx_add_number)
diff --git a/libnvxx/tests/nvxx_serialize.cc b/libnvxx/tests/nvxx_serialize.cc
index 08823cb..9d1f219 100644
--- a/libnvxx/tests/nvxx_serialize.cc
+++ b/libnvxx/tests/nvxx_serialize.cc
@@ -188,9 +188,9 @@ struct object {
 template<>
 struct bsd::nv_schema<::object> {
 	auto get() {
-		return	bsd::nv_field("int value", &object::int_value)
+		return	(bsd::nv_field("int value", &object::int_value)
 			>> bsd::nv_field("string value", &object::string_value)
-			>> bsd::nv_field("array value", &object::array_value);
+			>> bsd::nv_field("array value", &object::array_value));
 	}
 };