From 2a578d3d35839fabb78d8ce976bafe3008570992 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Sat, 9 Feb 2013 22:20:58 -0800 Subject: [PATCH 1/2] Fix 64-bit *nix compilation of pnNetProtocol. --- .../NucleusLib/pnNetProtocol/Private/pnNpCommon.cpp | 6 +++--- .../NucleusLib/pnNetProtocol/Private/pnNpCommon.h | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.cpp b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.cpp index 7a121af8..6b77eb50 100644 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.cpp +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.cpp @@ -333,7 +333,7 @@ NetVaultNode::~NetVaultNode () { } //============================================================================ -unsigned NetVaultNode::Read_LCS (const uint8_t inbuffer[], unsigned bufsz, unsigned rwOpts) { +unsigned NetVaultNode::Read_LCS (const uint8_t inbuffer[], uint32_t bufsz, unsigned rwOpts) { DeallocNodeFields(); @@ -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); } //============================================================================ -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); } diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.h b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.h index 5962d669..870481b6 100644 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.h +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.h @@ -248,8 +248,8 @@ private: wchar_t * istring64_2; wchar_t * text_1; wchar_t * text_2; - uint8_t * blob_1; size_t blob_1Length; - uint8_t * blob_2; size_t blob_2Length; + uint8_t * blob_1; uint32_t blob_1Length; + uint8_t * blob_2; uint32_t blob_2Length; void IVaultNodeSetString ( uint64_t bit, @@ -320,7 +320,7 @@ public: ~NetVaultNode (); // 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 bool Matches (const NetVaultNode * other); @@ -365,8 +365,8 @@ public: void SetIString64_2 (const wchar_t v[]); void SetText_1 (const wchar_t v[]); void SetText_2 (const wchar_t v[]); - void SetBlob_1 (const uint8_t v[], size_t len); - void SetBlob_2 (const uint8_t v[], size_t len); + void SetBlob_1 (const uint8_t v[], uint32_t len); + void SetBlob_2 (const uint8_t v[], uint32_t len); uint32_t GetNodeId () const { return nodeId; } uint32_t GetCreateTime () const { return createTime; } From 9e8131f73bfa8238f6f2d1fe4ba7778eacc97c78 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Wed, 20 Feb 2013 21:30:37 -0800 Subject: [PATCH 2/2] Fix return values for Read_LCS & Write_LCS. --- .../Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.cpp b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.cpp index 6b77eb50..cf6c209e 100644 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.cpp +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.cpp @@ -333,7 +333,7 @@ NetVaultNode::~NetVaultNode () { } //============================================================================ -unsigned NetVaultNode::Read_LCS (const uint8_t inbuffer[], uint32_t bufsz, unsigned rwOpts) { +uint32_t NetVaultNode::Read_LCS (const uint8_t inbuffer[], uint32_t bufsz, unsigned rwOpts) { DeallocNodeFields(); @@ -391,7 +391,7 @@ unsigned NetVaultNode::Read_LCS (const uint8_t inbuffer[], uint32_t 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();