[roottest] Replace ConcatFileName with PrependFilePath

Author: guitargeek

roottest/root/io/newstl/TestHelpers.C

@@ -27,14 +27,11 @@ void fillListOfDir(const TString &directory, TList &l) {
 
          TString dirname = file;
          if (directory != ".") {
-            auto _dirname = gSystem->ConcatFileName(directory, file);
-            dirname = _dirname;
-            delete [] _dirname;
+            gSystem->PrependPathName(directory, dirname);
          }
 
-         auto _vfile = gSystem->ConcatFileName(dirname, "vector.root");
-         TString vfile = _vfile;
-         delete [] _vfile;
+         TString vfile = "vector.root";
+         gSystem->PrependPathName(dirname, vfile);
 
          if (gSystem->GetPathInfo(vfile,(Long_t*)0,(Long_t*)0,(Long_t*)0,0)==0) {
             l.Add(new TObjString(dirname));

roottest/root/io/newstl/readNoLib.C

@@ -4,9 +4,8 @@ int readNoLib(const char *fname = "vector.root")
    dirname.ReplaceAll(".","-");
    dirname.ReplaceAll("/","-");
 
-   auto _filename = gSystem->ConcatFileName(dirname, fname);
-   TString filename = _filename;
-   delete [] _filename;
+   TString filename = fname;
+   gSystem->PrependFilePath(dirname, filename);
 
    auto file0 = TFile::Open(filename);
    if (!file0)

roottest/root/io/newstl/test.C

@@ -32,9 +32,8 @@ template <class HolderClass> void write(const char *testname, int nEntry = 3) {
    //gSystem->Unlink("latest");
    //gSystem->Symlink(dirname,"latest");
 
-   auto _filename = gSystem->ConcatFileName(dirname, testname );
-   TString filename = _filename;
-   delete [] _filename;
+   TString filename = testname;
+   gSystem->PrependPathName(dirname, filename);
    filename += ".root";
 
    TFile *file = new TFile(filename,"RECREATE","stl test file",0);
@@ -151,10 +150,9 @@ template <class HolderClass> bool read(const char *dirname, const char *testname
    bool testingTopLevelVectors = true;
 
 
-   auto _filename = gSystem->ConcatFileName(dirname, testname );
-   TString filename = _filename;
+   TString filename = testname;
+   gSystem->PrependPathName(dirname, filename);
    filename += ".root";
-   delete [] _filename;
 
    if (!current && gSystem->AccessPathName(filename, kFileExists)) {
       // when reading old directory a missing files is not an error.

roottest/root/tree/cloning/runtreeCloneTest2.C

@@ -60,10 +60,9 @@ void runtreeCloneTest2(const char* outFile = "pion_merged.root", //here's where
 
       TString fileName(cFileName);
       if(fileName.EndsWith(".root") && fileName.BeginsWith(inputFileBeginsWith)) {
-         auto fullName = gSystem->ConcatFileName(inputDir,fileName);
-         FileList->Add( TFile::Open(fullName));
-         cout << "  Adding " << fullName << endl;
-         delete [] fullName;
+         gSystem->PrependPathName(inputDir, fileName);
+         FileList->Add( TFile::Open(fileName));
+         cout << "  Adding " << fileName << endl;
       }
    }
    cout <<"\n\nDone collecting files. begin merging\n"<<endl;