Changeset 2298 for trunk/MagicSoft/Mars/mfileio

Timestamp:

08/01/03 14:44:13 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfileio

Files:

• MRead.cc (modified) (2 diffs)
• MRead.h (modified) (1 diff)

trunk/MagicSoft/Mars/mfileio/MRead.cc

@@ -52 +52 @@
 }
 
+Int_t MRead::AddFiles(MDirIter &files)
+{
+    files.Reset();
+
+    Int_t rc = 0;
+
+    TString str;
+    while (!(str=files.Next()).IsNull())
+    {
+        const Int_t num = AddFile(str);
+        if (num<0)
+            *fLog << warn << "Warning: AddFile(\"" << str << "\") returned " << num << "... skipped." << endl;
+        else
+            rc += num;
+    }
+
+    return rc;
+}
+
 // --------------------------------------------------------------------------
 //
@@ -100 +119 @@
     return i!=0;
 }
-
-Int_t MRead::AddFiles(MDirIter &next)
-{
-    Int_t rc=0;
-    TString n;
-    while (!(n=next()).IsNull())
-    {
-        const Int_t num = AddFile(n);
-        if (num>0)
-            rc += num;
-    }
-    return rc;
-}
-

trunk/MagicSoft/Mars/mfileio/MRead.h

@@ -24 +24 @@
 
     virtual Int_t AddFile(const char *fname, Int_t entries=-1) { return -1; }
-    Int_t AddFiles(MDirIter &next);
+    Int_t AddFiles(MDirIter &dir);
 
     Bool_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);