minor changes to test.

diff --git a/configcache.cpp b/configcache.cpp
index 4c7963d310b63740e4a051163352cc749fb6f699..0cabc9d5e7e677b4c06487bba398098581330393 100644 (file)
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -193,7 +193,8 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
       int iDidVirtualSkips;
 
       if( (!inFile.is_open()) && inFileIt == inFiles.end() ) {
       int iDidVirtualSkips;
 
       if( (!inFile.is_open()) && inFileIt == inFiles.end() ) {

-       nequileft = nequileft_internal;
+       if (readnewconfig)
+         nequileft = nequileft_internal;

        return;
       }
 
        return;
       }
 

diff --git a/hypercache.cpp b/hypercache.cpp
index 81b7b3cec42bc23936d1108254ed2677431a216d..4ec63396a31ca52e0f6bfed38ba8248b5f10795d 100644 (file)
--- a/hypercache.cpp
+++ b/hypercache.cpp
@@ -72,18 +72,11 @@ string hypercache::fileOfPath(const string& dressedfile) {
 }
 
 bool hypercache::readC() {
 }
 
 bool hypercache::readC() {

-  bool readnewconfig_nonex;
-  int nequileftReadConfig_nonex;
-  bool readAtLeastOneConfig = false;
+  bool readAtLeastOneConfig;

 
 

-  C->readConfig(readnewconfig_nonex, nequileftReadConfig_nonex, &parentConfigs);
+  C->readConfig(readAtLeastOneConfig, nequileft, &parentConfigs);

 
 

-  if (readnewconfig_nonex) {
-    nequileft = nequileftReadConfig_nonex;
-    readAtLeastOneConfig = true;
-  }
-
-  if ( nequileft < 0 && readnewconfig_nonex )
+  if ( nequileft < 0 && readAtLeastOneConfig )

     activeCFile = fileOfPath(C->getInFileName());
   else
     activeCFile = "";
     activeCFile = fileOfPath(C->getInFileName());
   else
     activeCFile = "";