From 8eaff48c19c23b37759445d538cc3fcb74ec56cb Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Tue, 24 Apr 2012 18:18:44 -0700
Subject: [PATCH] Cleanups.

---
 src/Confirmation.h  | 10 +++++-----
 src/ECIES.cpp       |  2 +-
 src/Transaction.cpp |  5 +++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Confirmation.h b/src/Confirmation.h
index 1695e60aa..a47e3fa1e 100644
--- a/src/Confirmation.h
+++ b/src/Confirmation.h
@@ -20,7 +20,7 @@ public:
 	typedef boost::shared_ptr<Transaction> pointer;
 
 private:
-	uint256 mTransactionID;
+	uint256 mID;
 	uint160 mHanko;
 	uint64 mTimestamp;
 	ConfirmationStatus mStatus;
@@ -28,11 +28,11 @@ private:
 	std::vector<unsigned char> mSignature;
 
 public:
-	Transaction();
-	Transaction(const uint256 &id);
-	Transaction(const std::vector<unsigned char> rawTransaction);
+	Confirmation();
+	Confirmation(const uint256 &id);
+	Confirmation(const std::vector<unsigned char> rawConfirmation);
 
-	const uint256& GetID() const { return mTransactionID; }
+	const uint256& GetID() const { return mID; }
 	const uint160& GetHanko() const { return mHanko; }
 	uint64 GetTimestamp() const { return mTimestamp; }
 	ConfirmationStatus() const { return mStatus; }
diff --git a/src/ECIES.cpp b/src/ECIES.cpp
index c4556b11c..400817549 100644
--- a/src/ECIES.cpp
+++ b/src/ECIES.cpp
@@ -83,7 +83,7 @@ void CKey::getECIESSecret(CKey& otherKey, ECIES_ENC_KEY_TYPE& enc_key, ECIES_HMA
 	memset(hbuf, 0, ECIES_KEY_LENGTH);
 }
 
-static ECIES_HMAC_TYPE makeHMAC(const ECIES_HMAC_KEY_TYPE& secret, const std::vector<unsigned char> data)
+static ECIES_HMAC_TYPE makeHMAC(const ECIES_HMAC_KEY_TYPE& secret, const std::vector<unsigned char>& data)
 {
 	HMAC_CTX ctx;
 	HMAC_CTX_init(&ctx);
diff --git a/src/Transaction.cpp b/src/Transaction.cpp
index 0097d736e..15278c8ea 100644
--- a/src/Transaction.cpp
+++ b/src/Transaction.cpp
@@ -53,7 +53,8 @@ Transaction::Transaction(LocalAccount::pointer fromLocalAccount, const NewcoinAd
 	}
 }
 
-Transaction::Transaction(SerializedTransaction::pointer sit, bool validate) : mStatus(INVALID), mTransaction(sit)
+Transaction::Transaction(SerializedTransaction::pointer sit, bool validate)
+	: mInLedger(0), mStatus(INVALID), mTransaction(sit)
 {
 	std::vector<unsigned char> pubKey;
 
@@ -76,7 +77,7 @@ Transaction::Transaction(SerializedTransaction::pointer sit, bool validate) : mS
 		mStatus = NEW;
 }
 
-Transaction::Transaction(const std::vector<unsigned char>& raw, bool validate) : mStatus(INVALID)
+Transaction::Transaction(const std::vector<unsigned char>& raw, bool validate) : mInLedger(0), mStatus(INVALID)
 {
 	uint160	toAccountID;
 	uint160	fromAccountID;