From a1e614d69435bd8c05831d85dc746ccc2f2e09c5 Mon Sep 17 00:00:00 2001 From: Brian Cox Date: Tue, 11 Apr 2017 21:29:32 -0700 Subject: [PATCH] Remove irritating 'eof:' comments, and some ancient dead code in stringutil.cpp --- src/core/charutil.cpp | 2 +- src/core/core.cpp | 2 +- src/core/corestrings.cpp | 2 +- src/core/displayutil.cpp | 2 +- src/core/ntmbs.cpp | 2 +- src/core/stdcore.cpp | 2 +- src/core/stringutil.cpp | 148 ----------------------------------- src/db/db.cpp | 1 - src/db/stddb.cpp | 2 +- src/fco/fco.cpp | 2 +- src/fco/fcostrings.cpp | 2 +- src/fco/fcoundefprop.cpp | 2 +- src/fco/stdfco.cpp | 2 +- src/fs/stdfs.cpp | 2 +- src/siggen/siggen.cpp | 2 +- src/siggen/siggenstrings.cpp | 2 +- src/siggen/stdsiggen.cpp | 2 +- src/tripwire/stdtripwire.cpp | 2 +- src/tripwire/tripwire.cpp | 2 +- src/tw/stdtw.cpp | 2 +- src/tw/tw.cpp | 2 +- src/tw/twstrings.cpp | 2 +- src/twadmin/stdtwadmin.cpp | 2 +- src/twadmin/twadmin.cpp | 2 +- src/twcrypto/stdtwcrypto.cpp | 2 +- src/twcrypto/twcrypto.cpp | 2 +- src/twparser/stdtwparser.cpp | 2 +- src/twprint/stdtwprint.cpp | 2 +- src/twprint/twprint.cpp | 2 +- src/twtest/codeconvert_t.cpp | 2 +- src/twtest/resources_t.cpp | 2 +- src/twtest/stdtest.cpp | 2 +- src/util/stdutil.cpp | 2 +- src/util/util.cpp | 2 +- src/util/utilstrings.cpp | 2 +- 35 files changed, 33 insertions(+), 182 deletions(-) diff --git a/src/core/charutil.cpp b/src/core/charutil.cpp index 48326b8..85f3a5b 100644 --- a/src/core/charutil.cpp +++ b/src/core/charutil.cpp @@ -150,4 +150,4 @@ bool cCharUtil::PopNextChar( TSTRING::const_iterator& cur, return f; } -// eof: charutil.cpp + diff --git a/src/core/core.cpp b/src/core/core.cpp index 453b509..966831b 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -61,4 +61,4 @@ cCore::cCore() } -// eof: core.cpp + diff --git a/src/core/corestrings.cpp b/src/core/corestrings.cpp index 18d7648..a23492e 100644 --- a/src/core/corestrings.cpp +++ b/src/core/corestrings.cpp @@ -70,4 +70,4 @@ TSS_BeginStringtable( cCore ) TSS_EndStringtable( cCore ) -// eof: corestrings.cpp + diff --git a/src/core/displayutil.cpp b/src/core/displayutil.cpp index aa45571..23c3e5f 100644 --- a/src/core/displayutil.cpp +++ b/src/core/displayutil.cpp @@ -97,4 +97,4 @@ TSTRING cDisplayUtil::FormatMultiLineString( const TSTRING& str, int nOffset, in return( sstr.str() ); } -// eof: displayutil.cpp + diff --git a/src/core/ntmbs.cpp b/src/core/ntmbs.cpp index 94de08c..647d285 100644 --- a/src/core/ntmbs.cpp +++ b/src/core/ntmbs.cpp @@ -244,5 +244,5 @@ tss::mbscount( const_ntmbs_t psz ) return nCount; } -// eof: ntmbs.cpp + diff --git a/src/core/stdcore.cpp b/src/core/stdcore.cpp index 1798c5b..21f477d 100644 --- a/src/core/stdcore.cpp +++ b/src/core/stdcore.cpp @@ -37,4 +37,4 @@ #include "stdcore.h" -// eof: stdcore.cpp + diff --git a/src/core/stringutil.cpp b/src/core/stringutil.cpp index bb3fecc..d1b7f69 100644 --- a/src/core/stringutil.cpp +++ b/src/core/stringutil.cpp @@ -361,151 +361,3 @@ wc16_string cStringUtil::TstrToWstr( const TSTRING& rhs ) cStringUtil::Convert( lhs, rhs ); return lhs; } - -/////////////////////////////////////////////////////////////////////////////// -// StringIsInteger -- returns true if the string is a length of at least one -// and contains nothing other than [0-9]. -// Used to verify a string is acceptable to pass to atoi() -/////////////////////////////////////////////////////////////////////////////// -#ifdef OLDCODE -bool cStringUtil::StringIsInteger(TCHAR* pStr) -{ - int len = _tcslen(pStr); - - if (len <= 0) - return false; - - for (int i = 0; i < len; ++i) - { - if (pStr[i] < _T('0') || pStr[i] > _T('9')) - return false; - } - - return true; -} -#endif//OLDCODE - -// eof: stringutil.cpp - -/* - - -typedef wchar_t dbchar_t; -typedef char mbchar_t; - -class cMBUCS2Cache -{ -public: - cMBUCS2Cache(); - ~cMBUCS2Cache(); - - bool Convert(dbchar_t& ret, mbchar_t* pMBChar); - // returns false if conversion could not be done - void Add(mbchar_t* pMBchar, int mblen); - // add a mb char def to the chache - -protected: - struct Element - { - union - { - Element* mpNext; // points to another Element[256] - dbchar_t mUCS2; - }; - - enum ElementDefinition { UNDEFINED, UCS2, CONTINUES }; - short mElementDefinition; - - Element() { mElementDefinition = UNDEFINED; } - ~Element() { if (mElementDefinition == CONTINUES) delete mpNext; } - }; - - Element mTop[256]; -}; - - -cMBUCS2Cache::cMBUCS2Cache() -{ -} - -cMBUCS2Cache::~cMBUCS2Cache() -{ -} - -// returns false if conversion could not be done -bool cMBUCS2Cache::Convert(dbchar_t& ret, mbchar_t* pMBChar) -{ - Element* pNode = mTop; - while (pNode[*pMBChar].mElementDefinition == Element::CONTINUES) - { - pNode = pNode[*pMBChar].mpNext; - ++pMBChar; - } - - if (pNode[*pMBChar].mElementDefinition == Element::UCS2) - { - ret = pNode[*pMBChar].mUCS2; - return true; - } - - return false; -} - -// add a mb char def to the chache -void cMBUCS2Cache::Add(mbchar_t* pMBchar, int mblen, dbchar_t ucs2) -{ - ASSERT(mblen > 0); - - Element* pNode = mTop; - while (mblen > 1); - { - // this ASSERT fails if there is a UCS2 definition for a mbchar - // whose first few bytes are identical to this char - ASSERT(pNode[*pMBchar].mElementDefinition == Element::UNDEFINED || - pNode[*pMBchar].mElementDefinition == Element::CONTINUES) - - if (pNode[*pMBchar].mElementDefinition == Element::UNDEFINED) - { - pNode[*pMBchar].mElementDefinition = Element::CONINUES; - pNode = pNode[*pMBchar].mpNext = new Element[256]; - } - else - { - pNode = pNode[*pMBchar].mpNext; - } - - --mblen; - ++pMBChar; - } - - // this assert makes sure everything is sane - ASSERT(pNode[*pMBchar].mElementDefinition == Element::UNDEFINED || - (pNode[*pMBchar].mElementDefinition == Element::UCS2 && pNode[*pMBchar].mUCS2 == ucs2)); - - // this assert fails if we attempt to add the same mbchar twice - ASSERT(pNode[*pMBchar].mElementDefinition == Element::UNDEFINED) - - pNode[*pMBchar].mElementDefinition = Element::UCS2; - pNode[*pMBchar].mUCS2 = ucs2; -} -*/ -/* -static inline const byte* tss_hash_key_convert()( const TCHAR* psz, int* const pcbKeyLen ) -{ - *pcbKeyLen = sizeof(TCHAR) * _tcslen( psz ); - return (byte*)psz; -} - -static inline bool tss_hash_key_compare()( const TCHAR* lhs, const TCHAR* rhs ) -{ - return ( _tcscmp( lhs, rhs ) == 0 ); -} - -cHashTable< dbchar_t*, - mbchar_t*, - tss_hash_key_convert, - tss_hash_key_compare > ha; - */ - - - diff --git a/src/db/db.cpp b/src/db/db.cpp index 6493d78..79aeb75 100644 --- a/src/db/db.cpp +++ b/src/db/db.cpp @@ -47,5 +47,4 @@ cDb::cDb() } -// eof: db.cpp diff --git a/src/db/stddb.cpp b/src/db/stddb.cpp index 22bd5cc..7037167 100644 --- a/src/db/stddb.cpp +++ b/src/db/stddb.cpp @@ -38,4 +38,4 @@ #include "stddb.h" -// eof: stddb.cpp + diff --git a/src/fco/fco.cpp b/src/fco/fco.cpp index 85a88ed..ca44e38 100644 --- a/src/fco/fco.cpp +++ b/src/fco/fco.cpp @@ -57,4 +57,4 @@ iFCO::~iFCO() { } -// eof: fco.cpp + diff --git a/src/fco/fcostrings.cpp b/src/fco/fcostrings.cpp index 369f528..01e91cf 100644 --- a/src/fco/fcostrings.cpp +++ b/src/fco/fcostrings.cpp @@ -53,4 +53,4 @@ TSS_BeginStringtable( cFCO ) TSS_EndStringtable( cFCO ) -// eof: fcostrings.cpp + diff --git a/src/fco/fcoundefprop.cpp b/src/fco/fcoundefprop.cpp index 2de785f..01cc82f 100644 --- a/src/fco/fcoundefprop.cpp +++ b/src/fco/fcoundefprop.cpp @@ -138,4 +138,4 @@ void cFCOUndefinedProp::Copy(const iFCOProp* rhs) ThrowAndAssert( INTERNAL_ERROR("fcoundefprop.cpp") ); } -// eof: fcoundefprop.cpp + diff --git a/src/fco/stdfco.cpp b/src/fco/stdfco.cpp index 6d6acbc..8f1ab77 100644 --- a/src/fco/stdfco.cpp +++ b/src/fco/stdfco.cpp @@ -37,4 +37,4 @@ #include "stdfco.h" -// eof: stdfco.cpp + diff --git a/src/fs/stdfs.cpp b/src/fs/stdfs.cpp index 4a7c176..d281648 100644 --- a/src/fs/stdfs.cpp +++ b/src/fs/stdfs.cpp @@ -37,4 +37,4 @@ #include "stdfs.h" -// eof: stdfs.cpp + diff --git a/src/siggen/siggen.cpp b/src/siggen/siggen.cpp index 06b63a8..2711a5f 100644 --- a/src/siggen/siggen.cpp +++ b/src/siggen/siggen.cpp @@ -67,5 +67,5 @@ cSiggen::cSiggen() TSS_Dependency( cTWCrypto ); } -// eof: siggen.cpp + diff --git a/src/siggen/siggenstrings.cpp b/src/siggen/siggenstrings.cpp index fb8a8c2..304e602 100644 --- a/src/siggen/siggenstrings.cpp +++ b/src/siggen/siggenstrings.cpp @@ -75,5 +75,5 @@ TSS_BeginStringtable( cSiggen ) TSS_EndStringtable( cSiggen ) -// eof: siggenstrings.cpp + diff --git a/src/siggen/stdsiggen.cpp b/src/siggen/stdsiggen.cpp index 54e47e1..21a73bf 100644 --- a/src/siggen/stdsiggen.cpp +++ b/src/siggen/stdsiggen.cpp @@ -37,4 +37,4 @@ // #include "stdsiggen.h" -// eof: stdsiggen.cpp + diff --git a/src/tripwire/stdtripwire.cpp b/src/tripwire/stdtripwire.cpp index 76e5c8c..ec619e8 100644 --- a/src/tripwire/stdtripwire.cpp +++ b/src/tripwire/stdtripwire.cpp @@ -37,4 +37,4 @@ // #include "stdtripwire.h" -// eof: stdtripwire.cpp + diff --git a/src/tripwire/tripwire.cpp b/src/tripwire/tripwire.cpp index bcdfd30..0895e18 100644 --- a/src/tripwire/tripwire.cpp +++ b/src/tripwire/tripwire.cpp @@ -69,5 +69,5 @@ cTripwire::cTripwire() TSS_REGISTER_PKG_ERRORS( tripwire ) } -// eof: tripwire.cpp + diff --git a/src/tw/stdtw.cpp b/src/tw/stdtw.cpp index 7111d82..7105562 100644 --- a/src/tw/stdtw.cpp +++ b/src/tw/stdtw.cpp @@ -37,4 +37,4 @@ // #include "stdtw.h" -// eof: stdtw.cpp + diff --git a/src/tw/tw.cpp b/src/tw/tw.cpp index dcb0d66..e9a8b44 100644 --- a/src/tw/tw.cpp +++ b/src/tw/tw.cpp @@ -66,5 +66,5 @@ cTW::cTW() TSS_REGISTER_PKG_ERRORS( tw ) } -// eof: tw.cpp + diff --git a/src/tw/twstrings.cpp b/src/tw/twstrings.cpp index da4637b..61ee236 100644 --- a/src/tw/twstrings.cpp +++ b/src/tw/twstrings.cpp @@ -249,5 +249,5 @@ TSS_BeginStringtable( cTW ) TSS_EndStringtable( cTW ) -// eof: twstrings.cpp + diff --git a/src/twadmin/stdtwadmin.cpp b/src/twadmin/stdtwadmin.cpp index 380ac77..c92529a 100644 --- a/src/twadmin/stdtwadmin.cpp +++ b/src/twadmin/stdtwadmin.cpp @@ -37,4 +37,4 @@ #include "stdtwadmin.h" -// eof: stdtwadmin.cpp + diff --git a/src/twadmin/twadmin.cpp b/src/twadmin/twadmin.cpp index 84f0fb1..cb07495 100644 --- a/src/twadmin/twadmin.cpp +++ b/src/twadmin/twadmin.cpp @@ -69,4 +69,4 @@ cTWAdmin::cTWAdmin() TSS_REGISTER_PKG_ERRORS ( twadmin ); } -// eof: twadmin.cpp + diff --git a/src/twcrypto/stdtwcrypto.cpp b/src/twcrypto/stdtwcrypto.cpp index b5a0e4b..2361476 100644 --- a/src/twcrypto/stdtwcrypto.cpp +++ b/src/twcrypto/stdtwcrypto.cpp @@ -38,4 +38,4 @@ #include "stdtwcrypto.h" -// eof: stdtwcrypto.cpp + diff --git a/src/twcrypto/twcrypto.cpp b/src/twcrypto/twcrypto.cpp index ba4dba7..3c7e775 100644 --- a/src/twcrypto/twcrypto.cpp +++ b/src/twcrypto/twcrypto.cpp @@ -63,4 +63,4 @@ cTWCrypto::cTWCrypto() TSS_REGISTER_PKG_ERRORS( twcrypto ) } -// eof: twcrypto.cpp + diff --git a/src/twparser/stdtwparser.cpp b/src/twparser/stdtwparser.cpp index bb8b146..58e5f13 100644 --- a/src/twparser/stdtwparser.cpp +++ b/src/twparser/stdtwparser.cpp @@ -37,4 +37,4 @@ #include "stdtwparser.h" -// eof: stdtwparser.cpp + diff --git a/src/twprint/stdtwprint.cpp b/src/twprint/stdtwprint.cpp index 6894eb9..7f2af88 100644 --- a/src/twprint/stdtwprint.cpp +++ b/src/twprint/stdtwprint.cpp @@ -37,4 +37,4 @@ #include "stdtwprint.h" -// eof: stdtwprint.cpp + diff --git a/src/twprint/twprint.cpp b/src/twprint/twprint.cpp index 921a4dd..5a0bcd9 100644 --- a/src/twprint/twprint.cpp +++ b/src/twprint/twprint.cpp @@ -69,4 +69,4 @@ cTWPrint::cTWPrint() TSS_REGISTER_PKG_ERRORS ( twprint ); } -// eof: twprint.cpp + diff --git a/src/twtest/codeconvert_t.cpp b/src/twtest/codeconvert_t.cpp index 36cb169..6d1def4 100644 --- a/src/twtest/codeconvert_t.cpp +++ b/src/twtest/codeconvert_t.cpp @@ -340,5 +340,5 @@ bool LowASCIILooksLikeUCS2InWchart() return fOK; } -// eof: codeconvert_t.cpp + diff --git a/src/twtest/resources_t.cpp b/src/twtest/resources_t.cpp index 94332cf..652f75a 100644 --- a/src/twtest/resources_t.cpp +++ b/src/twtest/resources_t.cpp @@ -96,5 +96,5 @@ void TestResources() } -// eof: tss.resources_t.cpp + diff --git a/src/twtest/stdtest.cpp b/src/twtest/stdtest.cpp index 483df60..3c34d0f 100644 --- a/src/twtest/stdtest.cpp +++ b/src/twtest/stdtest.cpp @@ -37,4 +37,4 @@ // #include "stdtest.h" -// eof: stdtest.cpp + diff --git a/src/util/stdutil.cpp b/src/util/stdutil.cpp index 7d53ebd..16814c9 100644 --- a/src/util/stdutil.cpp +++ b/src/util/stdutil.cpp @@ -38,4 +38,4 @@ #include "stdutil.h" -// eof: stdutil.cpp + diff --git a/src/util/util.cpp b/src/util/util.cpp index 9ea5874..d893ecc 100644 --- a/src/util/util.cpp +++ b/src/util/util.cpp @@ -71,4 +71,4 @@ TSS_EndTestSuite( cUtil ) #endif // #ifdef TSS_TEST -// eof: util.cpp + diff --git a/src/util/utilstrings.cpp b/src/util/utilstrings.cpp index 2c78e15..a548870 100644 --- a/src/util/utilstrings.cpp +++ b/src/util/utilstrings.cpp @@ -49,4 +49,4 @@ TSS_BeginStringtable( cUtil ) TSS_EndStringtable( cUtil ) -// eof: utilstrings.cpp +