Codechange: automatic adding of _t to (u)int types, and WChar to char32_t

for i in `find src -type f|grep -v 3rdparty/fmt|grep -v 3rdparty/catch2|grep -v 3rdparty/opengl|grep -v stdafx.h`; do sed 's/uint16& /uint16 \&/g;s/int8\([ >*),;[]\)/int8_t\1/g;s/int16\([ >*),;[]\)/int16_t\1/g;s/int32\([ >*),;[]\)/int32_t\1/g;s/int64\([ >*),;[]\)/int64_t\1/g;s/ uint32(/ uint32_t(/g;s/_uint8_t/_uint8/;s/Uint8_t/Uint8/;s/ft_int64_t/ft_int64/g;s/uint64$/uint64_t/;s/WChar/char32_t/g;s/char32_t char32_t/char32_t WChar/' -i $i; done

src/network/core/packet.cpp

@@ -103,13 +103,13 @@ bool Packet::CanWriteToPacket(size_t bytes_to_write)
 
 /*
  * The next couple of functions make sure we can send
- *  uint8, uint16, uint32 and uint64 endian-safe
+ *  uint8_t, uint16_t, uint32_t and uint64_t endian-safe
  *  over the network. The least significant bytes are
  *  sent first.
  *
  *  So 0x01234567 would be sent as 67 45 23 01.
  *
- * A bool is sent as a uint8 where zero means false
+ * A bool is sent as a uint8_t where zero means false
  *  and non-zero means true.
  */
 
@@ -126,7 +126,7 @@ void Packet::Send_bool(bool data)
  * Package a 8 bits integer in the packet.
  * @param data The data to send.
  */
-void Packet::Send_uint8(uint8 data)
+void Packet::Send_uint8(uint8_t data)
 {
 	assert(this->CanWriteToPacket(sizeof(data)));
 	this->buffer.emplace_back(data);
@@ -136,7 +136,7 @@ void Packet::Send_uint8(uint8 data)
  * Package a 16 bits integer in the packet.
  * @param data The data to send.
  */
-void Packet::Send_uint16(uint16 data)
+void Packet::Send_uint16(uint16_t data)
 {
 	assert(this->CanWriteToPacket(sizeof(data)));
 	this->buffer.emplace_back(GB(data, 0, 8));
@@ -147,7 +147,7 @@ void Packet::Send_uint16(uint16 data)
  * Package a 32 bits integer in the packet.
  * @param data The data to send.
  */
-void Packet::Send_uint32(uint32 data)
+void Packet::Send_uint32(uint32_t data)
 {
 	assert(this->CanWriteToPacket(sizeof(data)));
 	this->buffer.emplace_back(GB(data,  0, 8));
@@ -160,7 +160,7 @@ void Packet::Send_uint32(uint32 data)
  * Package a 64 bits integer in the packet.
  * @param data The data to send.
  */
-void Packet::Send_uint64(uint64 data)
+void Packet::Send_uint64(uint64_t data)
 {
 	assert(this->CanWriteToPacket(sizeof(data)));
 	this->buffer.emplace_back(GB(data,  0, 8));
@@ -191,8 +191,8 @@ void Packet::Send_string(const std::string_view data)
  */
 void Packet::Send_buffer(const std::vector<byte> &data)
 {
-	assert(this->CanWriteToPacket(sizeof(uint16) + data.size()));
-	this->Send_uint16((uint16)data.size());
+	assert(this->CanWriteToPacket(sizeof(uint16_t) + data.size()));
+	this->Send_uint16((uint16_t)data.size());
 	this->buffer.insert(this->buffer.end(), data.begin(), data.end());
 }
 
@@ -314,9 +314,9 @@ bool Packet::Recv_bool()
  * Read a 8 bits integer from the packet.
  * @return The read data.
  */
-uint8 Packet::Recv_uint8()
+uint8_t Packet::Recv_uint8()
 {
-	uint8 n;
+	uint8_t n;
 
 	if (!this->CanReadFromPacket(sizeof(n), true)) return 0;
 
@@ -328,14 +328,14 @@ uint8 Packet::Recv_uint8()
  * Read a 16 bits integer from the packet.
  * @return The read data.
  */
-uint16 Packet::Recv_uint16()
+uint16_t Packet::Recv_uint16()
 {
-	uint16 n;
+	uint16_t n;
 
 	if (!this->CanReadFromPacket(sizeof(n), true)) return 0;
 
-	n  = (uint16)this->buffer[this->pos++];
-	n += (uint16)this->buffer[this->pos++] << 8;
+	n  = (uint16_t)this->buffer[this->pos++];
+	n += (uint16_t)this->buffer[this->pos++] << 8;
 	return n;
 }
 
@@ -343,16 +343,16 @@ uint16 Packet::Recv_uint16()
  * Read a 32 bits integer from the packet.
  * @return The read data.
  */
-uint32 Packet::Recv_uint32()
+uint32_t Packet::Recv_uint32()
 {
-	uint32 n;
+	uint32_t n;
 
 	if (!this->CanReadFromPacket(sizeof(n), true)) return 0;
 
-	n  = (uint32)this->buffer[this->pos++];
-	n += (uint32)this->buffer[this->pos++] << 8;
-	n += (uint32)this->buffer[this->pos++] << 16;
-	n += (uint32)this->buffer[this->pos++] << 24;
+	n  = (uint32_t)this->buffer[this->pos++];
+	n += (uint32_t)this->buffer[this->pos++] << 8;
+	n += (uint32_t)this->buffer[this->pos++] << 16;
+	n += (uint32_t)this->buffer[this->pos++] << 24;
 	return n;
 }
 
@@ -360,20 +360,20 @@ uint32 Packet::Recv_uint32()
  * Read a 64 bits integer from the packet.
  * @return The read data.
  */
-uint64 Packet::Recv_uint64()
+uint64_t Packet::Recv_uint64()
 {
-	uint64 n;
+	uint64_t n;
 
 	if (!this->CanReadFromPacket(sizeof(n), true)) return 0;
 
-	n  = (uint64)this->buffer[this->pos++];
-	n += (uint64)this->buffer[this->pos++] << 8;
-	n += (uint64)this->buffer[this->pos++] << 16;
-	n += (uint64)this->buffer[this->pos++] << 24;
-	n += (uint64)this->buffer[this->pos++] << 32;
-	n += (uint64)this->buffer[this->pos++] << 40;
-	n += (uint64)this->buffer[this->pos++] << 48;
-	n += (uint64)this->buffer[this->pos++] << 56;
+	n  = (uint64_t)this->buffer[this->pos++];
+	n += (uint64_t)this->buffer[this->pos++] << 8;
+	n += (uint64_t)this->buffer[this->pos++] << 16;
+	n += (uint64_t)this->buffer[this->pos++] << 24;
+	n += (uint64_t)this->buffer[this->pos++] << 32;
+	n += (uint64_t)this->buffer[this->pos++] << 40;
+	n += (uint64_t)this->buffer[this->pos++] << 48;
+	n += (uint64_t)this->buffer[this->pos++] << 56;
 	return n;
 }
 
@@ -383,7 +383,7 @@ uint64 Packet::Recv_uint64()
  */
 std::vector<byte> Packet::Recv_buffer()
 {
-	uint16 size = this->Recv_uint16();
+	uint16_t size = this->Recv_uint16();
 	if (size == 0 || !this->CanReadFromPacket(size, true)) return {};
 
 	std::vector<byte> data;