X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=version2%2Fsrc%2FC%2FSlot.h;h=c91aac1b1a4e60e5e41d3012c20219286278520c;hb=1982d44395bc486667d8b25d6d7763c2ffbf61bc;hp=4ffe205614038d2c2bfcd00092efc8aed323d5fc;hpb=1ae973a3cc837cb62ef220dedbb731ab3f833719;p=iotcloud.git

diff --git a/version2/src/C/Slot.h b/version2/src/C/Slot.h
index 4ffe205..c91aac1 100644
--- a/version2/src/C/Slot.h
+++ b/version2/src/C/Slot.h
@@ -4,12 +4,11 @@
 #include "common.h"
 #include "Liveness.h"
 
-
 #define SLOT_SIZE 2048
 #define HMAC_SIZE 32
 
 class Slot : public Liveness {
- private:
+private:
 	/** Sequence number of the slot. */
 	int64_t seqnum;
 	/** HMAC of previous slot. */
@@ -35,13 +34,12 @@ class Slot : public Liveness {
 
 public:
 	Slot(Table *_table, int64_t _seqnum, int64_t _machineid, Array<char> *_prevhmac, Array<char> *_hmac, int64_t _localSequenceNumber);
-	Slot(Table * _table, int64_t _seqnum, int64_t _machineid, Array<char> *_prevhmac, int64_t _localSequenceNumber);
-	Slot(Table * _table, int64_t _seqnum, int64_t _machineid, int64_t _localSequenceNumber);
+	Slot(Table *_table, int64_t _seqnum, int64_t _machineid, Array<char> *_prevhmac, int64_t _localSequenceNumber);
+	Slot(Table *_table, int64_t _seqnum, int64_t _machineid, int64_t _localSequenceNumber);
 
 	Array<char> *getHMAC() { return hmac; }
 	Array<char> *getPrevHMAC() { return prevhmac; }
 	Entry *addEntry(Entry *e);
-	void removeEntry(Entry *e);
 	bool hasSpace(Entry *e);
 	Vector<Entry *> *getEntries();
 	Array<char> *encode(Mac *mac);
@@ -53,8 +51,8 @@ public:
 	void decrementLiveCount();
 	bool isLive() { return livecount > 0; }
 	Array<char> *getSlotCryptIV();
-	friend Slot *Slotdecode(Table *table, Array<char> *array, Mac *mac);
+	friend Slot *Slot_decode(Table *table, Array<char> *array, Mac *mac);
 };
 
-Slot *Slotdecode(Table *table, Array<char> *array, Mac *mac);
+Slot *Slot_decode(Table *table, Array<char> *array, Mac *mac);
 #endif