From: bdemsky <bdemsky@uci.edu>
Date: Fri, 16 Mar 2018 16:53:28 +0000 (-0700)
Subject: edits
X-Git-Url: http://demsky.eecs.uci.edu/git/?p=iotcloud.git;a=commitdiff_plain;h=7095771b9769e87bdc5df84e306e3d95e6e4040b

edits
---

diff --git a/version2/src/C/Commit.cc b/version2/src/C/Commit.cc
index 2ee208d..e01a778 100644
--- a/version2/src/C/Commit.cc
+++ b/version2/src/C/Commit.cc
@@ -14,7 +14,7 @@ Commit::Commit() :
 	sequenceNumber(-1),
 	machineId(-1),
 	transactionSequenceNumber(-1),
-	liveKeys(new Hashset<IoTString *>) {
+	liveKeys(new Hashset<IoTString *>()) {
 }
 
 Commit::Commit(int64_t _sequenceNumber, int64_t _machineId, int64_t _transactionSequenceNumber) :
@@ -28,7 +28,7 @@ Commit::Commit(int64_t _sequenceNumber, int64_t _machineId, int64_t _transaction
 	sequenceNumber(_sequenceNumber),
 	machineId(_machineId),
 	transactionSequenceNumber(_transactionSequenceNumber),
-	liveKeys(new Hashset<IoTString *>) {
+	liveKeys(new Hashset<IoTString *>()) {
 }
 
 Commit::~Commit() {
diff --git a/version2/src/C/Slot.cc b/version2/src/C/Slot.cc
index 644854e..6f37c9a 100644
--- a/version2/src/C/Slot.cc
+++ b/version2/src/C/Slot.cc
@@ -17,8 +17,8 @@ Slot::Slot(Table *_table, int64_t _seqnum, int64_t _machineid, Array<char> *_pre
 	seqnumlive(true),
 	freespace(SLOT_SIZE - getBaseSize()),
 	table(_table),
-	localSequenceNumber(_localSequenceNumber),
-	fakeLastMessage(NULL) {
+	fakeLastMessage(NULL),
+	localSequenceNumber(_localSequenceNumber) {
 }
 
 Slot::Slot(Table *_table, int64_t _seqnum, int64_t _machineid, Array<char> *_prevhmac, int64_t _localSequenceNumber) :
@@ -31,8 +31,8 @@ Slot::Slot(Table *_table, int64_t _seqnum, int64_t _machineid, Array<char> *_pre
 	seqnumlive(true),
 	freespace(SLOT_SIZE - getBaseSize()),
 	table(_table),
-	localSequenceNumber(_localSequenceNumber),
-	fakeLastMessage(NULL) {
+	fakeLastMessage(NULL),
+	localSequenceNumber(_localSequenceNumber) {
 }
 
 Slot::Slot(Table *_table, int64_t _seqnum, int64_t _machineid, int64_t _localSequenceNumber) :
@@ -45,8 +45,8 @@ Slot::Slot(Table *_table, int64_t _seqnum, int64_t _machineid, int64_t _localSeq
 	seqnumlive(true),
 	freespace(SLOT_SIZE - getBaseSize()),
 	table(_table),
-	localSequenceNumber(_localSequenceNumber),
-	fakeLastMessage(NULL) {
+	fakeLastMessage(NULL),
+	localSequenceNumber(_localSequenceNumber) {
 }
 
 Slot::~Slot() {
diff --git a/version2/src/C/SlotBuffer.cc b/version2/src/C/SlotBuffer.cc
index af6b031..06c46e9 100644
--- a/version2/src/C/SlotBuffer.cc
+++ b/version2/src/C/SlotBuffer.cc
@@ -14,11 +14,11 @@ SlotBuffer::SlotBuffer() :
 }
 
 SlotBuffer::~SlotBuffer() {
-	uint index = tail;
+	int32_t index = tail;
 	while (index != head) {
 		delete array->get(index);
 		index++;
-		if (index == array->length())
+		if (index == (int32_t) array->length())
 			index = 0;
 	}
 	delete array;
@@ -68,11 +68,11 @@ void SlotBuffer::putSlot(Slot *s) {
 	int64_t checkNum = (getNewestSeqNum() + 1);
 
 	if (checkNum != s->getSequenceNumber()) {
-		uint index = tail;
+		int32_t index = tail;
 		while (index != head) {
 			delete array->get(index);
 			index++;
-			if (index == array->length())
+			if (index == (int32_t) array->length())
 				index = 0;
 		}
 		oldestseqn = s->getSequenceNumber();
diff --git a/version2/src/C/Test.C b/version2/src/C/Test.C
index dd3fc62..0f6c96c 100644
--- a/version2/src/C/Test.C
+++ b/version2/src/C/Test.C
@@ -177,6 +177,7 @@ int main(int numargs, char ** args) {
 			foundError = true;
 			printf("Status error\n");
 		}
+		delete status;
 	}
 	
 	if (foundError) {