Explorar o código

BUG: Remove some old legacy code and remove memory leak

Andy Cedilnik %!s(int64=19) %!d(string=hai) anos
pai
achega
892a439fad
Modificáronse 2 ficheiros con 2 adicións e 21 borrados
  1. 2 18
      Source/cmListFileCache.cxx
  2. 0 3
      Source/cmListFileCache.h

+ 2 - 18
Source/cmListFileCache.cxx

@@ -25,14 +25,12 @@ bool cmListFileCacheParseFunction(cmListFileLexer* lexer,
                                   cmListFileFunction& function,
                                   const char* filename);
 
-bool cmListFile::ParseFile(const char* path, bool requireProjectCommand)
+bool cmListFile::ParseFile(const char* filename, bool requireProjectCommand)
 {
-  if(!cmSystemTools::FileExists(path))
+  if(!cmSystemTools::FileExists(filename))
     {
     return false;
     }
-  // Get a pointer to a persistent copy of the name.
-  const char* filename = this->GetUniqueStringPointer(path);
 
   // Create the scanner.
   cmListFileLexer* lexer = cmListFileLexer_New();
@@ -212,17 +210,3 @@ bool cmListFileCacheParseFunction(cmListFileLexer* lexer,
 
   return false;
 }
-
-//----------------------------------------------------------------------------
-const char* cmListFile::GetUniqueStringPointer(const char* name)
-{
-  UniqueStrings::iterator i = m_UniqueStrings.find(name);
-  if(i == m_UniqueStrings.end())
-    {
-    char* str = new char[strlen(name)+1];
-    strcpy(str, name);
-    i = m_UniqueStrings.insert(UniqueStrings::value_type(name, str)).first;
-    }
-  return i->second;
-}
-

+ 0 - 3
Source/cmListFileCache.h

@@ -65,9 +65,6 @@ struct cmListFile
   bool ParseFile(const char* path, bool requireProjectCommand);
   long int m_ModifiedTime;
   std::vector<cmListFileFunction> m_Functions;
-  typedef std::map<cmStdString, char*> UniqueStrings;
-  UniqueStrings m_UniqueStrings;
-  const char* GetUniqueStringPointer(const char* name);
 };
 
 #endif