Reformat annotations in preparation for automated extraction

2026-04-29 15:37:46 +00:00 · 2013-06-07 14:46:09 -07:00
parent 6d8ee90a8d
commit a6fdabc68a
89 changed files with 192 additions and 192 deletions
--- a/modules/ripple_basics/containers/ripple_RangeSet.h
+++ b/modules/ripple_basics/containers/ripple_RangeSet.h
@@ -68,9 +68,9 @@ namespace boost
 	};
 }

-// VFALCO: Maybe not the best place for this but it sort of makes sense here
+// VFALCO Maybe not the best place for this but it sort of makes sense here

-// VFALCO: NOTE, these three are unused.
+// VFALCO NOTE these three are unused.
 /*
 template<typename T> T range_check(const T& value, const T& minimum, const T& maximum)
 {
@@ -94,7 +94,7 @@ template<typename T> T range_check_max(const T& value, const T& maximum)
 }
 */

-// VFALCO: TODO, these parameters should not be const references.
+// VFALCO TODO these parameters should not be const references.
 template<typename T, typename U> T range_check_cast(const U& value, const T& minimum, const T& maximum)
 {
 	if ((value < minimum) || (value > maximum))
--- a/modules/ripple_basics/ripple_basics.cpp
+++ b/modules/ripple_basics/ripple_basics.cpp
@@ -42,7 +42,7 @@
 #include <boost/asio.hpp> // for stupid parseIpPort
 #include <boost/regex.hpp>

-// VFALCO: TODO, Replace OpenSSL randomness with a dependency-free implementation
+// VFALCO TODO Replace OpenSSL randomness with a dependency-free implementation
 //         Perhaps Schneier's Fortuna or a variant. Abstract the collection of
 //         entropy and provide OS-specific implementation. We can re-use the
 //         BearShare source code for this.
@@ -56,7 +56,7 @@



-// VFALCO: TODO, fix these warnings!
+// VFALCO TODO fix these warnings!
 #ifdef _MSC_VER
 //#pragma warning (push) // Causes spurious C4503 "decorated name exceeds maximum length"
 //#pragma warning (disable: 4018) // signed/unsigned mismatch
--- a/modules/ripple_basics/ripple_basics.h
+++ b/modules/ripple_basics/ripple_basics.h
@@ -62,7 +62,7 @@ namespace boost {
 	}
 }
 */
-#include <boost/filesystem.hpp> // VFALCO: TODO, try to eliminate thie dependency
+#include <boost/filesystem.hpp> // VFALCO TODO try to eliminate thie dependency



@@ -117,7 +117,7 @@ namespace boost {
 #include <boost/bind.hpp>
 #include <boost/function.hpp>

-// VFALCO: TODO, remove this dependency!!!
+// VFALCO TODO remove this dependency!!!
 #include <openssl/dh.h> // for DiffieHellmanUtil
 #include <openssl/ripemd.h> // For HashUtilities
 #include <openssl/sha.h> // For HashUtilities
--- a/modules/ripple_basics/types/ripple_HashMaps.h
+++ b/modules/ripple_basics/types/ripple_HashMaps.h
@@ -11,7 +11,7 @@
    done by seeding the hashing function with a random number generated
    at program startup.
 */
-// VFALCO: TODO derive from Uncopyable
+// VFALCO TODO derive from Uncopyable
 class HashMaps // : beast::Uncopayble
 {
 public:
@@ -88,7 +88,7 @@ private:
    public:
        NonceHolder ()
        {
-            // VFALCO: NOTE, this can be dangerous if T is an object type
+            // VFALCO NOTE this can be dangerous if T is an object type
            RandomNumbers::getInstance ().fill (&m_nonce);
        }

--- a/modules/ripple_basics/utility/ripple_ByteOrder.h
+++ b/modules/ripple_basics/utility/ripple_ByteOrder.h
@@ -5,7 +5,7 @@

 // Reference: http://www.mail-archive.com/licq-commits@googlegroups.com/msg02334.html

-// VFALCO: TODO, use VFLIB_* platform macros instead of hard-coded compiler specific ones
+// VFALCO TODO use VFLIB_* platform macros instead of hard-coded compiler specific ones
 #ifdef WIN32
 extern uint64_t htobe64(uint64_t value);
 extern uint64_t be64toh(uint64_t value);
--- a/modules/ripple_basics/utility/ripple_HashUtilities.h
+++ b/modules/ripple_basics/utility/ripple_HashUtilities.h
@@ -1,9 +1,9 @@
 #ifndef RIPPLE_HASHUTILITIES_H
 #define RIPPLE_HASHUTILITIES_H

-// VFALCO: NOTE, these came from BitcoinUtil.h
+// VFALCO NOTE these came from BitcoinUtil.h

-// VFALCO: TODO, Rewrite the callers so we don't need templates,
+// VFALCO TODO Rewrite the callers so we don't need templates,
 //		   then define these in a .cpp so they are no longer inline.
 //
 template<typename T1>
--- a/modules/ripple_basics/utility/ripple_InstanceCounter.h
+++ b/modules/ripple_basics/utility/ripple_InstanceCounter.h
@@ -1,11 +1,11 @@
 #ifndef RIPPLE_INSTANCECOUNTER_H
 #define RIPPLE_INSTANCECOUNTER_H

-// VFALCO: TODO Clean up this junk, remove the macros, replace
+// VFALCO TODO Clean up this junk, remove the macros, replace
 //		   with a robust leak checker when we have atomics.
 //

-// VFALCO: TODO, swap these. Declaration means header, definition means .cpp!!!
+// VFALCO TODO swap these. Declaration means header, definition means .cpp!!!
 #define DEFINE_INSTANCE(x)								\
 	extern InstanceType IT_##x;							\
 	class Instance_##x : private Instance				\
@@ -23,7 +23,7 @@

 #define IS_INSTANCE(x) Instance_##x

-// VFALCO: NOTE, that this is just a glorified leak checker with an awkward API
+// VFALCO NOTE that this is just a glorified leak checker with an awkward API
 class InstanceType
 {
 protected:
@@ -65,7 +65,7 @@ public:
 	{
 		if (sMultiThreaded)
 		{
-			// VFALCO: NOTE, Junk that will go away with atomics
+			// VFALCO NOTE Junk that will go away with atomics
 			mLock.lock();
 			++mInstances;
 			mLock.unlock();
--- a/modules/ripple_basics/utility/ripple_IntegerTypes.h
+++ b/modules/ripple_basics/utility/ripple_IntegerTypes.h
@@ -1,7 +1,7 @@
 #ifndef INTEGERTYPES_H
 #define INTEGERTYPES_H

-// VFALCO: TODO, determine if Borland C is supported
+// VFALCO TODO determine if Borland C is supported
 #if defined (_MSC_VER) /*|| defined(__BORLANDC__)*/
 typedef __int64  int64;
 typedef unsigned __int64  uint64;
@@ -18,7 +18,7 @@ typedef int int32;

 #endif

-// VFALCO: TODO, make sure minimum VS version is 9, 10, or 11
+// VFALCO TODO make sure minimum VS version is 9, 10, or 11
 // If commenting this out creates a problem, contact me!
 /*
 #if defined(_MSC_VER) && _MSC_VER < 1300
--- a/modules/ripple_basics/utility/ripple_Log.cpp
+++ b/modules/ripple_basics/utility/ripple_Log.cpp
@@ -37,7 +37,7 @@ std::vector< std::pair<std::string, std::string> > LogPartition::getSeverities()

 //------------------------------------------------------------------------------

-// VFALCO: TODO, remove original code once we know the replacement is correct.
+// VFALCO TODO remove original code once we know the replacement is correct.
 // Original code
 /*
 std::string ls = oss.str();
--- a/modules/ripple_basics/utility/ripple_Log.h
+++ b/modules/ripple_basics/utility/ripple_Log.h
@@ -14,7 +14,7 @@ enum LogSeverity

 //------------------------------------------------------------------------------

-// VFALCO: TODO, make this a nested class in Log
+// VFALCO TODO make this a nested class in Log
 class LogPartition
 {
 protected:
@@ -100,11 +100,11 @@ public:
    static std::string rotateLog ();

 private:
-    // VFALCO: TODO, derive from beast::Uncopyable
+    // VFALCO TODO derive from beast::Uncopyable
 	Log (const Log&);            // no implementation
 	Log& operator= (const Log&); // no implementation

-    // VFALCO: TODO, looks like there are really TWO classes in here.
+    // VFALCO TODO looks like there are really TWO classes in here.
    //         One is a stream target for '<<' operator and the other
    //         is a singleton. Split the singleton out to a new class.
    //
--- a/modules/ripple_basics/utility/ripple_PlatformMacros.h
+++ b/modules/ripple_basics/utility/ripple_PlatformMacros.h
@@ -19,11 +19,11 @@
 #ifndef RIPPLE_PLATFORMMACROS_H
 #define RIPPLE_PLATFORMMACROS_H

-// VFALCO: TODO Clean this up
+// VFALCO TODO Clean this up

 #if (!defined(FORCE_NO_C11X) && (__cplusplus > 201100L)) || defined(FORCE_C11X)

-// VFALCO: TODO, replace BIND_TYPE with a namespace lift
+// VFALCO TODO replace BIND_TYPE with a namespace lift

 #define C11X
 #include			 	<functional>
@@ -49,7 +49,7 @@

 #endif

-// VFALCO: TODO, Clean this junk up
+// VFALCO TODO Clean this junk up
 #define nothing()			do {} while (0)
 #define fallthru()			do {} while (0)
 #define NUMBER(x)			(sizeof(x)/sizeof((x)[0]))
--- a/modules/ripple_basics/utility/ripple_RandomNumbers.cpp
+++ b/modules/ripple_basics/utility/ripple_RandomNumbers.cpp
@@ -39,11 +39,11 @@ bool RandomNumbers::initialize ()

 void RandomNumbers::fillBytes (void* destinationBuffer, int numberOfBytes)
 {
-    // VFALCO: NOTE this assert is here to remind us that the code is not yet
+    // VFALCO NOTE this assert is here to remind us that the code is not yet
    //         thread safe.
    assert (m_initialized);

-    // VFALCO: NOTE When a spinlock is available in beast, use it here.
+    // VFALCO NOTE When a spinlock is available in beast, use it here.
    if (! m_initialized)
    {
        if (! initialize ())
@@ -75,7 +75,7 @@ RandomNumbers& RandomNumbers::getInstance ()

 //------------------------------------------------------------------------------

-// VFALCO: TODO replace WIN32 macro
+// VFALCO TODO replace WIN32 macro

 #ifdef WIN32

@@ -160,7 +160,7 @@ bool RandomNumbers::platformAddEntropy ()

 void RandomNumbers::platformAddPerformanceMonitorEntropy ()
 {
-	// VFALCO: This is how we simulate local functions
+	// VFALCO This is how we simulate local functions
 	struct
 	{
 		int64 operator() () const
@@ -175,7 +175,7 @@ void RandomNumbers::platformAddPerformanceMonitorEntropy ()
 		{
 			struct
 			{
-				// VFALCO: TODO, clean this up
+				// VFALCO TODO clean this up
 				int64 operator() () const
 				{
 					int64 nCounter = 0;
--- a/modules/ripple_basics/utility/ripple_ScopedLock.h
+++ b/modules/ripple_basics/utility/ripple_ScopedLock.h
@@ -6,7 +6,7 @@ typedef boost::recursive_mutex::scoped_lock ScopedLock;
 // A lock holder that can be returned and copied by value
 // When the last reference goes away, the lock is released

-// VFALCO: TODO, replace these with a more generic template, and not use boost
+// VFALCO TODO replace these with a more generic template, and not use boost
 //
 class SharedScopedLock
 {
@@ -30,7 +30,7 @@ protected:
 	boost::recursive_mutex& mMutex;

 public:
-	// VFALCO: TODO, get rid of this unlock parameter to restore sanity
+	// VFALCO TODO get rid of this unlock parameter to restore sanity
 	ScopedUnlock(boost::recursive_mutex& mutex, bool unlock = true) : mUnlocked(unlock), mMutex(mutex)
 	{
 		if (unlock)
--- a/modules/ripple_basics/utility/ripple_Sustain.h
+++ b/modules/ripple_basics/utility/ripple_Sustain.h
@@ -19,7 +19,7 @@
 #ifndef RIPPLE_SUSTAIN_H
 #define RIPPLE_SUSTAIN_H

-// VFALCO: TODO, figure out what the heck this is??
+// VFALCO TODO figure out what the heck this is??
 extern bool HaveSustain();
 extern std::string StopSustain();
 extern std::string DoSustain();
--- a/modules/ripple_basics/utility/ripple_ThreadName.cpp
+++ b/modules/ripple_basics/utility/ripple_ThreadName.cpp
@@ -16,7 +16,7 @@
 */
 //==============================================================================

-// VFALCO: TODO, use VFLIB_MSVC macro instead
+// VFALCO TODO use VFLIB_MSVC macro instead
 #if _MSC_VER

 void setCallingThreadName (char const* threadName)
--- a/modules/ripple_basics/utility/ripple_UptimeTimer.cpp
+++ b/modules/ripple_basics/utility/ripple_UptimeTimer.cpp
@@ -38,7 +38,7 @@ int UptimeTimer::getElapsedSeconds () const
 	}
 	else
 	{
-		// VFALCO: TODO, use time_t instead of int return
+		// VFALCO TODO use time_t instead of int return
 		result = static_cast <int> (::time (0) - m_startTime);
 	}

--- a/modules/ripple_basics/utility/ripple_UptimeTimer.h
+++ b/modules/ripple_basics/utility/ripple_UptimeTimer.h
@@ -24,7 +24,7 @@
 	The timer can be switched to a manual system of updating, to reduce
 	system calls. (?)
 */
-// VFALCO: TODO, determine if the non-manual timing is actually needed
+// VFALCO TODO determine if the non-manual timing is actually needed
 class UptimeTimer
 {
 private:
@@ -42,7 +42,7 @@ public:
 	static UptimeTimer& getInstance ();

 private:
-	// VFALCO: DEPRECATED, Use a memory barrier instead of forcing a cache line
+	// VFALCO DEPRECATED, Use a memory barrier instead of forcing a cache line
 	int m_pad1; // make sure m_elapsedTime fits in its own cache line
 	int volatile m_elapsedTime;
 	int m_pad2;
--- a/modules/ripple_data/crypto/ripple_Base58.h
+++ b/modules/ripple_data/crypto/ripple_Base58.h
@@ -36,7 +36,7 @@
 class Base58
 {
 public:
-	// VFALCO: TODO, clean up this poor API
+	// VFALCO TODO clean up this poor API
 	static char const* getCurrentAlphabet ();
 	static void setCurrentAlphabet (char const* alphabet);

--- a/modules/ripple_data/crypto/ripple_CBigNum.h
+++ b/modules/ripple_data/crypto/ripple_CBigNum.h
@@ -51,7 +51,7 @@ public:

 //------------------------------------------------------------------------------

-// VFALCO: TODO figure out a way to remove the dependency on openssl in the
+// VFALCO TODO figure out a way to remove the dependency on openssl in the
 //		   header. Maybe rewrite this to use cryptopp.

 class CBigNum : public BIGNUM
@@ -130,7 +130,7 @@ bool operator>(const CBigNum& a, const CBigNum& b);

 //------------------------------------------------------------------------------

-// VFALCO: NOTE, this seems as good a place as any for this.
+// VFALCO NOTE this seems as good a place as any for this.

 // Here's the old implementation using macros, in case something broke
 //#if (ULONG_MAX > UINT_MAX)
@@ -140,7 +140,7 @@ bool operator>(const CBigNum& a, const CBigNum& b);
 //#define BN_div_word64(bn, word) BN_div_word(bn, word)
 //#endif

-// VFALCO: I believe only STAmount uses these
+// VFALCO I believe only STAmount uses these
 extern int BN_add_word64 (BIGNUM *a, uint64 w);
 extern int BN_sub_word64 (BIGNUM *a, uint64 w);
 extern int BN_mul_word64 (BIGNUM *a, uint64 w);
--- a/modules/ripple_data/crypto/ripple_CKey.cpp
+++ b/modules/ripple_data/crypto/ripple_CKey.cpp
@@ -4,4 +4,4 @@
 // file license.txt or http://www.opensource.org/licenses/mit-license.php.


-// VFALCO: TODO, move inlined stuff from CKey into here
+// VFALCO TODO move inlined stuff from CKey into here
--- a/modules/ripple_data/crypto/ripple_CKey.h
+++ b/modules/ripple_data/crypto/ripple_CKey.h
@@ -32,7 +32,7 @@
 // see www.keylength.com
 // script supports up to 75 for single byte push

-// VFALCO: NOTE, this is unused
+// VFALCO NOTE this is unused
 /*
 int static inline EC_KEY_regenerate_key(EC_KEY *eckey, BIGNUM *priv_key)
 {
--- a/modules/ripple_data/crypto/ripple_RFC1751.cpp
+++ b/modules/ripple_data/crypto/ripple_RFC1751.cpp
@@ -2,7 +2,7 @@
 // RFC 1751 code converted to C++/Boost.
 //

-// VFALCO: TODO, move these
+// VFALCO TODO move these
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/algorithm/string/predicate.hpp>
--- a/modules/ripple_data/protocol/ripple_FieldNames.h
+++ b/modules/ripple_data/protocol/ripple_FieldNames.h
@@ -1,7 +1,7 @@
 #ifndef RIPPLE_FIELDNAMES_H
 #define RIPPLE_FIELDNAMES_H

-// VFALCO: TODO, lose the macro.
+// VFALCO TODO lose the macro.
 #define FIELD_CODE(type, index) ((static_cast<int>(type) << 16) | index)

 enum SerializedTypeID
@@ -23,7 +23,7 @@ enum SerializedTypeID
 	STI_VALIDATION	= 10003,
 };

-// VFALCO: TODO, rename this to NamedField
+// VFALCO TODO rename this to NamedField
 class SField
 {
 public:
@@ -104,7 +104,7 @@ public:

 	static int compare(SField::ref f1, SField::ref f2);

-    // VFALCO: TODO, make these private
+    // VFALCO TODO make these private
 protected:
 	static std::map<int, ptr>	codeToField;
 	static boost::mutex			mapMutex;
--- a/modules/ripple_data/protocol/ripple_LedgerFormat.cpp
+++ b/modules/ripple_data/protocol/ripple_LedgerFormat.cpp
@@ -3,7 +3,7 @@ std::map <int, LedgerEntryFormat*> LedgerEntryFormat::byType;

 std::map <std::string, LedgerEntryFormat*> LedgerEntryFormat::byName;

-// VFALCO: TODO, surely we can think of a better way than macros?
+// VFALCO TODO surely we can think of a better way than macros?

 #define LEF_BASE											\
 	<< SOElement(sfLedgerIndex,				SOE_OPTIONAL)	\
--- a/modules/ripple_data/protocol/ripple_PackedMessage.h
+++ b/modules/ripple_data/protocol/ripple_PackedMessage.h
@@ -25,7 +25,7 @@ public:

    /** Retrieve the packed message data.
    */
-    // VFALCO: TODO, shouldn't this be const?
+    // VFALCO TODO shouldn't this be const?
 	std::vector <uint8_t>& getBuffer()
    {
        return mBuffer;
--- a/modules/ripple_data/protocol/ripple_RippleAddress.cpp
+++ b/modules/ripple_data/protocol/ripple_RippleAddress.cpp
@@ -1,6 +1,6 @@


-// VFALCO: TODO, remove this when it's safe to do so.
+// VFALCO TODO remove this when it's safe to do so.
 #ifdef __APPLICATION__
 #error Including Application.h is disallowed!
 #endif
--- a/modules/ripple_data/protocol/ripple_RippleSystem.h
+++ b/modules/ripple_data/protocol/ripple_RippleSystem.h
@@ -3,7 +3,7 @@

 /** Protocol specific constant globals.
 */
-// VFALCO: NOTE, use these from now on instead of the macros!!
+// VFALCO NOTE use these from now on instead of the macros!!
 class RippleSystem
 {
 public:
@@ -28,7 +28,7 @@ public:
    }
 };

-// VFALCO: TODO, I would love to replace these macros with the language
+// VFALCO TODO I would love to replace these macros with the language
 //         constructs above. The problem is the way they are used at
 //         the point of call, i.e. "User-agent:" SYSTEM_NAME
 //         It will be necessary to rewrite some of them to use string streams.
--- a/modules/ripple_data/protocol/ripple_SerializedObject.h
+++ b/modules/ripple_data/protocol/ripple_SerializedObject.h
@@ -186,7 +186,7 @@ public:
 	const vector& getValue() const					{ return value; }
 	vector& getValue()								{ return value; }

-    // VFALCO: NOTE as long as we're married to boost why not use boost::iterator_facade?
+    // VFALCO NOTE as long as we're married to boost why not use boost::iterator_facade?
    //
    // vector-like functions
 	void push_back(const STObject& object)			{ value.push_back(object.oClone().release()); }
--- a/modules/ripple_data/protocol/ripple_SerializedObjectTemplate.h
+++ b/modules/ripple_data/protocol/ripple_SerializedObjectTemplate.h
@@ -5,7 +5,7 @@

 /** Flags for elements in a SerializedObjectTemplate.
 */
-// VFALCO: NOTE, these don't look like bit-flags...
+// VFALCO NOTE these don't look like bit-flags...
 enum SOE_Flags
 {
 	SOE_INVALID  = -1,
--- a/modules/ripple_data/protocol/ripple_SerializedTypes.h
+++ b/modules/ripple_data/protocol/ripple_SerializedTypes.h
@@ -1,7 +1,7 @@
 #ifndef RIPPLE_SERIALIZEDTYPES_H
 #define RIPPLE_SERIALIZEDTYPES_H

-// VFALCO: TODO, fix this restriction on copy assignment.
+// VFALCO TODO fix this restriction on copy assignment.
 //
 // CAUTION: Do not create a vector (or similar container) of any object derived from
 // SerializedType. Use Boost ptr_* containers. The copy assignment operator of
@@ -25,12 +25,12 @@ enum PathFlags
 	PF_ISSUE			= 0x80,
 };

-// VFALCO: TODO, make these non static or otherwise clean constants.
+// VFALCO TODO make these non static or otherwise clean constants.
 static const uint160 u160_zero(0), u160_one(1);
 static inline const uint160& get_u160_zero() { return u160_zero; }
 static inline const uint160& get_u160_one() { return u160_one; }

-// VFALCO: TODO, replace these with language constructs, gah!
+// VFALCO TODO replace these with language constructs, gah!
 #define CURRENCY_XRP		get_u160_zero()
 #define CURRENCY_ONE		get_u160_one()					// Used as a place holder.
 #define CURRENCY_BAD		uint160(0x5852500000000000)		// Do not allow XRP as an IOU currency.
@@ -79,7 +79,7 @@ public:
 	virtual bool isDefault() const	{ return true; }

 protected:
-    // VFALCO: TODO, make accessors for this
+    // VFALCO TODO make accessors for this
 	SField::ptr	fName;

 private:
@@ -476,7 +476,7 @@ private:
 	}
 };

-// VFALCO: TODO Make static member accessors for these in STAmount
+// VFALCO TODO Make static member accessors for these in STAmount
 extern const STAmount saZero;
 extern const STAmount saOne;

@@ -631,7 +631,7 @@ private:
 class STPathElement
 {
 private:
-    // VFALCO: Remove these friend declarations
+    // VFALCO Remove these friend declarations
    friend class STPathSet;
    friend class STPath;
    friend class Pathfinder;
--- a/modules/ripple_data/protocol/ripple_TER.h
+++ b/modules/ripple_data/protocol/ripple_TER.h
@@ -1,11 +1,11 @@
 #ifndef RIPPLE_TER_H
 #define RIPPLE_TER_H

-// VFALCO: TODO do not use auto-incrementing. Explicitly assign each
+// VFALCO TODO do not use auto-incrementing. Explicitly assign each
 //              constant so there is no possibility of someone coming in
 //              and screwing it up.
 //
-// VFALCO: TODO, consider renaming TER to TxErr or TxResult for clarity.
+// VFALCO TODO consider renaming TER to TxErr or TxResult for clarity.
 //
 enum TER	// aka TransactionEngineResult
 {
@@ -17,7 +17,7 @@ enum TER	// aka TransactionEngineResult
 	// - Not forwarded
 	// - No fee check
 	telLOCAL_ERROR	= -399,
-	telBAD_DOMAIN, // VFALCO: TODO, should read "telBAD_DOMAIN = -398," etc...
+	telBAD_DOMAIN, // VFALCO TODO should read "telBAD_DOMAIN = -398," etc...
 	telBAD_PATH_COUNT,
 	telBAD_PUBLIC_KEY,
 	telFAILED_PROCESSING,
@@ -143,7 +143,7 @@ enum TER	// aka TransactionEngineResult
 	tecUNFUNDED					= 129,	// Deprecated, old ambiguous unfunded.
 };

-// VFALCO: TODO, change these to normal functions.
+// VFALCO TODO change these to normal functions.
 #define isTelLocal(x)		((x) >= telLOCAL_ERROR && (x) < temMALFORMED)
 #define isTemMalformed(x)	((x) >= temMALFORMED && (x) < tefFAILURE)
 #define isTefFailure(x)		((x) >= tefFAILURE && (x) < terRETRY)
@@ -151,7 +151,7 @@ enum TER	// aka TransactionEngineResult
 #define isTesSuccess(x)		((x) == tesSUCCESS)
 #define isTecClaim(x)		((x) >= tecCLAIM)

-// VFALCO: TODO, group these into a shell class along with the defines above.
+// VFALCO TODO group these into a shell class along with the defines above.
 extern bool transResultInfo (TER terCode, std::string& strToken, std::string& strHuman);
 extern std::string transToken (TER terCode);
 extern std::string transHuman (TER terCode);
--- a/modules/ripple_data/protocol/ripple_TransactionFormat.cpp
+++ b/modules/ripple_data/protocol/ripple_TransactionFormat.cpp
@@ -3,7 +3,7 @@ std::map<int, TransactionFormat*> TransactionFormat::byType;

 std::map<std::string, TransactionFormat*> TransactionFormat::byName;

-// VFALCO: TODO, surely we can think of a better way than to use macros??
+// VFALCO TODO surely we can think of a better way than to use macros??
 #define TF_BASE												\
 		<< SOElement(sfTransactionType,		SOE_REQUIRED)	\
 		<< SOElement(sfFlags,				SOE_OPTIONAL)	\
--- a/modules/ripple_data/ripple_data.cpp
+++ b/modules/ripple_data/ripple_data.cpp
@@ -51,7 +51,7 @@
 #include <openssl/rand.h>
 #include <openssl/err.h>

-// VFALCO: TODO, fix these warnings!
+// VFALCO TODO fix these warnings!
 #ifdef _MSC_VER
 //#pragma warning (push) // Causes spurious C4503 "decorated name exceeds maximum length"
 #pragma warning (disable: 4018) // signed/unsigned mismatch
@@ -65,7 +65,7 @@
 #endif

 #include "crypto/ripple_Base58.h" // for RippleAddress
-#include "crypto/ripple_CKey.h" // needs RippleAddress VFALCO: TODO, remove this dependency cycle
+#include "crypto/ripple_CKey.h" // needs RippleAddress VFALCO TODO remove this dependency cycle
 #include "crypto/ripple_RFC1751.h"

 #include "crypto/ripple_CBigNum.cpp"
@@ -95,7 +95,7 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
 #include "protocol/ripple_STAmount.cpp"
 #include "protocol/ripple_STAmountRound.cpp"

-// VFALCO: TODO Fix this for SConstruct
+// VFALCO TODO Fix this for SConstruct
 #ifdef _MSC_VER
 #include "ripple.pb.cc" // BROKEN because of SConstruct
 #endif
--- a/modules/ripple_data/ripple_data.h
+++ b/modules/ripple_data/ripple_data.h
@@ -45,7 +45,7 @@
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/functional/hash.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/ptr_container/ptr_vector.hpp> // VFALCO: NOTE, this looks like junk
+#include <boost/ptr_container/ptr_vector.hpp> // VFALCO NOTE this looks like junk

 #include <openssl/bn.h>
 #include <openssl/ec.h>
@@ -54,15 +54,15 @@

 //------------------------------------------------------------------------------

-// VFALCO: TODO, try to reduce these dependencies
+// VFALCO TODO try to reduce these dependencies
 #include "../ripple_basics/ripple_basics.h"

-// VFALCO: TODO, figure out a good place for this file, perhaps give it some
+// VFALCO TODO figure out a good place for this file, perhaps give it some
 //         additional hierarchy via directories.
 #include "ripple.pb.h"

 #include "crypto/ripple_CBigNum.h"
-#include "crypto/ripple_Base58.h" // VFALCO: TODO, Can be moved to .cpp if we clean up setAlphabet stuff
+#include "crypto/ripple_Base58.h" // VFALCO TODO Can be moved to .cpp if we clean up setAlphabet stuff
 #include "crypto/ripple_Base58Data.h"

 #include "protocol/ripple_FieldNames.h"
--- a/modules/ripple_json/json/json_autolink.h
+++ b/modules/ripple_json/json/json_autolink.h
@@ -1,7 +1,7 @@
 #ifndef JSON_AUTOLINK_H_INCLUDED
 # define JSON_AUTOLINK_H_INCLUDED

-// VFALCO: TODO, remove this file
+// VFALCO TODO remove this file
 #error This file is deprecated!

 # include "config.h"
--- a/modules/ripple_json/ripple_json.cpp
+++ b/modules/ripple_json/ripple_json.cpp
@@ -24,7 +24,7 @@

 #include "ripple_json.h"

-// VFALCO: TODO Remove unneeded includes
+// VFALCO TODO Remove unneeded includes
 #include <cstddef>
 #include <cstdio>
 #include <cstring>
@@ -40,7 +40,7 @@
 # include <cpptl/conststring.h>
 #endif

-// VFALCO: TODO, eliminate this boost dependency
+// VFALCO TODO eliminate this boost dependency
 #include <boost/lexical_cast.hpp>

 #ifndef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
--- a/modules/ripple_json/ripple_json.h
+++ b/modules/ripple_json/ripple_json.h
@@ -32,7 +32,7 @@
 #ifndef RIPPLE_JSON_H
 #define RIPPLE_JSON_H

-// VFALCO: TODO Remove unneeded includes
+// VFALCO TODO Remove unneeded includes
 #include <cassert>
 #include <cstring>
 #include <cstdlib>
--- a/modules/ripple_main/ripple_main.cpp
+++ b/modules/ripple_main/ripple_main.cpp
@@ -66,7 +66,7 @@

 //------------------------------------------------------------------------------

-// VFALCO: TODO, prepare a unity header for LevelDB
+// VFALCO TODO prepare a unity header for LevelDB
 #include "leveldb/cache.h"
 #include "leveldb/filter_policy.h"
 #include "leveldb/db.h"
@@ -74,7 +74,7 @@

 //------------------------------------------------------------------------------

-// VFALCO: TODO, fix these warnings!
+// VFALCO TODO fix these warnings!
 #ifdef _MSC_VER
 //#pragma warning (push) // Causes spurious C4503 "decorated name exceeds maximum length"
 #pragma warning (disable: 4018) // signed/unsigned mismatch
@@ -83,7 +83,7 @@
 #pragma warning (disable: 4535) // call requires /EHa
 #endif

-// VFALCO: NOTE, these includes generate warnings, unfortunately.
+// VFALCO NOTE these includes generate warnings, unfortunately.
 #include "ripple_main.h"
 #include "../ripple_data/ripple_data.h"

@@ -97,7 +97,7 @@

 //------------------------------------------------------------------------------
 //
-// VFALCO: BEGIN CLEAN AREA
+// VFALCO BEGIN CLEAN AREA

 #include "src/cpp/ripple/ripple_Config.h"
 #include "src/cpp/ripple/ripple_DatabaseCon.h"
@@ -114,24 +114,24 @@
 #include "src/cpp/ripple/ripple_IFeeVote.h"
 #include "src/cpp/ripple/ripple_IHashRouter.h"
 #include "src/cpp/ripple/ripple_ILoadFeeTrack.h"
-#include "src/cpp/ripple/ripple_Peer.h" // VFALCO: TODO Rename to IPeer
+#include "src/cpp/ripple/ripple_Peer.h" // VFALCO TODO Rename to IPeer
 #include "src/cpp/ripple/ripple_IPeers.h"
 #include "src/cpp/ripple/ripple_IProofOfWorkFactory.h"
 #include "src/cpp/ripple/ripple_IUniqueNodeList.h"
 #include "src/cpp/ripple/ripple_IValidations.h"

-// VFALCO: END CLEAN AREA
+// VFALCO END CLEAN AREA
 //
 //------------------------------------------------------------------------------

-// VFALCO: NOTE, Order matters! If you get compile errors, move just 1
+// VFALCO NOTE Order matters! If you get compile errors, move just 1
 //               include upwards as little as possible to fix it.
 //            
 #include "src/cpp/ripple/ScriptData.h"
 #include "src/cpp/ripple/Contract.h"
 #include "src/cpp/ripple/Interpreter.h"
 #include "src/cpp/ripple/Operation.h"
-// VFALCO: NOTE, Order matters
+// VFALCO NOTE Order matters
 #include "src/cpp/ripple/AcceptedLedger.h"
 #include "src/cpp/ripple/AccountItems.h"
 #include "src/cpp/ripple/AccountSetTransactor.h"
@@ -198,7 +198,7 @@

 //------------------------------------------------------------------------------

-// VFALCO: TODO, figure out who needs these and move to a sensible private header.
+// VFALCO TODO figure out who needs these and move to a sensible private header.
 static const uint64 tenTo14 = 100000000000000ull;
 static const uint64 tenTo14m1 = tenTo14 - 1;
 static const uint64 tenTo17 = tenTo14 * 1000;
@@ -208,7 +208,7 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
 // Generate DH for SSL connection.
 static DH* handleTmpDh(SSL* ssl, int is_export, int iKeyLength)
 {
-// VFALCO: TODO, eliminate this horrendous dependency on theApp and Wallet
+// VFALCO TODO eliminate this horrendous dependency on theApp and Wallet
 	return 512 == iKeyLength ? theApp->getWallet().getDh512() : theApp->getWallet().getDh1024();
 }