diff options
| author | Danny Roberts <dannyroberts.personal@googlemail.com> | 2011-02-18 10:30:50 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-02-18 10:30:50 +0100 |
| commit | 97d72b9f85263df68abb8367da35ec1c2e300b75 (patch) | |
| tree | d4f85ae1e242b33252f3bfb6f6476faa83f50bc0 /soltools | |
| parent | 906c6df7e77a8b5e119e852fa98fc84bcfba1795 (diff) | |
Removed some commented code.
Diffstat (limited to 'soltools')
| -rwxr-xr-x | soltools/HIDCompiler/hidclex.l | 2 | ||||
| -rw-r--r-- | soltools/cpp/_macro.c | 21 | ||||
| -rw-r--r-- | soltools/cpp/_mcrvalid.c | 22 | ||||
| -rw-r--r-- | soltools/cpp/_tokens.c | 2 | ||||
| -rw-r--r-- | soltools/cpp/cpp.h | 9 | ||||
| -rw-r--r-- | soltools/giparser/gi_parse.cxx | 11 | ||||
| -rw-r--r-- | soltools/ldump/hashtbl.cxx | 13 | ||||
| -rw-r--r-- | soltools/ldump/ldump.cxx | 3 | ||||
| -rw-r--r-- | soltools/mkdepend/collectdircontent.cxx | 1 | ||||
| -rw-r--r-- | soltools/mkdepend/collectdircontent.hxx | 4 | ||||
| -rw-r--r-- | soltools/mkdepend/main.c | 1 | ||||
| -rw-r--r-- | soltools/mkdepend/parse.c | 2 | ||||
| -rw-r--r-- | soltools/testSHL/inc/tlog.hxx | 2 |
13 files changed, 1 insertions, 92 deletions
diff --git a/soltools/HIDCompiler/hidclex.l b/soltools/HIDCompiler/hidclex.l index e99618f30..8067d7db9 100755 --- a/soltools/HIDCompiler/hidclex.l +++ b/soltools/HIDCompiler/hidclex.l @@ -200,12 +200,10 @@ char* listfilename; char* filename_tab[MAXSRCFILES]; char* project_tab[MAXSRCFILES]; int tab_entries = 0; -//int fileno = 0; /* currently used filenumber */ /* globale variablen */ FILE* outfile; char const *filename = ""; //incl. path -//char *basename = ""; char const *project = ""; char const *subpath = ""; //from project name downwards like source\ui\xxx.src diff --git a/soltools/cpp/_macro.c b/soltools/cpp/_macro.c index 4263a8f67..8be4f3f11 100644 --- a/soltools/cpp/_macro.c +++ b/soltools/cpp/_macro.c @@ -289,7 +289,6 @@ void void expand(Tokenrow * trp, Nlist * np, MacroValidatorList * pValidators) { -// Token * pOldNextTp; Tokenrow ntr; int ntokc, narg; Tokenrow *atr[NARG + 1]; @@ -340,32 +339,12 @@ void } } -/* old - np->flag |= ISACTIVE; -*/ - -/* rh -*/ doconcat(&ntr); /* execute ## operators */ ntr.tp = ntr.bp; makespace(&ntr, trp->tp); -/* old -// expandrow(&ntr, "<expand>"); -// insertrow(trp, ntokc, &ntr); -// dofree(ntr.bp); -// np->flag &= ~ISACTIVE; -*/ - -/* NP - // Replace macro by its value: -*/ -// pOldNextTp = trp->tp+ntokc; tokenrow_zeroTokenIdentifiers(&ntr); insertrow(trp, ntokc, &ntr); - /* Reassign old macro validators: - */ -// mvl_move(pValidators, trp->tp - pOldNextTp); /* add validator for just invalidated macro: */ diff --git a/soltools/cpp/_mcrvalid.c b/soltools/cpp/_mcrvalid.c index fd997d1f8..6f5e1da23 100644 --- a/soltools/cpp/_mcrvalid.c +++ b/soltools/cpp/_mcrvalid.c @@ -5,13 +5,6 @@ #include "cpp.h" -/* - Nlist * pMacro; - Token * pTokenWhereMacroBecomesValid; - struct macroValidator * - pNext; -*/ - void mvl_init(MacroValidatorList * out_pValidators) { @@ -70,21 +63,6 @@ mvl_add( MacroValidatorList * inout_pValidators, inout_pValidators->pFirst = pNew; } -/* -void -mvl_move( MacroValidatorList * inout_pValidators, - int in_nSpace ) -{ - MacroValidator * pV; - for ( pV = inout_pValidators->pFirst; - pV != 0; - pV = pV->pNext ) - { - pV->pTokenWhereMacroBecomesValid += in_nSpace; - } -} -*/ - void mvl_check( MacroValidatorList * inout_pValidators, Token * inout_pTokenToCheck) diff --git a/soltools/cpp/_tokens.c b/soltools/cpp/_tokens.c index 020a23dc5..098bc40d9 100644 --- a/soltools/cpp/_tokens.c +++ b/soltools/cpp/_tokens.c @@ -276,7 +276,6 @@ void { size_t nby; - /* nby = sizeof(Token) * (str->lp - str->bp); */ nby = (char *) str->lp - (char *) str->bp; memmove(dtr->tp, str->bp, nby); } @@ -297,7 +296,6 @@ void size = (trp->lp - trp->bp) + nt; while (size > trp->max) growtokenrow(trp); - /* nby = sizeof(Token) * (trp->lp - trp->tp); */ nby = (char *) trp->lp - (char *) trp->tp; if (nby) memmove(trp->tp + nt, trp->tp, nby); diff --git a/soltools/cpp/cpp.h b/soltools/cpp/cpp.h index ed30a2ce2..5e862740d 100644 --- a/soltools/cpp/cpp.h +++ b/soltools/cpp/cpp.h @@ -144,16 +144,7 @@ void mvl_add( inout_pValidators, Nlist * in_pMacro, Token * in_pTokenWhereMacroBecomesValid); -/* Updates all token pointers within the list, when the tokens have - moved, by - pTokenWhereMacroBecomesValid += in_nNrofTokens; - . -void mvl_move( - MacroValidatorList * - inout_pValidators, - int in_nSpace); // in pointer units. -*/ /* Checks if one of the validators within the list points to the token in_pTokenToCheck. If so, the macro is set valid and the validator is removed. diff --git a/soltools/giparser/gi_parse.cxx b/soltools/giparser/gi_parse.cxx index 02cc4257e..a7958e006 100644 --- a/soltools/giparser/gi_parse.cxx +++ b/soltools/giparser/gi_parse.cxx @@ -69,7 +69,6 @@ GenericInfo_Parser::GenericInfo_Parser() nCurLine(0), nLevel(0), bGoon(false), - // sCurComment, eErrorCode(ok), nErrorLine(0), pResult(0), @@ -319,18 +318,8 @@ GenericInfo_Parser::WriteList( ostream & o_rFile ) { PushLevel_Write(); -/* - WriteIndentation(); - o_rFile.write("{",1); - o_rFile.write(C_sLineEnd, C_nLineEndLength); -*/ WriteList(o_rFile); -/* - WriteIndentation(); - o_rFile.write("}",1); - o_rFile.write(C_sLineEnd, C_nLineEndLength); -*/ PopLevel_Write(); } } // end for diff --git a/soltools/ldump/hashtbl.cxx b/soltools/ldump/hashtbl.cxx index 93f40d9bf..bd8c098de 100644 --- a/soltools/ldump/hashtbl.cxx +++ b/soltools/ldump/hashtbl.cxx @@ -101,19 +101,6 @@ HashTable::~HashTable() // Problem: Virtuelle Funktionen sind im Destructor nicht virtuell!! // Der Code muß deshalb ins Macro - /* - if (m_bOwner) - { - for (ULONG i=0; i<GetSize(); i++) - { - void *pObject = GetObjectAt(i); - - if (pObject != NULL) - OnDeleteObject(pObject()); - } - } - */ - // Speicher für HashItems freigeben delete [] m_pData; } diff --git a/soltools/ldump/ldump.cxx b/soltools/ldump/ldump.cxx index e0e80f1b9..d215cfd52 100644 --- a/soltools/ldump/ldump.cxx +++ b/soltools/ldump/ldump.cxx @@ -165,7 +165,6 @@ bool LibDump::Dump() *pEnd = '\0'; strncpy( aBuf, pFound, strlen( pFound)); aBuf[ strlen( pFound) ] = '\0'; -// fprintf( stderr, "\n--- %s\n", aBuf); break; } else @@ -211,7 +210,6 @@ bool LibDump::Dump() nName++; } } - //fprintf( stderr, "Gefundenen Prefix : %s %d \n", aTmpBuf, nPreLen ); // den ersten _ raus nLen = (int) strlen(aName); #ifndef _WIN64 @@ -580,7 +578,6 @@ LibDump::~LibDump() { delete [] cBName; delete [] cAPrefix; -// delete [] cLibName; delete [] cFilterName; delete [] cModName; } diff --git a/soltools/mkdepend/collectdircontent.cxx b/soltools/mkdepend/collectdircontent.cxx index 60654bd41..884456a38 100644 --- a/soltools/mkdepend/collectdircontent.cxx +++ b/soltools/mkdepend/collectdircontent.cxx @@ -66,7 +66,6 @@ bool IncludesCollection::exists(string filePath) { } else { return true; }; - //return false; }; extern "C" { diff --git a/soltools/mkdepend/collectdircontent.hxx b/soltools/mkdepend/collectdircontent.hxx index 76ac39e36..85428ee03 100644 --- a/soltools/mkdepend/collectdircontent.hxx +++ b/soltools/mkdepend/collectdircontent.hxx @@ -28,8 +28,6 @@ typedef pair<string, string> PathFilePair; struct IncludesCollection { private: DirMap allIncludes; -// bool search(string filePath); -// bool add_dir(string dirPath); PathFilePair split_path(const string& filePath); void add_to_collection(const string& dirPath); @@ -56,6 +54,6 @@ int call_IncludesCollection_exists(struct IncludesCollection* m, const char* fil } #endif -#endif // COLLECTDIRCONTENT_H +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c index 7989eb9b5..c226031a1 100644 --- a/soltools/mkdepend/main.c +++ b/soltools/mkdepend/main.c @@ -351,7 +351,6 @@ int main(argc, argv) break; default: if (endmarker) break; - /* fatalerr("unknown opt = %s\n", argv[0]); */ warning("ignoring option %s\n", argv[0]); } } diff --git a/soltools/mkdepend/parse.c b/soltools/mkdepend/parse.c index ec7e7d42e..9214750c6 100644 --- a/soltools/mkdepend/parse.c +++ b/soltools/mkdepend/parse.c @@ -420,14 +420,12 @@ static int hash( str ) { /* Hash (Kernighan and Ritchie) */ register unsigned int hashval = 0; - //char *s = str; for ( ; *str; str++ ) { hashval = ( hashval * SYMHASHSEED ) + ( *str ); } - //fprintf( stderr, "hash: %s, %d\n", s, hashval & ( SYMHASHMEMBERS - 1 ) ); return hashval & ( SYMHASHMEMBERS - 1 ); } diff --git a/soltools/testSHL/inc/tlog.hxx b/soltools/testSHL/inc/tlog.hxx index 267b54367..a00cacd15 100644 --- a/soltools/testSHL/inc/tlog.hxx +++ b/soltools/testSHL/inc/tlog.hxx @@ -37,10 +37,8 @@ using namespace std; -// <namespace_tstutl> namespace tstutl { -// <class_tLog> class tLog { // <private_members> |
