Skip to content

Commit fa5d2e6

Browse files
author
MarcoFalke
committed
Remove unused char serialize
1 parent fa24493 commit fa5d2e6

File tree

4 files changed

+6
-13
lines changed

4 files changed

+6
-13
lines changed

src/serialize.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ template<typename X> const X& ReadWriteAsHelper(const X& x) { return x; }
189189
FORMATTER_METHODS(cls, obj)
190190

191191
#ifndef CHAR_EQUALS_INT8
192-
template<typename Stream> inline void Serialize(Stream& s, char a ) { ser_writedata8(s, a); } // TODO Get rid of bare char
192+
template <typename Stream> void Serialize(Stream&, char) = delete; // char serialization forbidden. Use uint8_t or int8_t
193193
#endif
194194
template<typename Stream> inline void Serialize(Stream& s, int8_t a ) { ser_writedata8(s, a); }
195195
template<typename Stream> inline void Serialize(Stream& s, uint8_t a ) { ser_writedata8(s, a); }
@@ -205,7 +205,7 @@ template<typename Stream> inline void Serialize(Stream& s, const Span<const unsi
205205
template<typename Stream> inline void Serialize(Stream& s, const Span<unsigned char>& span) { s.write(AsBytes(span)); }
206206

207207
#ifndef CHAR_EQUALS_INT8
208-
template<typename Stream> inline void Unserialize(Stream& s, char& a ) { a = ser_readdata8(s); } // TODO Get rid of bare char
208+
template <typename Stream> void Unserialize(Stream&, char) = delete; // char serialization forbidden. Use uint8_t or int8_t
209209
#endif
210210
template<typename Stream> inline void Unserialize(Stream& s, int8_t& a ) { a = ser_readdata8(s); }
211211
template<typename Stream> inline void Unserialize(Stream& s, uint8_t& a ) { a = ser_readdata8(s); }

src/test/fuzz/integer.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -205,11 +205,6 @@ FUZZ_TARGET_INIT(integer, initialize_integer)
205205
stream >> deserialized_i8;
206206
assert(i8 == deserialized_i8 && stream.empty());
207207

208-
char deserialized_ch;
209-
stream << ch;
210-
stream >> deserialized_ch;
211-
assert(ch == deserialized_ch && stream.empty());
212-
213208
bool deserialized_b;
214209
stream << b;
215210
stream >> deserialized_b;

src/test/fuzz/util.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,6 @@ void WriteToStream(FuzzedDataProvider& fuzzed_data_provider, Stream& stream) noe
339339
CallOneOf(
340340
fuzzed_data_provider,
341341
WRITE_TO_STREAM_CASE(bool, fuzzed_data_provider.ConsumeBool()),
342-
WRITE_TO_STREAM_CASE(char, fuzzed_data_provider.ConsumeIntegral<char>()),
343342
WRITE_TO_STREAM_CASE(int8_t, fuzzed_data_provider.ConsumeIntegral<int8_t>()),
344343
WRITE_TO_STREAM_CASE(uint8_t, fuzzed_data_provider.ConsumeIntegral<uint8_t>()),
345344
WRITE_TO_STREAM_CASE(int16_t, fuzzed_data_provider.ConsumeIntegral<int16_t>()),
@@ -349,7 +348,7 @@ void WriteToStream(FuzzedDataProvider& fuzzed_data_provider, Stream& stream) noe
349348
WRITE_TO_STREAM_CASE(int64_t, fuzzed_data_provider.ConsumeIntegral<int64_t>()),
350349
WRITE_TO_STREAM_CASE(uint64_t, fuzzed_data_provider.ConsumeIntegral<uint64_t>()),
351350
WRITE_TO_STREAM_CASE(std::string, fuzzed_data_provider.ConsumeRandomLengthString(32)),
352-
WRITE_TO_STREAM_CASE(std::vector<char>, ConsumeRandomLengthIntegralVector<char>(fuzzed_data_provider)));
351+
WRITE_TO_STREAM_CASE(std::vector<uint8_t>, ConsumeRandomLengthIntegralVector<uint8_t>(fuzzed_data_provider)));
353352
} catch (const std::ios_base::failure&) {
354353
break;
355354
}
@@ -369,7 +368,6 @@ void ReadFromStream(FuzzedDataProvider& fuzzed_data_provider, Stream& stream) no
369368
CallOneOf(
370369
fuzzed_data_provider,
371370
READ_FROM_STREAM_CASE(bool),
372-
READ_FROM_STREAM_CASE(char),
373371
READ_FROM_STREAM_CASE(int8_t),
374372
READ_FROM_STREAM_CASE(uint8_t),
375373
READ_FROM_STREAM_CASE(int16_t),
@@ -379,7 +377,7 @@ void ReadFromStream(FuzzedDataProvider& fuzzed_data_provider, Stream& stream) no
379377
READ_FROM_STREAM_CASE(int64_t),
380378
READ_FROM_STREAM_CASE(uint64_t),
381379
READ_FROM_STREAM_CASE(std::string),
382-
READ_FROM_STREAM_CASE(std::vector<char>));
380+
READ_FROM_STREAM_CASE(std::vector<uint8_t>));
383381
} catch (const std::ios_base::failure&) {
384382
break;
385383
}

src/test/serialize_tests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class CSerializeMethodsTestMany : public CSerializeMethodsTestSingle
6161

6262
BOOST_AUTO_TEST_CASE(sizes)
6363
{
64-
BOOST_CHECK_EQUAL(sizeof(char), GetSerializeSize(char(0), 0));
64+
BOOST_CHECK_EQUAL(sizeof(unsigned char), GetSerializeSize((unsigned char)0, 0));
6565
BOOST_CHECK_EQUAL(sizeof(int8_t), GetSerializeSize(int8_t(0), 0));
6666
BOOST_CHECK_EQUAL(sizeof(uint8_t), GetSerializeSize(uint8_t(0), 0));
6767
BOOST_CHECK_EQUAL(sizeof(int16_t), GetSerializeSize(int16_t(0), 0));
@@ -74,7 +74,7 @@ BOOST_AUTO_TEST_CASE(sizes)
7474
BOOST_CHECK_EQUAL(sizeof(uint8_t), GetSerializeSize(bool(0), 0));
7575

7676
// Sanity-check GetSerializeSize and c++ type matching
77-
BOOST_CHECK_EQUAL(GetSerializeSize(char(0), 0), 1U);
77+
BOOST_CHECK_EQUAL(GetSerializeSize((unsigned char)0, 0), 1U);
7878
BOOST_CHECK_EQUAL(GetSerializeSize(int8_t(0), 0), 1U);
7979
BOOST_CHECK_EQUAL(GetSerializeSize(uint8_t(0), 0), 1U);
8080
BOOST_CHECK_EQUAL(GetSerializeSize(int16_t(0), 0), 2U);

0 commit comments

Comments
 (0)