From 812445f2050a76824fdd957e31618b31ca7167fe Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Sat, 7 Apr 2012 03:56:40 -0700 Subject: [PATCH] getFormat -> getTxnFormat --- src/SerializedTransaction.cpp | 4 ++-- src/TransactionFormats.cpp | 2 +- src/TransactionFormats.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SerializedTransaction.cpp b/src/SerializedTransaction.cpp index b88472d55b..8192a8e71b 100644 --- a/src/SerializedTransaction.cpp +++ b/src/SerializedTransaction.cpp @@ -3,7 +3,7 @@ SerializedTransaction::SerializedTransaction(TransactionType type) { - mFormat=getFormat(type); + mFormat=getTxnFormat(type); if(mFormat==NULL) throw(std::runtime_error("invalid transaction type")); mMiddleTxn.giveObject(new STUInt32("Magic", TransactionMagic)); @@ -33,7 +33,7 @@ SerializedTransaction::SerializedTransaction(SerializerIterator& sit, int length int type=sit.get32(); mMiddleTxn.giveObject(new STUInt32("Type", type)); - mFormat=getFormat(static_cast(type)); + mFormat=getTxnFormat(static_cast(type)); if(!mFormat) throw(std::runtime_error("Transaction has invalid type")); mMiddleTxn.giveObject(new STUInt64("Fee", sit.get64())); diff --git a/src/TransactionFormats.cpp b/src/TransactionFormats.cpp index 455b3a9e46..528a86d3ee 100644 --- a/src/TransactionFormats.cpp +++ b/src/TransactionFormats.cpp @@ -45,7 +45,7 @@ TransactionFormat InnerTxnFormats[]= { NULL, ttINVALID } }; -TransactionFormat* getFormat(TransactionType t) +TransactionFormat* getTxnFormat(TransactionType t) { TransactionFormat* f=InnerTxnFormats; while(f->t_name!=NULL) diff --git a/src/TransactionFormats.h b/src/TransactionFormats.h index 6c68d12c33..08887de169 100644 --- a/src/TransactionFormats.h +++ b/src/TransactionFormats.h @@ -27,5 +27,5 @@ const int TransactionMinLen=32; const int TransactionMaxLen=1048576; extern TransactionFormat InnerTxnFormats[]; -extern TransactionFormat* getFormat(TransactionType t); +extern TransactionFormat* getTxnFormat(TransactionType t); #endif