TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Switch multi_process_bigdata to use inttypes format macros

Browse source 
Most 64-bit systems use `unsigned long` for `uint_fast32_t`.  Some
32-bit systems use `unsigned int` for `uint_fast32_t`.  To handle this,
multi_process_bigdata used casts to `unsigned long` and a format string
of `%lu`.  Switch to inttypes format macros so that the format strings
are correct without requiring a cast to handle systems where
`uint_fast32_t` is not `unsigned long`.
This commit is contained in:
Kp 2016-08-19 03:41:41 +00:00
parent 9be68f4e99
commit b9399c5048
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
similar/main/multi.cpp
View file

@ -2434,7 +2434,7 @@ static void multi_reset_object_texture(object_base &objp)
}
void multi_process_bigdata(const playernum_t pnum, const ubyte *buf, uint_fast32_t len)
void multi_process_bigdata(const playernum_t pnum, const ubyte *const buf, const uint_fast32_t len)
{
// Takes a bunch of messages, check them for validity,
// and pass them to multi_process_data.
@ -2442,19 +2442,19 @@ void multi_process_bigdata(const playernum_t pnum, const ubyte *buf, uint_fast32
uint_fast32_t bytes_processed = 0;
while( bytes_processed < len ) {
uint_fast32_t type = buf[bytes_processed];
const uint_fast32_t type = buf[bytes_processed];
if ( (type>= sizeof(message_length)/sizeof(message_length[0])))
{
con_printf( CON_DEBUG,"multi_process_bigdata: Invalid packet type %lu!", static_cast<unsigned long>(type));
con_printf(CON_DEBUG, "multi_process_bigdata: Invalid packet type %" PRIuFAST32 "!", type);
return;
}
uint_fast32_t sub_len = message_length[type];
const uint_fast32_t sub_len = message_length[type];
Assert(sub_len > 0);
if ( (bytes_processed+sub_len) > len ) {
con_printf(CON_DEBUG, "multi_process_bigdata: packet type %u too short (%lu>%lu)!", static_cast<unsigned>(type), static_cast<unsigned long>(bytes_processed+sub_len), static_cast<unsigned long>(len));
con_printf(CON_DEBUG, "multi_process_bigdata: packet type %" PRIuFAST32 " too short (%" PRIuFAST32 " > %" PRIuFAST32 ")!", type, bytes_processed + sub_len, len);
Int3();
return;
}