OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 19:29:09 +00:00
Code Releases Activity

Merge pull request #306 from dpogue/netprotocol

Browse Source 
Fix 64-bit *nix compilation of pnNetProtocol.
This commit is contained in:
Michael Hansen
2013-02-20 21:33:34 -08:00
parent 192bd5ea7a 9e8131f73b
commit 689cfb1430
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.cpp
View File

@ -333,7 +333,7 @@ NetVaultNode::~NetVaultNode () {
} }
//============================================================================ //============================================================================
unsigned NetVaultNode::Read_LCS (const uint8_t inbuffer[], unsigned bufsz, unsigned rwOpts) { uint32_t NetVaultNode::Read_LCS (const uint8_t inbuffer[], uint32_t bufsz, unsigned rwOpts) {
DeallocNodeFields(); DeallocNodeFields();
@ -391,7 +391,7 @@ unsigned NetVaultNode::Read_LCS (const uint8_t inbuffer[], unsigned bufsz, unsig
} }
//============================================================================ //============================================================================
unsigned NetVaultNode::Write_LCS (ARRAY(uint8_t) * buffer, unsigned rwOpts) { uint32_t NetVaultNode::Write_LCS (ARRAY(uint8_t) * buffer, unsigned rwOpts) {
unsigned pos = buffer->Count(); unsigned pos = buffer->Count();
@ -775,12 +775,12 @@ void NetVaultNode::SetText_2 (const wchar_t v[]) {
} }
//============================================================================ //============================================================================
void NetVaultNode::SetBlob_1 (const uint8_t v[], unsigned len) { void NetVaultNode::SetBlob_1 (const uint8_t v[], uint32_t len) {
IVaultNodeSetBlob(kBlob_1, &blob_1, &blob_1Length, v, len); IVaultNodeSetBlob(kBlob_1, &blob_1, &blob_1Length, v, len);
} }
//============================================================================ //============================================================================
void NetVaultNode::SetBlob_2 (const uint8_t v[], unsigned len) { void NetVaultNode::SetBlob_2 (const uint8_t v[], uint32_t len) {
IVaultNodeSetBlob(kBlob_2, &blob_2, &blob_2Length, v, len); IVaultNodeSetBlob(kBlob_2, &blob_2, &blob_2Length, v, len);
} }

10
Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.h
View File

@ -248,8 +248,8 @@ private:
wchar_t * istring64_2; wchar_t * istring64_2;
wchar_t * text_1; wchar_t * text_1;
wchar_t * text_2; wchar_t * text_2;
uint8_t * blob_1; size_t blob_1Length; uint8_t * blob_1; uint32_t blob_1Length;
uint8_t * blob_2; size_t blob_2Length; uint8_t * blob_2; uint32_t blob_2Length;
void IVaultNodeSetString ( void IVaultNodeSetString (
uint64_t bit, uint64_t bit,
@ -320,7 +320,7 @@ public:
~NetVaultNode (); ~NetVaultNode ();
// Threaded apps: Must be called with node->critsect locked // Threaded apps: Must be called with node->critsect locked
uint32_t Read_LCS (const uint8_t buffer[], size_t bufsz, uint32_t rwOpts); // returns number of bytes read uint32_t Read_LCS (const uint8_t buffer[], uint32_t bufsz, uint32_t rwOpts); // returns number of bytes read
uint32_t Write_LCS (ARRAY(uint8_t) * buffer, uint32_t rwOpts); // returns number of bytes written uint32_t Write_LCS (ARRAY(uint8_t) * buffer, uint32_t rwOpts); // returns number of bytes written
bool Matches (const NetVaultNode * other); bool Matches (const NetVaultNode * other);
@ -365,8 +365,8 @@ public:
void SetIString64_2 (const wchar_t v[]); void SetIString64_2 (const wchar_t v[]);
void SetText_1 (const wchar_t v[]); void SetText_1 (const wchar_t v[]);
void SetText_2 (const wchar_t v[]); void SetText_2 (const wchar_t v[]);
void SetBlob_1 (const uint8_t v[], size_t len); void SetBlob_1 (const uint8_t v[], uint32_t len);
void SetBlob_2 (const uint8_t v[], size_t len); void SetBlob_2 (const uint8_t v[], uint32_t len);
uint32_t GetNodeId () const { return nodeId; } uint32_t GetNodeId () const { return nodeId; }
uint32_t GetCreateTime () const { return createTime; } uint32_t GetCreateTime () const { return createTime; }