Skip to content

Commit

Permalink
Merge pull request #127 from joto/clang-tidy-fixes
Browse files Browse the repository at this point in the history 
Various fixes for stuff found by clang-tidy
  • Loading branch information
@joto
joto authored Jan 7, 2025
2 parents 7fecbaa + a1ecc6f commit 99e6f67
Show file tree
Hide file tree
Showing 10 changed files with 82 additions and 80 deletions.
56 changes: 28 additions & 28 deletions include/protozero/basic_pbf_writer.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class basic_pbf_writer {

void add_field(pbf_tag_type tag, pbf_wire_type type) {
protozero_assert(((tag > 0 && tag < 19000) || (tag > 19999 && tag <= ((1U << 29U) - 1))) && "tag out of range");
const uint32_t b = (tag << 3U) | uint32_t(type);
const uint32_t b = (tag << 3U) | static_cast<uint32_t>(type);
add_varint(b);
}

Expand All @@ -105,7 +105,7 @@ class basic_pbf_writer {
}

template <typename T, typename It>
void add_packed_fixed(pbf_tag_type tag, It first, It last, std::input_iterator_tag /*unused*/) {
void add_packed_fixed(pbf_tag_type tag, It first, It last, std::input_iterator_tag /*unused*/) { // NOLINT(performance-unnecessary-value-param)
if (first == last) {
return;
}
Expand All @@ -118,7 +118,7 @@ class basic_pbf_writer {
}

template <typename T, typename It>
void add_packed_fixed(pbf_tag_type tag, It first, It last, std::forward_iterator_tag /*unused*/) {
void add_packed_fixed(pbf_tag_type tag, It first, It last, std::forward_iterator_tag /*unused*/) { // NOLINT(performance-unnecessary-value-param)
if (first == last) {
return;
}
Expand All @@ -133,7 +133,7 @@ class basic_pbf_writer {
}

template <typename It>
void add_packed_varint(pbf_tag_type tag, It first, It last) {
void add_packed_varint(pbf_tag_type tag, It first, It last) { // NOLINT(performance-unnecessary-value-param)
if (first == last) {
return;
}
Expand All @@ -146,7 +146,7 @@ class basic_pbf_writer {
}

template <typename It>
void add_packed_svarint(pbf_tag_type tag, It first, It last) {
void add_packed_svarint(pbf_tag_type tag, It first, It last) { // NOLINT(performance-unnecessary-value-param)
if (first == last) {
return;
}
Expand All @@ -162,7 +162,7 @@ class basic_pbf_writer {
// a length-delimited field. The length has to fit into pbf_length_type,
// and a varint needs 8 bit for every 7 bit.
enum : int {
reserve_bytes = sizeof(pbf_length_type) * 8 / 7 + 1
reserve_bytes = (sizeof(pbf_length_type) * 8 / 7) + 1
};

// If m_rollpack_pos is set to this special value, it means that when
Expand All @@ -181,7 +181,7 @@ class basic_pbf_writer {
buffer_customization<TBuffer>::append_zeros(m_data, std::size_t(reserve_bytes));
} else {
m_rollback_pos = size_is_known;
add_length_varint(tag, pbf_length_type(size));
add_length_varint(tag, static_cast<pbf_length_type>(size));
reserve(size);
}
m_pos = buffer_customization<TBuffer>::size(m_data);
Expand Down Expand Up @@ -391,7 +391,7 @@ class basic_pbf_writer {
add_field(tag, pbf_wire_type::varint);
protozero_assert(m_pos == 0 && "you can't add fields to a parent basic_pbf_writer if there is an existing basic_pbf_writer for a submessage");
protozero_assert(m_data);
m_data->push_back(char(value));
m_data->push_back(static_cast<char>(value));
}

/**
Expand All @@ -401,7 +401,7 @@ class basic_pbf_writer {
* @param value Value to be written
*/
void add_enum(pbf_tag_type tag, int32_t value) {
add_tagged_varint(tag, uint64_t(value));
add_tagged_varint(tag, static_cast<uint64_t>(value));
}

/**
Expand All @@ -411,7 +411,7 @@ class basic_pbf_writer {
* @param value Value to be written
*/
void add_int32(pbf_tag_type tag, int32_t value) {
add_tagged_varint(tag, uint64_t(value));
add_tagged_varint(tag, static_cast<uint64_t>(value));
}

/**
Expand Down Expand Up @@ -441,7 +441,7 @@ class basic_pbf_writer {
* @param value Value to be written
*/
void add_int64(pbf_tag_type tag, int64_t value) {
add_tagged_varint(tag, uint64_t(value));
add_tagged_varint(tag, static_cast<uint64_t>(value));
}

/**
Expand Down Expand Up @@ -541,7 +541,7 @@ class basic_pbf_writer {
protozero_assert(m_pos == 0 && "you can't add fields to a parent basic_pbf_writer if there is an existing basic_pbf_writer for a submessage");
protozero_assert(m_data);
protozero_assert(size <= std::numeric_limits<pbf_length_type>::max());
add_length_varint(tag, pbf_length_type(size));
add_length_varint(tag, static_cast<pbf_length_type>(size));
buffer_customization<TBuffer>::append(m_data, value, size);
}

Expand Down Expand Up @@ -602,7 +602,7 @@ class basic_pbf_writer {
size_t sum_size = 0;
(void)std::initializer_list<size_t>{sum_size += values.size()...};
protozero_assert(sum_size <= std::numeric_limits<pbf_length_type>::max());
add_length_varint(tag, pbf_length_type(sum_size));
add_length_varint(tag, static_cast<pbf_length_type>(sum_size));
buffer_customization<TBuffer>::reserve_additional(m_data, sum_size);
(void)std::initializer_list<int>{(buffer_customization<TBuffer>::append(m_data, values.data(), values.size()), 0)...};
}
Expand Down Expand Up @@ -697,7 +697,7 @@ class basic_pbf_writer {
* @param last Iterator pointing one past the end of data
*/
template <typename InputIterator>
void add_packed_bool(pbf_tag_type tag, InputIterator first, InputIterator last) {
void add_packed_bool(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
add_packed_varint(tag, first, last);
}

Expand All @@ -711,7 +711,7 @@ class basic_pbf_writer {
* @param last Iterator pointing one past the end of data
*/
template <typename InputIterator>
void add_packed_enum(pbf_tag_type tag, InputIterator first, InputIterator last) {
void add_packed_enum(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
add_packed_varint(tag, first, last);
}

Expand All @@ -725,7 +725,7 @@ class basic_pbf_writer {
* @param last Iterator pointing one past the end of data
*/
template <typename InputIterator>
void add_packed_int32(pbf_tag_type tag, InputIterator first, InputIterator last) {
void add_packed_int32(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
add_packed_varint(tag, first, last);
}

Expand All @@ -739,7 +739,7 @@ class basic_pbf_writer {
* @param last Iterator pointing one past the end of data
*/
template <typename InputIterator>
void add_packed_sint32(pbf_tag_type tag, InputIterator first, InputIterator last) {
void add_packed_sint32(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
add_packed_svarint(tag, first, last);
}

Expand All @@ -753,7 +753,7 @@ class basic_pbf_writer {
* @param last Iterator pointing one past the end of data
*/
template <typename InputIterator>
void add_packed_uint32(pbf_tag_type tag, InputIterator first, InputIterator last) {
void add_packed_uint32(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
add_packed_varint(tag, first, last);
}

Expand All @@ -767,7 +767,7 @@ class basic_pbf_writer {
* @param last Iterator pointing one past the end of data
*/
template <typename InputIterator>
void add_packed_int64(pbf_tag_type tag, InputIterator first, InputIterator last) {
void add_packed_int64(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
add_packed_varint(tag, first, last);
}

Expand All @@ -781,7 +781,7 @@ class basic_pbf_writer {
* @param last Iterator pointing one past the end of data
*/
template <typename InputIterator>
void add_packed_sint64(pbf_tag_type tag, InputIterator first, InputIterator last) {
void add_packed_sint64(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
add_packed_svarint(tag, first, last);
}

Expand All @@ -795,7 +795,7 @@ class basic_pbf_writer {
* @param last Iterator pointing one past the end of data
*/
template <typename InputIterator>
void add_packed_uint64(pbf_tag_type tag, InputIterator first, InputIterator last) {
void add_packed_uint64(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
add_packed_varint(tag, first, last);
}

Expand All @@ -817,7 +817,7 @@ class basic_pbf_writer {
* @param last Iterator pointing one past the end of data
*/
template <typename ValueType, typename InputIterator>
void add_packed_fixed(pbf_tag_type tag, InputIterator first, InputIterator last) {
void add_packed_fixed(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
static_assert(std::is_same<ValueType, uint32_t>::value ||
std::is_same<ValueType, int32_t>::value ||
std::is_same<ValueType, int64_t>::value ||
Expand All @@ -838,7 +838,7 @@ class basic_pbf_writer {
* @param last Iterator pointing one past the end of data
*/
template <typename InputIterator>
void add_packed_fixed32(pbf_tag_type tag, InputIterator first, InputIterator last) {
void add_packed_fixed32(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
add_packed_fixed<uint32_t, InputIterator>(tag, first, last,
typename std::iterator_traits<InputIterator>::iterator_category{});
}
Expand All @@ -853,7 +853,7 @@ class basic_pbf_writer {
* @param last Iterator pointing one past the end of data
*/
template <typename InputIterator>
void add_packed_sfixed32(pbf_tag_type tag, InputIterator first, InputIterator last) {
void add_packed_sfixed32(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
add_packed_fixed<int32_t, InputIterator>(tag, first, last,
typename std::iterator_traits<InputIterator>::iterator_category{});
}
Expand All @@ -868,7 +868,7 @@ class basic_pbf_writer {
* @param last Iterator pointing one past the end of data
*/
template <typename InputIterator>
void add_packed_fixed64(pbf_tag_type tag, InputIterator first, InputIterator last) {
void add_packed_fixed64(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
add_packed_fixed<uint64_t, InputIterator>(tag, first, last,
typename std::iterator_traits<InputIterator>::iterator_category{});
}
Expand All @@ -883,7 +883,7 @@ class basic_pbf_writer {
* @param last Iterator pointing one past the end of data
*/
template <typename InputIterator>
void add_packed_sfixed64(pbf_tag_type tag, InputIterator first, InputIterator last) {
void add_packed_sfixed64(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
add_packed_fixed<int64_t, InputIterator>(tag, first, last,
typename std::iterator_traits<InputIterator>::iterator_category{});
}
Expand All @@ -898,7 +898,7 @@ class basic_pbf_writer {
* @param last Iterator pointing one past the end of data
*/
template <typename InputIterator>
void add_packed_float(pbf_tag_type tag, InputIterator first, InputIterator last) {
void add_packed_float(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
add_packed_fixed<float, InputIterator>(tag, first, last,
typename std::iterator_traits<InputIterator>::iterator_category{});
}
Expand All @@ -913,7 +913,7 @@ class basic_pbf_writer {
* @param last Iterator pointing one past the end of data
*/
template <typename InputIterator>
void add_packed_double(pbf_tag_type tag, InputIterator first, InputIterator last) {
void add_packed_double(pbf_tag_type tag, InputIterator first, InputIterator last) { // NOLINT(performance-unnecessary-value-param)
add_packed_fixed<double, InputIterator>(tag, first, last,
typename std::iterator_traits<InputIterator>::iterator_category{});
}
Expand Down
4 changes: 2 additions & 2 deletions include/protozero/data_view.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ inline void swap(data_view& lhs, data_view& rhs) noexcept {
* @param lhs First object.
* @param rhs Second object.
*/
inline constexpr bool operator==(const data_view lhs, const data_view rhs) noexcept {
constexpr bool operator==(const data_view lhs, const data_view rhs) noexcept {
return lhs.size() == rhs.size() &&
std::equal(lhs.data(), lhs.data() + lhs.size(), rhs.data());
}
Expand All @@ -185,7 +185,7 @@ inline constexpr bool operator==(const data_view lhs, const data_view rhs) noexc
* @param lhs First object.
* @param rhs Second object.
*/
inline constexpr bool operator!=(const data_view lhs, const data_view rhs) noexcept {
constexpr bool operator!=(const data_view lhs, const data_view rhs) noexcept {
return !(lhs == rhs);
}

Expand Down
4 changes: 2 additions & 2 deletions include/protozero/pbf_reader.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ class pbf_reader {
* and how it is encoded for this number to have any meaning.
*/
std::size_t length() const noexcept {
return std::size_t(m_end - m_data);
return static_cast<std::size_t>(m_end - m_data);
}

/**
Expand All @@ -287,7 +287,7 @@ class pbf_reader {
}

const auto value = get_varint<uint32_t>();
m_tag = pbf_tag_type(value >> 3U);
m_tag = static_cast<pbf_tag_type>(value >> 3U);

// tags 0 and 19000 to 19999 are not allowed as per
// https://developers.google.com/protocol-buffers/docs/proto#assigning-tags
Expand Down
2 changes: 1 addition & 1 deletion include/protozero/types.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ enum class pbf_wire_type : uint32_t {
* See pbf_reader.tag_and_type() for an example how to use this.
*/
template <typename T>
constexpr inline uint32_t tag_and_type(T tag, pbf_wire_type wire_type) noexcept {
constexpr uint32_t tag_and_type(T tag, pbf_wire_type wire_type) noexcept {
return (static_cast<uint32_t>(static_cast<pbf_tag_type>(tag)) << 3U) | static_cast<uint32_t>(wire_type);
}

Expand Down
Loading

0 comments on commit 99e6f67

Please sign in to comment.