From 4265f8c39a21eee11250172614aacc95f83c8b4d Mon Sep 17 00:00:00 2001 From: bdemsky Date: Fri, 19 Jan 2018 23:16:04 -0800 Subject: [PATCH] edits --- version2/src/C/LastMessage.h | 2 -- version2/src/C/NewKey.cc | 12 ++++++++++++ version2/src/C/NewKey.h | 16 +++------------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/version2/src/C/LastMessage.h b/version2/src/C/LastMessage.h index 22d7d99..c08e0ba 100644 --- a/version2/src/C/LastMessage.h +++ b/version2/src/C/LastMessage.h @@ -10,7 +10,6 @@ * @version 1.0 */ - class LastMessage : public Entry { private: int64_t machineid; @@ -22,7 +21,6 @@ public: machineid(_machineid), seqnum(_seqnum) { } - int64_t getMachineID() { return machineid; } int64_t getSequenceNumber() { return seqnum; } void encode(ByteBuffer *bb); diff --git a/version2/src/C/NewKey.cc b/version2/src/C/NewKey.cc index a8a9526..2579839 100644 --- a/version2/src/C/NewKey.cc +++ b/version2/src/C/NewKey.cc @@ -2,6 +2,16 @@ #include "ByteBuffer.h" #include "IoTString.h" +NewKey::NewKey(Slot *slot, IoTString *_key, int64_t _machineid) : + Entry(slot), + key(new IoTString(_key)), + machineid(_machineid) { +} + +NewKey::~NewKey() { + delete key; +} + Entry *decode(Slot *slot, ByteBuffer *bb) { int keylength = bb->getInt(); Array *key = new Array(keylength); @@ -11,6 +21,8 @@ Entry *decode(Slot *slot, ByteBuffer *bb) { return new NewKey(slot, IoTString_shallow(key), machineid); } +Entry *NewKey::getCopy(Slot *s) { return new NewKey(s, new IoTString(key), machineid); } + void NewKey::encode(ByteBuffer *bb) { bb->put(TypeNewKey); bb->putInt(key->length()); diff --git a/version2/src/C/NewKey.h b/version2/src/C/NewKey.h index ffb577a..2abb1be 100644 --- a/version2/src/C/NewKey.h +++ b/version2/src/C/NewKey.h @@ -9,32 +9,22 @@ * @version 1.0 */ - class NewKey : public Entry { private: IoTString *key; int64_t machineid; - public: - NewKey(Slot *slot, IoTString *_key, int64_t _machineid) : - Entry(slot), - key(_key), - machineid(_machineid) { - } - + NewKey(Slot *slot, IoTString *_key, int64_t _machineid); + ~NewKey(); int64_t getMachineID() { return machineid; } IoTString *getKey() { return key; } void setSlot(Slot *s) { parentslot = s; } - - void encode(ByteBuffer *bb); int getSize(); char getType() { return TypeNewKey; } - - Entry *getCopy(Slot *s) { return new NewKey(s, key, machineid); } + Entry *getCopy(Slot *s); }; Entry *NewKey_decode(Slot *slot, ByteBuffer *bb); - #endif -- 2.34.1