mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-13 18:17:49 -04:00
Convert custom HeadSpin integer types to standard types from stdint.h
This commit is contained in:
@ -68,7 +68,7 @@ bool Srv2StateValidateConnect (
|
||||
const Srv2State_ConnData & connect = * (const Srv2State_ConnData *) listen->buffer;
|
||||
|
||||
// Validate message size
|
||||
const unsigned kMinStructSize = sizeof(dword) * 3;
|
||||
const unsigned kMinStructSize = sizeof(uint32_t) * 3;
|
||||
if (listen->bytes < kMinStructSize)
|
||||
return false;
|
||||
if (listen->bytes < connect.dataBytes)
|
||||
|
@ -78,9 +78,9 @@ enum {
|
||||
***/
|
||||
|
||||
struct Srv2State_ConnData {
|
||||
dword dataBytes;
|
||||
dword buildId;
|
||||
dword srvType;
|
||||
uint32_t dataBytes;
|
||||
uint32_t buildId;
|
||||
uint32_t srvType;
|
||||
};
|
||||
struct Srv2State_Connect {
|
||||
AsyncSocketConnectPacket hdr;
|
||||
@ -96,20 +96,20 @@ struct Srv2State_Connect {
|
||||
|
||||
struct Srv2State_FetchObject : SrvMsgHeader {
|
||||
Uuid ownerId;
|
||||
wchar objectName[kMaxStateObjectName];
|
||||
wchar_t objectName[kMaxStateObjectName];
|
||||
};
|
||||
|
||||
struct Srv2State_SaveObject : SrvMsgHeader {
|
||||
Uuid ownerId;
|
||||
wchar objectName[kMaxStateObjectName];
|
||||
dword objectDataBytes;
|
||||
byte objectData[1]; // objectData[objectDataBytes], actually
|
||||
wchar_t objectName[kMaxStateObjectName];
|
||||
uint32_t objectDataBytes;
|
||||
uint8_t objectData[1]; // objectData[objectDataBytes], actually
|
||||
// no more fields after var length alloc
|
||||
};
|
||||
|
||||
struct Srv2State_DeleteObject : SrvMsgHeader {
|
||||
Uuid ownerId;
|
||||
wchar objectName[kMaxStateObjectName];
|
||||
wchar_t objectName[kMaxStateObjectName];
|
||||
};
|
||||
|
||||
|
||||
@ -120,8 +120,8 @@ struct Srv2State_DeleteObject : SrvMsgHeader {
|
||||
***/
|
||||
|
||||
struct State2Srv_ObjectFetched : SrvMsgHeader {
|
||||
dword objectDataBytes;
|
||||
byte objectData[1];
|
||||
uint32_t objectDataBytes;
|
||||
uint8_t objectData[1];
|
||||
// no more fields after var length alloc
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user