HPCC-24240 Potential confusion between NotFound vs notFound symbols

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

common/dllserver/thorplugin.cpp

@@ -831,7 +831,7 @@ void SafePluginMap::loadFromList(const char * pluginsList)
             continue;
 
         Owned<IFile> file = createIFile(thisPlugin.str());
-        if (file->isDirectory() == foundYes)
+        if (file->isDirectory() == fileBool::foundYes)
             loadFromDirectory(thisPlugin);
         else
         {

common/remote/hooks/git/gitfile.cpp

@@ -165,20 +165,20 @@ public:
     virtual fileBool isDirectory()
     {
         if (!isExisting)
-            return notFound;
-        return isDir ? foundYes : foundNo;
+            return fileBool::notFound;
+        return isDir ? fileBool::foundYes : fileBool::foundNo;
     }
     virtual fileBool isFile()
     {
         if (!isExisting)
-            return notFound;
-        return !isDir ? foundYes : foundNo;
+            return fileBool::notFound;
+        return !isDir ? fileBool::foundYes : fileBool::foundNo;
     }
     virtual fileBool isReadOnly()
     {
         if (!isExisting)
-            return notFound;
-        return foundYes;
+            return fileBool::notFound;
+        return fileBool::foundYes;
     }
     virtual IFileIO * open(IFOmode mode, IFEflags extraFlags=IFEnone)
     {
@@ -298,7 +298,7 @@ public:
     virtual bool isDir()
     {
         assertex(curFile);
-        return curFile->isDirectory()==foundYes;
+        return curFile->isDirectory()==fileBool::foundYes;
     }
     virtual __int64 getFileSize()
     {

common/remote/hooks/libarchive/archive.cpp

@@ -335,20 +335,20 @@ public:
     virtual fileBool isDirectory()
     {
         if (!entry)
-            return notFound;
-        return entry->isDir() ? foundYes : foundNo;
+            return fileBool::notFound;
+        return entry->isDir() ? fileBool::foundYes : fileBool::foundNo;
     }
     virtual fileBool isFile()
     {
         if (!entry)
-            return notFound;
-        return entry->isDir() ? foundNo : foundYes;
+            return fileBool::notFound;
+        return entry->isDir() ? fileBool::foundNo : fileBool::foundYes;
     }
     virtual fileBool isReadOnly()
     {
         if (!entry)
-            return notFound;
-        return foundYes;
+            return fileBool::notFound;
+        return fileBool::foundYes;
     }
     virtual IFileIO * open(IFOmode mode, IFEflags extraFlags=IFEnone)
     {
@@ -378,7 +378,7 @@ public:
 // Directory functions
     virtual IDirectoryIterator *directoryFiles(const char *mask, bool sub, bool includeDirs)
     {
-        if (isDirectory() != foundYes || (mask && !*mask))   // Empty mask string means matches nothing - NULL means matches everything
+        if (isDirectory() != fileBool::foundYes || (mask && !*mask))   // Empty mask string means matches nothing - NULL means matches everything
             return createNullDirectoryIterator();
         else
         {
@@ -389,7 +389,7 @@ public:
     }
     virtual bool getInfo(bool &_isdir,offset_t &_size,CDateTime &_modtime)
     {
-        _isdir = isDirectory()==foundYes;
+        _isdir = isDirectory()==fileBool::foundYes;
         _size = size();
         _modtime.clear(); // MORE could probably do better
         return true; // MORE should this be false if not existing?
@@ -476,7 +476,7 @@ public:
     virtual bool isDir()
     {
         assertex(curFile);
-        return curFile->isDirectory();
+        return curFile->isDirectory()==fileBool::foundYes;
     }
     virtual __int64 getFileSize()
     {

common/remote/hooks/s3/s3file.cpp

@@ -176,22 +176,22 @@ public:
     {
         ensureMetaData();
         if (!fileExists)
-            return notFound;
-        return isDir ? foundYes : foundNo;
+            return fileBool::notFound;
+        return isDir ? fileBool::foundYes : fileBool::foundNo;
     }
     virtual fileBool isFile() override
     {
         ensureMetaData();
         if (!fileExists)
-            return notFound;
-        return !isDir ? foundYes : foundNo;
+            return fileBool::notFound;
+        return !isDir ? fileBool::foundYes : fileBool::foundNo;
     }
     virtual fileBool isReadOnly() override
     {
         ensureMetaData();
         if (!fileExists)
-            return notFound;
-        return foundYes;
+            return fileBool::notFound;
+        return fileBool::foundYes;
     }
     virtual IFileIO * open(IFOmode mode, IFEflags extraFlags=IFEnone) override
     {

dali/dfu/dfurun.cpp

@@ -718,7 +718,7 @@ public:
             RemoteFilename dirfn;
             dirfn.setPath(rfn.queryEndpoint(),dir.str());
             Owned<IFile> dirf = createIFile(dirfn);
-            if (!dirf||(dirf->isDirectory()!=foundYes)) {
+            if (!dirf||(dirf->isDirectory()!=fileBool::foundYes)) {
                 OERRLOG("MONITOR: %s is not a directory in DFU WUID %s",dir.str(),wu->queryId());
                 if (raiseexception)
                     throw MakeStringException(-1,"MONITOR: %s is not a directory in DFU WUID %s",dir.str(),wu->queryId());

dali/ft/daftdir.cpp

@@ -94,7 +94,7 @@ void DirectoryBuilder::rootDirectory(const char * directory, INode * node, IProp
     OwnedIFile dir = createIFile(directory);
     StringBuffer path;
     const char * tag = "directory";
-    if (dir->isDirectory() == foundYes)
+    if (dir->isDirectory() == fileBool::foundYes)
     {
         implicitWildcard = true;
         includeEmptyDirectory = true;
@@ -301,10 +301,10 @@ bool DirectoryBuilder::walkDirectory(const char * path, IPropertyTree * director
                 continue;
 
             OwnedIFile file = createIFile(curfname);
-            const char * tag = (file->isDirectory()==foundYes) ? "directory" : "file";
+            const char * tag = (file->isDirectory()==fileBool::foundYes) ? "directory" : "file";
 
             IPropertyTree * entry = NULL;
-            if (file->isDirectory()==foundYes)
+            if (file->isDirectory()==fileBool::foundYes)
             {
                 if (implicitWildcard && !recurse)
                     entry = directory->addPropTree(tag, createPTree(ipt_caseInsensitive));
@@ -711,14 +711,14 @@ void DirectoryCopier::recursiveCopy(IPropertyTree * level, const char * sourcePa
         if (onlyCopyExisting || onlyCopyMissing)
         {
             fileBool exists = targetFile->isFile();
-            if (onlyCopyExisting && (exists != foundYes))
+            if (onlyCopyExisting && (exists != fileBool::foundYes))
                 doCopy = false;
-            if (onlyCopyMissing && (exists != notFound))
+            if (onlyCopyMissing && (exists != fileBool::notFound))
                 doCopy = false;
         }
         if (doCopy && preserveIfNewer)
         {
-            if (targetFile->isFile() == foundYes)
+            if (targetFile->isFile() == fileBool::foundYes)
             {
                 CDateTime modifiedSource, modifiedTarget;
                 sourceFile->getTime(NULL, &modifiedSource, NULL);

dali/remote/daliservix.cpp

@@ -69,7 +69,7 @@ static const char *VERSTRINGLE= "DS V1.6 - Solaris X86";
 typedef unsigned char byte;
 typedef long long __int64;
 
-enum fileBool { foundNo = false, foundYes = true, notFound = 2 };
+enum class fileBool { foundNo = false, foundYes = true, notFound = 2 };
 
 const int endiancheck = 1;
 #define is_bigendian() ((*(const char*)&endiancheck) == 0)
@@ -1379,9 +1379,9 @@ public:
         struct stat s;
         unsigned ret;
         if (stat(filename, &s) != 0)
-            ret = (unsigned)notFound;
+            ret = (unsigned)fileBool::notFound;
         else
-            ret = (unsigned)(((s.st_mode&S_IFMT)==S_IFREG) ? foundYes : foundNo);
+            ret = (unsigned)(((s.st_mode&S_IFMT)==S_IFREG) ? fileBool::foundYes : fileBool::foundNo);
         reply.append((unsigned)RFEnoerror).append(ret);
         free(filename);
         return true;
@@ -1396,9 +1396,9 @@ public:
         struct stat s;
         unsigned ret;
         if (stat(filename, &s) != 0)
-            ret = (unsigned)notFound;
+            ret = (unsigned)fileBool::notFound;
         else
-            ret = (unsigned)(((s.st_mode&S_IFMT)==S_IFDIR) ? foundYes : foundNo);
+            ret = (unsigned)(((s.st_mode&S_IFMT)==S_IFDIR) ? fileBool::foundYes : fileBool::foundNo);
         reply.append((unsigned)RFEnoerror).append(ret);
         free(filename);
         return true;
@@ -1413,9 +1413,9 @@ public:
         struct stat s;
         unsigned ret;
         if (stat(filename, &s) != 0)
-            ret = (unsigned)notFound;
+            ret = (unsigned)fileBool::notFound;
         else
-            ret = (s.st_mode & (S_IWUSR|S_IWGRP|S_IWOTH)) ? foundNo : foundYes;
+            ret = (s.st_mode & (S_IWUSR|S_IWGRP|S_IWOTH)) ? fileBool::foundNo : fileBool::foundYes;
         // I don't think this is necessarily correct but consistant with linux implementation
         reply.append((unsigned)RFEnoerror).append(ret);
         free(filename);

dali/rfs/rfs.cpp

@@ -263,7 +263,7 @@ struct mapErrs_t { int val; const char *str; } mapErrs[] =
 
 #define RFEnoerror      0U
 
-enum fileBool { foundNo = false, foundYes = true, notFound = 2 };
+enum class fileBool { foundNo = false, foundYes = true, notFound = 2 };
 
 #ifdef _WIN32
 class win_socket_library
@@ -1372,7 +1372,7 @@ static bool processCommand(RFS_ServerBase &base, RFS_context &context, RFS_Conne
                 const char * name = in.readFileName(tmp);
                 bool existsout = false;
                 base.existFile(name,existsout);
-                unsigned ret = (unsigned)notFound;
+                unsigned ret = (unsigned)fileBool::notFound;
                 if (existsout) {
                     if (cmd==RFCisfile)
                         base.isFile(name,existsout);
@@ -1381,9 +1381,9 @@ static bool processCommand(RFS_ServerBase &base, RFS_context &context, RFS_Conne
                     else
                         base.isReadOnly(name,existsout);
                     if (existsout)
-                        ret = (unsigned)foundYes;
+                        ret = (unsigned)fileBool::foundYes;
                     else
-                        ret = (unsigned)foundNo;
+                        ret = (unsigned)fileBool::foundNo;
                 }
                 out.append((unsigned)RFEnoerror).append(ret);
             }

deployment/configgen/main.cpp

@@ -111,7 +111,7 @@ void deleteRecursive(const char* path)
     Owned<IFile> pDir = createIFile(path);
     if (pDir->exists())
     {
-        if (pDir->isDirectory())
+        if (pDir->isDirectory()==fileBool::foundYes)
         {
             Owned<IDirectoryIterator> it = pDir->directoryFiles(NULL, false, true);
             ForEach(*it)
@@ -139,7 +139,7 @@ void copyDirectoryRecursive(const char *source, const char *target)
   {
     IFile &sourceFile = dir->query();
 
-    if (sourceFile.isFile())
+    if (sourceFile.isFile()==fileBool::foundYes)
     {
       StringBuffer targetname(target);
       targetname.append(PATHSEPCHAR);
@@ -156,7 +156,7 @@ void copyDirectoryRecursive(const char *source, const char *target)
 
       copyFile(destFile, &sourceFile);
     }
-    else if (sourceFile.isDirectory())
+    else if (sourceFile.isDirectory()==fileBool::foundYes)
     {
       StringBuffer newSource(source);
       StringBuffer newTarget(target);

deployment/configutils/confighelper.cpp

@@ -184,7 +184,7 @@ void CConfigHelper::appendBuildSetFromPlugins()
 
     ForEach(*pluginFiles)
     {
-        if (pluginFiles->query().isDirectory() == foundYes)
+        if (pluginFiles->query().isDirectory() == fileBool::foundYes)
         {
             StringBuffer strPluginBuildSetPath;
 
@@ -323,7 +323,7 @@ void CConfigHelper::addPluginsToConfigGenCompList(IPropertyTree *pCGenComplist,
 
     ForEach(*pluginFiles)
     {
-        if (pluginFiles->query().isDirectory() == foundYes)
+        if (pluginFiles->query().isDirectory() == fileBool::foundYes)
         {
             StringBuffer strPluginCGenCompListPath;
 
@@ -423,7 +423,7 @@ void CConfigHelper::addPluginsToGenEnvRules(IProperties *pGenEnvRulesProps) cons
 
     ForEach(*pluginFiles)
     {
-        if (pluginFiles->query().isDirectory() == foundYes)
+        if (pluginFiles->query().isDirectory() == fileBool::foundYes)
         {
             StringBuffer strPluginGenEnvRulesPath;
 

deployment/deploy/DeployLog.cpp

@@ -138,7 +138,7 @@ private:
          const char* dirEntryName = iFile.queryFilename();
 
          // Process directories, but not the "." and ".." directories
-         if (iFile.isDirectory() && *dirEntryName != '.')
+         if (iFile.isDirectory()==fileBool::foundYes && *dirEntryName != '.')
          {  
             // Create prop tree, add to parent, and recurse
             StringBuffer newPath(path);

deployment/deploy/DeployTask.cpp

@@ -35,7 +35,7 @@ offset_t getDirSize(const char* path, bool subdirs = true)
 
   if (pFile->exists())
   {
-    if (pFile->isDirectory() == foundYes)
+    if (pFile->isDirectory() == fileBool::foundYes)
     {
       Owned<IDirectoryIterator> it = pFile->directoryFiles(NULL, false, true);
 
@@ -363,7 +363,7 @@ public:
            {
              transform.setResultTarget(target);
              Owned<IFile> pTargetFile = createIFile(target);
-             if (pTargetFile->exists() && pTargetFile->isReadOnly())
+             if (pTargetFile->exists() && pTargetFile->isReadOnly()==fileBool::foundYes)
                pTargetFile->setReadOnly(false);
              pTargetFile.clear();
 
@@ -400,7 +400,7 @@ public:
               if (!flag)
                 pTargetFile.setown(createIFile(target));
              
-              if (pTargetFile->exists() && pTargetFile->isReadOnly())
+              if (pTargetFile->exists() && pTargetFile->isReadOnly()==fileBool::foundYes)
                 pTargetFile->setReadOnly(false);
               Owned<IFileIO> pTargetFileIO = pTargetFile->openShared(IFOcreate, IFSHfull);
               pTargetFileIO->write( 0, tmpoutbuf.length(), tmpoutbuf.str());
@@ -713,7 +713,7 @@ public:
        //file's attributes to normal (reset read only flag, if set) and retry
        if (m_machineOS != MachineOsLinux && !m_useSsh && m_sshUser.isEmpty() && m_sshKeyFile.isEmpty())
        {
-         if (!bCopyRC && (pDstFile.get() != NULL) && pDstFile->exists() && pDstFile->isReadOnly()/*&& m_machineOS != MachineOsLinux*/)
+         if (!bCopyRC && (pDstFile.get() != NULL) && pDstFile->exists() && pDstFile->isReadOnly()==fileBool::foundYes/*&& m_machineOS != MachineOsLinux*/)
          {
            try
            {
@@ -1199,7 +1199,7 @@ public:
                         Owned<IFile> pFile = createIFile(path);
                         if (pFile->exists())
                         {
-                            if (!pFile->isDirectory())
+                            if (pFile->isDirectory()!=fileBool::foundYes)
                                 throw MakeStringException(-1, "%s exists and is not a directory!", path);
                         }
                         else
@@ -1270,7 +1270,7 @@ public:
             if (m_dummy) 
                break;
 
-            if (src.isDirectory())
+            if (src.isDirectory()==fileBool::foundYes)
             {
                if (!dest.exists() && !dest.createDirectory())
                   throw MakeStringException(-1, "Failed to create directory %s", dest.queryFilename());

deployment/deploy/DeploymentEngine.cpp

@@ -1325,7 +1325,7 @@ void CDeploymentEngine::ensurePath(const char* filespec) const
     if (flag)
     {
         Owned<IFile> pIFile = createIFile(dir.str());
-        if ((m_curInstance && m_curSSHUser.length() && m_curSSHKeyFile.length()) || !pIFile->exists() || !pIFile->isDirectory())
+        if ((m_curInstance && m_curSSHUser.length() && m_curSSHKeyFile.length()) || !pIFile->exists() || pIFile->isDirectory()!=fileBool::foundYes)
         {
             Owned<IDeployTask> task = createDeployTask(*m_pCallback, "Create Directory", m_process.queryName(), m_name.get(),
                 m_curInstance, NULL, dir.str(), m_curSSHUser.str(), m_curSSHKeyFile.str(), m_curSSHKeyPassphrase.str(),

deployment/deploy/configgenengine.cpp

@@ -390,7 +390,7 @@ void CConfigGenEngine::createFakePlugins(StringBuffer& destFilePath) const
     }
 
     Owned<IFile> pTargetFile = createIFile(destFilePath.str());
-    if (pTargetFile->exists() && pTargetFile->isReadOnly())
+    if (pTargetFile->exists() && pTargetFile->isReadOnly()==fileBool::foundYes)
         pTargetFile->setReadOnly(false);
     Owned<IFileIO> pTargetFileIO = pTargetFile->open(IFOcreate);
     pTargetFileIO->write( 0, tmpoutbuf.length(), tmpoutbuf.str());

deployment/deploy/deploy.cpp

@@ -136,7 +136,7 @@ public:
         Owned<IFile> pDir = createIFile(path);
         if (pDir->exists())
         {
-            if (pDir->isDirectory())
+            if (pDir->isDirectory()==fileBool::foundYes)
             {
                 Owned<IDirectoryIterator> it = pDir->directoryFiles(NULL, false, true);
                 ForEach(*it)

deployment/deployutils/deployutils.cpp

@@ -150,7 +150,7 @@ void getInstalledComponents(const char* pszInstallDir, StringBuffer& sbOutComps,
       return;
     }
 
-    if(inFiles.get() != NULL && inFiles->isDirectory())
+    if(inFiles.get() != NULL && inFiles->isDirectory()==fileBool::foundYes)
     {
       Owned<IDirectoryIterator> di = inFiles->directoryFiles(NULL, 0, true);
       bool bCompFound = false;
@@ -162,7 +162,7 @@ void getInstalledComponents(const char* pszInstallDir, StringBuffer& sbOutComps,
         {
           IFile &file = di->query();
 
-          if (!file.isFile())
+          if (file.isFile()!=fileBool::foundYes)
           {
             dirName.clear();
             di->getName(dirName);
@@ -2557,7 +2557,7 @@ void deleteRecursive(const char* path)
         Owned<IFile> pDir = createIFile(path);
         if (pDir->exists())
         {
-            if (pDir->isDirectory())
+            if (pDir->isDirectory()==fileBool::foundYes)
             {
                 Owned<IDirectoryIterator> it = pDir->directoryFiles(NULL, false, true);
                 ForEach(*it)

ecl/ecl-bundle/ecl-bundle.cpp

@@ -195,7 +195,7 @@ void recursiveRemoveDirectory(IFile *dir, bool isDryRun)
     ForEach(*files)
     {
         IFile *thisFile = &files->query();
-        if (thisFile->isDirectory()==foundYes)
+        if (thisFile->isDirectory()==fileBool::foundYes)
             recursiveRemoveDirectory(thisFile, isDryRun);
         else
         {
@@ -383,7 +383,7 @@ public:
                 splitFilename(cleanedParam, &path, &path, &bundleName, NULL, true);
                 if (!path.length())
                     path.append(".");
-                if (bundleFile->isDirectory() && !directoryContainsBundleFile(bundleFile))
+                if (bundleFile->isDirectory()==fileBool::foundYes && !directoryContainsBundleFile(bundleFile))
                     includeOpt.appendf(" -I%s", bundle);
                 else
                     includeOpt.appendf(" -I%s", path.str());
@@ -846,7 +846,7 @@ private:
             {
                 IFile &f = versions->query();
                 const char *vname = f.queryFilename();
-                if (f.isDirectory() && vname && vname[0] != '.')
+                if (f.isDirectory()==fileBool::foundYes && vname && vname[0] != '.')
                 {
                     if (!streq(activeBundlePath, vname))
                     {
@@ -882,7 +882,7 @@ public:
         Owned<IFile> bundleDir = createIFile(bundlePath);
         if (bundleDir->exists())
         {
-            if (!bundleDir->isDirectory())
+            if (bundleDir->isDirectory()!=fileBool::foundYes)
                 throw MakeStringException(0, "Bundle path %s does not specify a directory", bundlePath.get());
             StringBuffer versionsPath(bundlePath);
             addPathSepChar(versionsPath).append(VERSION_SUBDIR);
@@ -892,7 +892,7 @@ public:
             {
                 IFile &f = versions->query();
                 const char *name = f.queryFilename();
-                if (f.isDirectory() && name && name[0] != '.')
+                if (f.isDirectory()==fileBool::foundYes && name && name[0] != '.')
                 {
                     if (filter)
                     {
@@ -1427,7 +1427,7 @@ public:
             versionPath.append(PATHSEPCHAR).append(bundle->queryCleanVersion());
             if (!optDryRun && !recursiveCreateDirectory(versionPath))
                 throw MakeStringException(0, "Cannot create bundle version directory %s", versionPath.str());
-            if (bundleFile->isDirectory() == foundYes) // could also be an archive, acting as a directory
+            if (bundleFile->isDirectory() == fileBool::foundYes) // could also be an archive, acting as a directory
             {
                 if (directoryContainsBundleFile(bundleFile))
                 {
@@ -1495,7 +1495,7 @@ private:
             StringBuffer destname(destdir);
             destname.append(PATHSEPCHAR).append(tail);
             Owned<IFile> targetFile = createIFile(destname);
-            if (thisFile->isDirectory()==foundYes)
+            if (thisFile->isDirectory()==fileBool::foundYes)
             {
                 if (strcmp(tail, ".git")==0)
                     continue;

ecl/eclagent/eclagent.cpp

@@ -2040,7 +2040,7 @@ void EclAgent::doProcess()
             unsigned errCode = 0;
             try
             {
-               if (dir->exists() && dir->isDirectory() && !dir->remove())
+               if (dir->exists() && dir->isDirectory()==fileBool::foundYes && !dir->remove())
                     rmMsg.append("Failed to remove temporary directory: ").append(jobTempDir.str());
             }
             catch (IException *e)

ecl/eclagent/eclgraph.cpp

@@ -408,7 +408,7 @@ bool EclGraphElement::alreadyUpToDate(IAgentContext & agent)
         Owned<IPartDescriptor> part = fdesc->getPart(0);
         RemoteFilename rfn;
         OwnedIFile file = createIFile(part->getFilename(0, rfn));
-        if (file->isFile() != foundYes)
+        if (file->isFile() != fileBool::foundYes)
             return false;
         CDateTime modified;
         file->getTime(NULL, &modified, NULL);

ecl/hql/hqlcollect.cpp

@@ -392,7 +392,7 @@ void FileSystemDirectory::addFile(IFile &file, bool allowPlugins)
     if (tail && tail[0]!='.')
     {
         Owned<CEclSource> newSource;
-        if (file.isFile() == foundYes)
+        if (file.isFile() == fileBool::foundYes)
         {
             EclSourceType type = getEclSourceType(tail);
             if (type && ((type != ESTplugin) || allowPlugins))
@@ -404,7 +404,7 @@ void FileSystemDirectory::addFile(IFile &file, bool allowPlugins)
                     newSource.setown(newFile.getClear());
             }
         }
-        else if (file.isDirectory() == foundYes)
+        else if (file.isDirectory() == fileBool::foundYes)
         {
             newSource.setown(new FileSystemDirectory(deriveEclName(tail), &file));
         }
@@ -497,12 +497,12 @@ void FileSystemEclCollection::processFilePath(IErrorReceiver * errs, const char
         {
             addPathSepChar(absolutePath).append(dirTail);
             Owned<IFile> file = createIFile(absolutePath);
-            if (file->isDirectory() == foundYes)
+            if (file->isDirectory() == fileBool::foundYes)
             {
                 Owned<IDirectoryIterator> dir = file->directoryFiles(NULL, false, true);
                 root.expandDirectoryTree(dir, allowPlugins);
             }
-            else if (file->isFile() == foundYes)
+            else if (file->isFile() == fileBool::foundYes)
             {
                 root.addFile(*file, allowPlugins);
             }

esp/bindings/http/platform/httptransport.cpp

@@ -43,7 +43,7 @@ bool httpContentFromFile(const char *filepath, StringBuffer &mimetype, MemoryBuf
                 return false;
 
     Owned<IFile> file = createIFile(strfile.str());
-    if (file && file->isFile())
+    if (file && file->isFile()==fileBool::foundYes)
     {
         if (checkModifiedTime)
         {

esp/logging/logginglib/logthread.cpp

@@ -562,7 +562,7 @@ IEspUpdateLogRequestWrap* CLogThread::readJobQueue()
 void CLogThread::checkAndCreateFile(const char* fileName)
 {
     Owned<IFile> file = createIFile(fileName);
-    if(file->isFile() != notFound)
+    if(file->isFile() != fileBool::notFound)
         return;
 
     StringBuffer dir;
@@ -817,7 +817,7 @@ bool CLogRequestReader::parseLogRequest(MemoryBuffer& rawdata, StringBuffer& GUI
 
     GUID.append(ptr - begin, begin);
 
-    if ((++ptr == end))
+    if (++ptr == end)
         return false;
 
     logLine.append(end - ptr, ptr);

esp/services/WsDeploy/WsDeployEngine.cpp

@@ -274,8 +274,7 @@ void CWsDeployEngine::deploy(CDeployOptions& pOptions)
           Owned<IDeployTask> task = createDeployTask(*this, "Create Directory", NULL, NULL, NULL, NULL, archiveLogPath, "", "", "", false);
           task->createDirectory();
         }
-        else
-          if (!pIFile->isDirectory())
+        else if (pIFile->isDirectory()!=fileBool::foundYes)
             throw MakeStringException(-1, "The specified log/archive path '%s' is invalid!", archiveLogPath);
       }
 
@@ -422,8 +421,7 @@ void CWsDeployEngine::deploy()
           Owned<IDeployTask> task = createDeployTask(*this, "Create Directory", NULL, NULL, NULL, NULL, archiveLogPath, "", "", "", false);
           task->createDirectory();
         }
-        else
-          if (!pIFile->isDirectory())
+        else if (pIFile->isDirectory()!=fileBool::foundYes)
             throw MakeStringException(-1, "The specified log/archive path '%s' is invalid!", archiveLogPath);
       }
 

esp/services/WsDeploy/WsDeployService.cpp

@@ -545,7 +545,7 @@ bool CWsDeployFileInfo::navMenuEvent(IEspContext &context,
           sbName.clear().append(req.getReqInfo().getUserId());
           context.getPeer(sbUserIp);
 
-          if (m_pFile.get() && m_pFile->isReadOnly())
+          if (m_pFile.get() && m_pFile->isReadOnly()==fileBool::foundYes)
           {
             xml.appendf("Write access to the Environment cannot be provided as %s is Read Only.", m_envFile.str());
             resp.setXmlArgs(xml.str());
@@ -3896,7 +3896,7 @@ bool CWsDeployFileInfo::getBuildServerDirs(IEspContext &context, IEspGetBuildSer
       return false;
     }
 
-    if(inFiles.get() != NULL && inFiles->isDirectory())
+    if(inFiles.get() != NULL && inFiles->isDirectory()==fileBool::foundYes)
     {
       Owned<IDirectoryIterator> di = inFiles->directoryFiles(NULL, 0, true);
       bool bCompFound = false;
@@ -3908,7 +3908,7 @@ bool CWsDeployFileInfo::getBuildServerDirs(IEspContext &context, IEspGetBuildSer
         {
           IFile &file = di->query();
 
-          if (!file.isFile())
+          if (file.isFile()!=fileBool::foundYes)
           {
             dirName.clear();
             di->getName(dirName);
@@ -6702,7 +6702,7 @@ bool CWsDeployExCE::onGetValue(IEspContext &context, IEspGetValueRequest &req, I
 
     if (pDir->exists())
     {
-      if (pDir->isDirectory())
+      if (pDir->isDirectory()==fileBool::foundYes)
       {
         Owned<IDirectoryIterator> it = pDir->directoryFiles(NULL, false, true);
         ForEach(*it)

esp/services/ws_fileio/ws_fileioservice.cpp

@@ -159,14 +159,14 @@ bool CWsFileIOEx::onCreateFile(IEspContext &context, IEspCreateFileRequest &req,
     Owned<IFile> file = createIFile(rfn);
 
     fileBool isDir = file->isDirectory();
-    if (isDir == foundYes)
+    if (isDir == fileBool::foundYes)
     {
         result.appendf("Failure: %s is a directory.", destRelativePath);
         resp.setResult(result.str());
         return true;
     }
 
-    if (!req.getOverwrite() && (isDir != notFound))
+    if (!req.getOverwrite() && (isDir != fileBool::notFound))
     {
         result.appendf("Failure: %s exists.", destRelativePath);
         resp.setResult(result.str());
@@ -233,7 +233,7 @@ bool CWsFileIOEx::onReadFileData(IEspContext &context, IEspReadFileDataRequest &
     rfn.setPath(ep, destAbsPath);
     Owned<IFile> file = createIFile(rfn);
     fileBool isFile = file->isFile();
-    if (isFile != foundYes)
+    if (isFile != fileBool::foundYes)
     {
         result.appendf("%s does not exist.", destRelativePath);
         resp.setResult(result.str());
@@ -328,7 +328,7 @@ bool CWsFileIOEx::onWriteFileData(IEspContext &context, IEspWriteFileDataRequest
     rfn.setPath(ep, destAbsPath);
     Owned<IFile> file = createIFile(rfn);
     fileBool isFile = file->isFile();
-    if (isFile != foundYes)
+    if (isFile != fileBool::foundYes)
     {
         result.appendf("%s does not exist.", destRelativePath);
         resp.setResult(result.str());

esp/services/ws_fs/ws_fsService.cpp

@@ -2807,7 +2807,7 @@ bool CFileSprayEx::onFileList(IEspContext &context, IEspFileListRequest &req, IE
 #endif
         rfn.setPath(ep, sPath.str());
         Owned<IFile> f = createIFile(rfn);
-        if(!f->isDirectory())
+        if (f->isDirectory()!=fileBool::foundYes)
             throw MakeStringException(ECLWATCH_INVALID_DIRECTORY, "%s is not a directory.", path);
 
         IArrayOf<IEspPhysicalFileStruct> files;
@@ -2930,7 +2930,7 @@ void CFileSprayEx::searchDropZoneFiles(IEspContext& context, IpAddress& ip, cons
     ep.ipset(ip);
     rfn.setPath(ep, dir);
     Owned<IFile> f = createIFile(rfn);
-    if(!f->isDirectory())
+    if(f->isDirectory()!=fileBool::foundYes)
         throw MakeStringException(ECLWATCH_INVALID_DIRECTORY, "%s is not a directory.", dir);
 
     const char pathSep = getPathSepChar(dir);
@@ -3148,7 +3148,7 @@ bool CFileSprayEx::getDropZoneFiles(IEspContext &context, const char* dropZone,
 
     rfn.setPath(ep, path);
     Owned<IFile> f = createIFile(rfn);
-    if(!f->isDirectory())
+    if(f->isDirectory()!=fileBool::foundYes)
         throw MakeStringException(ECLWATCH_INVALID_DIRECTORY, "%s is not a directory.", path);
 
     IArrayOf<IEspPhysicalFileStruct> files;
@@ -3322,7 +3322,7 @@ bool CFileSprayEx::onDeleteDropZoneFiles(IEspContext &context, IEspDeleteDropZon
 
         rfn.setPath(ep, path.str());
         Owned<IFile> f = createIFile(rfn);
-        if(!f->isDirectory())
+        if(f->isDirectory()!=fileBool::foundYes)
             throw MakeStringException(ECLWATCH_INVALID_DIRECTORY, "%s is not a directory.", directory);
 
         bool bAllSuccess = true;

esp/services/ws_workunits/ws_workunitsHelpers.cpp

@@ -3402,7 +3402,7 @@ void CWsWuFileHelper::cleanFolder(IFile* folder, bool removeFolder)
     ForEach(*iter)
     {
         OwnedIFile thisFile = createIFile(iter->query().queryFilename());
-        if (thisFile->isFile() == foundYes)
+        if (thisFile->isFile() == fileBool::foundYes)
             thisFile->remove();
     }
     if (removeFolder)
@@ -3801,7 +3801,7 @@ void CWsWuFileHelper::setZAPFile(const char* zipFileNameReq, const char* zipFile
 
     zipFileNameWithPath.append(PATHSEPCHAR).append(zipFileName);
     OwnedIFile thisFile = createIFile(zipFileNameWithPath.str());
-    if (thisFile->isFile() == foundYes)
+    if (thisFile->isFile() == fileBool::foundYes)
         thisFile->remove();
 }
 
@@ -3919,7 +3919,7 @@ IFileIOStream* CWsWuFileHelper::createWUFileIOStream(IEspContext& context, const
     zipFileNameWithPath.set(zipFolder).append(fileName.str());
     {
         OwnedIFile oldFile = createIFile(zipFileNameWithPath.str());
-        if (oldFile->isFile() == foundYes)
+        if (oldFile->isFile() == fileBool::foundYes)
             oldFile->remove();
     }
     int zipRet = zipAFolder(workingFolder.str(), downloadOptions == CWUFileDownloadOption_GZIP, zipFileNameWithPath);

esp/tools/soapplus/http.cpp

@@ -582,7 +582,7 @@ void HttpClient::start()
                 return;
             }
         }
-        else if(infile->isDirectory())
+        else if (infile->isDirectory()==fileBool::foundYes)
             di.setown(infile->directoryFiles());
     }
 
@@ -655,7 +655,7 @@ void HttpClient::start()
 
         MessageGenerator mg(schemapath.str(), no_sending, st, m_globals);
         StringBuffer templatemsg;
-        if(infile.get() && !infile->isDirectory())
+        if(infile.get() && infile->isDirectory()==fileBool::foundNo)
             templatemsg.loadFile(m_inname.str());
 
         const char* method = m_globals->queryProp("method");
@@ -736,7 +736,7 @@ void HttpClient::start()
         if (m_url.length() == 0)
             no_sending = true;
 
-        if (infile.get() && !infile->isDirectory())
+        if (infile.get() && infile->isDirectory()==fileBool::foundNo)
             loadEspLog(m_inname.str(), *this, *overall_stat.get());
     }
     else if(di.get())
@@ -747,7 +747,7 @@ void HttpClient::start()
         ForEach(*di)
         {
             IFile &file = di->query();
-            if (file.isFile() && file.size() > 0)
+            if (file.isFile()==fileBool::foundYes && file.size() > 0)
             {
                 const char* fname = file.queryFilename();
                 if(fname && *fname)
@@ -1926,7 +1926,7 @@ int SimpleServer::start()
                 return -1;
         }
         
-        if(!server_infile->isDirectory())
+        if(server_infile->isDirectory()==fileBool::foundNo)
         {
             try
             {
@@ -2038,7 +2038,7 @@ int SimpleServer::start()
         }
         else
         {
-            if(server_infile.get() != NULL && server_infile->isDirectory())
+            if(server_infile.get() != NULL && server_infile->isDirectory()==fileBool::foundYes)
             {
                 StringBuffer xmlBuf;
                 xmlBuf.append(strstr(requestbuf.str(), "<?xml"));
@@ -2067,7 +2067,7 @@ int SimpleServer::start()
                         }
                     }
 
-                    if(bfound && server_infile.get() != NULL && server_infile->isDirectory())
+                    if(bfound && server_infile.get() != NULL && server_infile->isDirectory()==fileBool::foundYes)
                     {
                         StringBuffer respFileName;
                         respFileName.append(m_inputpath).append(PATHSEPCHAR).append(reqFileName.str());
@@ -2206,7 +2206,7 @@ int SimpleServer::start()
                 resp_io->write(0, m_response.length(), m_response.str());
         }
 
-        if(server_infile.get() != NULL && server_infile->isDirectory())
+        if(server_infile.get() != NULL && server_infile->isDirectory()==fileBool::foundYes)
             m_response.clear();
 
         if(!m_isPersist)

esp/tools/soapplus/main.cpp

@@ -161,7 +161,7 @@ void createDirectories(const char* outdir, const char* url, bool bClient, bool b
         out.setown(createIFile(outdir));
         if(out->exists())
         {
-            if(!out->isDirectory())
+            if(out->isDirectory()==fileBool::foundNo)
                 throw MakeStringException(0, "Output destination %s already exists, and it's not a directory", outdir);
         }
         outpath.append(outdir);
@@ -186,7 +186,7 @@ void createDirectories(const char* outdir, const char* url, bool bClient, bool b
         out.setown( createIFile(outpath1.str()) );
         if(out->exists())
         {
-            if(!out->isDirectory())
+            if(out->isDirectory()==fileBool::foundNo)
                 throw MakeStringException(0, "Output destination %s already exists, and it's not a directory", outpath1.str());
         }
         else
@@ -200,7 +200,7 @@ void createDirectories(const char* outdir, const char* url, bool bClient, bool b
             out.setown( createIFile(outpath2.str()) );
             if(out->exists())
             {
-                if(!out->isDirectory())
+                if(out->isDirectory()==fileBool::foundNo)
                     throw MakeStringException(0, "Output destination %s already exists, and it's not a directory", outpath2.str());
             }
             else
@@ -213,7 +213,7 @@ void createDirectories(const char* outdir, const char* url, bool bClient, bool b
             out.setown( createIFile(outpath3.str()) );
             if(out->exists())
             {
-                if(!out->isDirectory())
+                if(out->isDirectory()==fileBool::foundNo)
                     throw MakeStringException(0, "Output destination %s already exists, and it's not a directory", outpath3.str());
             }
             else
@@ -301,7 +301,7 @@ int processRequest(IProperties* globals, SoapPlusAction action, const char* url,
             }
         }
         
-        if(infile.get() != NULL && infile->isDirectory())
+        if (infile.get() != NULL && infile->isDirectory()==fileBool::foundYes)
         {
             Owned<IDirectoryIterator> di = infile->directoryFiles();
             if(di.get())
@@ -309,7 +309,7 @@ int processRequest(IProperties* globals, SoapPlusAction action, const char* url,
                 ForEach(*di)
                 {
                     IFile &file = di->query();
-                    if (file.isFile() && file.size() > 0)
+                    if (file.isFile()==fileBool::foundYes && file.size() > 0)
                     {
                         const char* fname = file.queryFilename();
                         const char* slash = strrchr(fname, PATHSEPCHAR);
@@ -318,7 +318,7 @@ int processRequest(IProperties* globals, SoapPlusAction action, const char* url,
                         StringBuffer sfname;
                         if(server_infile.get())
                         {
-                            if(server_infile->isDirectory())
+                            if (server_infile->isDirectory()==fileBool::foundYes)
                             {
                                 sfname.append(server_in_fname);
                                 if(sfname.charAt(sfname.length() - 1) != PATHSEPCHAR)
@@ -353,7 +353,7 @@ int processRequest(IProperties* globals, SoapPlusAction action, const char* url,
         }   
         else
         {
-            if(server_infile.get() && server_infile->isDirectory())
+            if (server_infile.get() && server_infile->isDirectory()==fileBool::foundYes)
             {
                 if(http_tracelevel > 0)
                     fprintf(logfile, "When request input is not directory, the server input must be a file\n");

esp/tools/soapplus/xmldiff.cpp

@@ -97,17 +97,17 @@ bool CXmlDiff::compare()
         return false;
     }
 
-    if(lf->isDirectory() && !rf->isDirectory())
+    if(lf->isDirectory()==fileBool::foundYes && rf->isDirectory()!=fileBool::foundYes)
     {
         printDiff("%s is a directory, while %s is not\n", left, right);
         return false;
     }
-    else if(!lf->isDirectory() && rf->isDirectory())
+    else if(lf->isDirectory()!=fileBool::foundYes && rf->isDirectory()==fileBool::foundYes)
     {
         printDiff("%s is a directory, while %s is not\n", right, left);
         return false;
     }
-    else if(lf->isDirectory() && rf->isDirectory())
+    else if(lf->isDirectory()==fileBool::foundYes && rf->isDirectory()==fileBool::foundYes)
     {
         Owned<IDirectoryIterator> ldi = lf->directoryFiles(NULL, false, true);
         Owned<IDirectoryIterator> rdi = rf->directoryFiles(NULL, false, true);

fs/dafsclient/rmtfile.cpp

@@ -2035,11 +2035,11 @@ static void installFileHook(const char *hookFile)
     {
         addPathSepChar(absolutePath).append(dirTail);
         Owned<IFile> file = createIFile(absolutePath);
-        if (file->isDirectory() == foundYes)
+        if (file->isDirectory() == fileBool::foundYes)
         {
             installFileHooks(addPathSepChar(absolutePath).append('*'));
         }
-        else if (file->isFile() == foundYes)
+        else if (file->isFile() == fileBool::foundYes)
         {
             HookInstallFunction hookInstall;
             SharedObject *so = new SharedObject(); // MORE - this leaks! Kind-of deliberate right now...

fs/dafsserver/dafsserver.cpp

@@ -3970,7 +3970,7 @@ public:
             {
                 byte b=1;
                 reply.append(b);
-                bool isDir = foundYes == iFile->isDirectory();
+                bool isDir = fileBool::foundYes == iFile->isDirectory();
                 reply.append(isDir);
                 reply.append(isDir ? 0 : iFile->size());
                 CDateTime dt;
@@ -5587,7 +5587,7 @@ protected:
         subDirIFile->createDirectory();
 
         // check isDirectory result
-        CPPUNIT_ASSERT(subDirIFile->isDirectory());
+        CPPUNIT_ASSERT(subDirIFile->isDirectory()==fileBool::foundYes);
 
         // move previous created and renamed file into new sub-directory
         // ensure not present before move
@@ -5625,12 +5625,12 @@ protected:
         CPPUNIT_ASSERT(1 == count);
 
         // check isFile result
-        CPPUNIT_ASSERT(iFile2->isFile());
+        CPPUNIT_ASSERT(iFile2->isFile()==fileBool::foundYes);
 
         // validate isReadOnly before after setting
-        CPPUNIT_ASSERT(!iFile2->isReadOnly());
+        CPPUNIT_ASSERT(iFile2->isReadOnly()==fileBool::foundNo);
         iFile2->setReadOnly(true);
-        CPPUNIT_ASSERT(iFile2->isReadOnly());
+        CPPUNIT_ASSERT(iFile2->isReadOnly()==fileBool::foundYes);
 
         // get/set Time and validate result
         CDateTime createTime, modifiedTime, accessedTime;

roxie/ccd/ccdfile.cpp

@@ -759,7 +759,7 @@ class CRoxieFileCache : implements IRoxieFileCache, implements ICopyFileProgress
             ForEach(*iter)
             {
                 OwnedIFile thisFile = createIFile(iter->query().queryFilename());
-                if (thisFile->isFile() == foundYes)
+                if (thisFile->isFile() == fileBool::foundYes)
                     thisFile->remove();
             }
         }
@@ -1329,7 +1329,7 @@ public:
     virtual void flushUnusedDirectories(const char *origBaseDir, const char *directory, StringBuffer &xml)
     {
         Owned<IFile> dirf = createIFile(directory);
-        if (dirf->exists() && dirf->isDirectory())
+        if (dirf->exists() && dirf->isDirectory()==fileBool::foundYes)
         {
             try
             {

system/jhtree/keydiff.cpp

@@ -409,7 +409,7 @@ public:
         rowsize = _rowsize;
         reccount = 0;
         keyFile.setown(createIFile(filename));
-        if(!overwrite && (keyFile->isFile() != notFound))
+        if(!overwrite && (keyFile->isFile() != fileBool::notFound))
             throw MakeStringException(0, "Found preexisting index file %s (overwrite not selected)", filename);
         keyFileIO.setown(keyFile->openShared(IFOcreate, IFSHfull)); // not sure if needs shared here
         if(!keyFileIO)
@@ -731,7 +731,7 @@ public:
         : CKeyDiff(oldIndex, newIndex, newTLK)
     {
         file.setown(createIFile(filename));
-        if(!overwrite && (file->isFile() != notFound))
+        if(!overwrite && (file->isFile() != fileBool::notFound))
             throw MakeStringException(0, "Found preexisting key patch file %s (overwrite not selected)", filename);
         fileIO.setown(file->open(IFOcreate));
         if(!fileIO)

system/jlib/jargv.cpp

@@ -81,14 +81,14 @@ bool processArgvFilename(IFileArray & filenames, const char * filename)
         ForEach(*iter)
         {
             IFile & cur = iter->query();
-            if (cur.isFile() == foundYes)
+            if (cur.isFile() == fileBool::foundYes)
                 filenames.append(OLINK(cur));
         }
     }
     else
     {
         Owned<IFile> cur = createIFile(filename);
-        if (cur->isFile() != foundYes)
+        if (cur->isFile() != fileBool::foundYes)
         {
             UERRLOG("Error: File '%s' does not exist", filename);
             return false;

system/jlib/jfile.cpp

@@ -503,30 +503,30 @@ fileBool CFile::isDirectory()
 #ifdef _WIN32
     DWORD attr = GetFileAttributes(filename);
     if (attr == -1)
-        return notFound;
-    return ( attr & FILE_ATTRIBUTE_DIRECTORY) ? foundYes : foundNo;
+        return fileBool::notFound;
+    return ( attr & FILE_ATTRIBUTE_DIRECTORY) ? fileBool::foundYes : fileBool::foundNo;
 #else
     struct stat info;
     if (stat(filename, &info) != 0)
-        return notFound;
-    return S_ISDIR(info.st_mode) ? foundYes : foundNo;
+        return fileBool::notFound;
+    return S_ISDIR(info.st_mode) ? fileBool::foundYes : fileBool::foundNo;
 #endif
 }
 
 fileBool CFile::isFile()
 {
     if (stdIoHandle(filename)>=0)
-        return foundYes;
+        return fileBool::foundYes;
 #ifdef _WIN32
     DWORD attr = GetFileAttributes(filename);
     if (attr == -1)
-        return notFound;
-    return ( attr & FILE_ATTRIBUTE_DIRECTORY) ? foundNo : foundYes;
+        return fileBool::notFound;
+    return ( attr & FILE_ATTRIBUTE_DIRECTORY) ? fileBool::foundNo : fileBool::foundYes;
 #else
     struct stat info;
     if (stat(filename, &info) != 0)
-        return notFound;
-    return S_ISREG(info.st_mode) ? foundYes : foundNo;
+        return fileBool::notFound;
+    return S_ISREG(info.st_mode) ? fileBool::foundYes : fileBool::foundNo;
 #endif
 }
 
@@ -535,14 +535,14 @@ fileBool CFile::isReadOnly()
 #ifdef _WIN32
     DWORD attr = GetFileAttributes(filename);
     if (attr == -1)
-        return notFound;
-    return ( attr & FILE_ATTRIBUTE_READONLY) ? foundYes : foundNo;
+        return fileBool::notFound;
+    return ( attr & FILE_ATTRIBUTE_READONLY) ? fileBool::foundYes : fileBool::foundNo;
 #else
     struct stat info;
     if (stat(filename, &info) != 0)
-        return notFound;
+        return fileBool::notFound;
     //MORE: I think this is correct, but someone with better unix knowledge should check!
-    return (info.st_mode & (S_IWUSR|S_IWGRP|S_IWOTH)) ? foundNo : foundYes;
+    return (info.st_mode & (S_IWUSR|S_IWGRP|S_IWOTH)) ? fileBool::foundNo : fileBool::foundYes;
 #endif
 }
 
@@ -707,7 +707,7 @@ bool CFile::remove()
 #ifdef _WIN32
     unsigned retry = 0;
     for (;;) {
-        if (isDirectory()==foundYes) {
+        if (isDirectory()==fileBool::foundYes) {
             if (RemoveDirectory(filename) != 0)
                 return true;
         }
@@ -727,7 +727,7 @@ bool CFile::remove()
     }
     return false;
 #else
-    if (isDirectory()==foundYes) {
+    if (isDirectory()==fileBool::foundYes) {
         if (rmdir(filename) == 0)
             return true;
     }
@@ -1339,7 +1339,7 @@ public:
     {
         connect();
         fileBool ok = ifile->isDirectory();
-        if (ok == notFound && !connected && connect())
+        if (ok == fileBool::notFound && !connected && connect())
             ok = ifile->isDirectory();
         return ok;
     }
@@ -1347,7 +1347,7 @@ public:
     {
         connect();
         fileBool ok = ifile->isFile();
-        if (ok == notFound && !connected && connect())
+        if (ok == fileBool::notFound && !connected && connect())
             ok = ifile->isFile();
         return ok;
     }
@@ -1355,7 +1355,7 @@ public:
     {
         connect();
         fileBool ok = ifile->isReadOnly();
-        if (ok == notFound && !connected && connect())
+        if (ok == fileBool::notFound && !connected && connect())
             ok = ifile->isFile();
         return ok;
     }
@@ -2928,9 +2928,9 @@ void renameFile(const char *target, const char *source, bool overwritetarget)
     OwnedIFile src = createIFile(source);
     if (!src)
         throw MakeStringException(-1, "renameFile: source '%s' not found", source);
-    if (!src->isFile())
+    if (src->isFile()!=fileBool::foundYes)
         throw MakeStringException(-1, "renameFile: source '%s' is not a valid file", source);
-    if (src->isReadOnly())
+    if (src->isReadOnly()!=fileBool::foundNo)
         throw MakeStringException(-1, "renameFile: source '%s' is readonly", source);
 
     OwnedIFile tgt = createIFile(target);
@@ -3562,7 +3562,7 @@ IDirectoryIterator * createDirectoryIterator(const char * path, const char * mas
     if (!path || !*path) // cur directory so no point in checking for remote etc.
         return new CWindowsDirectoryIterator(path, mask,sub,includedirs);
     OwnedIFile iFile = createIFile(path);
-    if (!iFile||(iFile->isDirectory()!=foundYes))
+    if (!iFile||(iFile->isDirectory()!=fileBool::foundYes))
         return new CNullDirectoryIterator;
     return iFile->directoryFiles(mask, sub, includedirs);
 }
@@ -3570,7 +3570,7 @@ IDirectoryIterator * createDirectoryIterator(const char * path, const char * mas
 IDirectoryIterator *CFile::directoryFiles(const char *mask,bool sub,bool includedirs)
 {
     if ((mask&&!*mask)||    // only NULL is wild
-        (isDirectory()!=foundYes))
+        (isDirectory()!=fileBool::foundYes))
         return new CNullDirectoryIterator;
     return new CWindowsDirectoryIterator(filename, mask,sub,includedirs);
 }
@@ -3751,7 +3751,7 @@ IDirectoryIterator * createDirectoryIterator(const char * path, const char * mas
     if (!path || !*path) // no point in checking for remote etc.
         return new CLinuxDirectoryIterator(path, mask,sub,includedirs);
     OwnedIFile iFile = createIFile(path);
-    if (!iFile||(iFile->isDirectory()!=foundYes))
+    if (!iFile||(iFile->isDirectory()!=fileBool::foundYes))
         return new CNullDirectoryIterator;
     return iFile->directoryFiles(mask, sub, includedirs);
 }
@@ -3759,7 +3759,7 @@ IDirectoryIterator * createDirectoryIterator(const char * path, const char * mas
 IDirectoryIterator *CFile::directoryFiles(const char *mask,bool sub,bool includedirs)
 {
     if ((mask&&!*mask)||    // only NULL is wild
-        (isDirectory()!=foundYes))
+        (isDirectory()!=fileBool::foundYes))
         return new CNullDirectoryIterator;
     return new CLinuxDirectoryIterator(filename, mask,sub,includedirs);
 }
@@ -4052,7 +4052,7 @@ void recursiveRemoveDirectory(IFile *dir)
     ForEach(*files)
     {
         IFile *thisFile = &files->query();
-        if (thisFile->isDirectory()==foundYes)
+        if (thisFile->isDirectory()==fileBool::foundYes)
             recursiveRemoveDirectory(thisFile);
         else
         {
@@ -4066,7 +4066,7 @@ void recursiveRemoveDirectory(IFile *dir)
 void recursiveRemoveDirectory(const char *dir)
 {
     Owned<IFile> f = createIFile(dir);
-    if (f->isDirectory())
+    if (f->isDirectory()==fileBool::foundYes)
         recursiveRemoveDirectory(f);
 }
 
@@ -6573,7 +6573,7 @@ extern jlib_decl bool containsFileWildcard(const char * path)
 extern jlib_decl bool isDirectory(const char * path)
 {
     Owned<IFile> file = createIFile(path);
-    return file->isDirectory() == foundYes;
+    return file->isDirectory()==fileBool::foundYes;
 }
 
 // IFileIOCache
@@ -6793,7 +6793,7 @@ extern jlib_decl void removeSentinelFile(IFile * sentinelFile)
 #ifndef _CONTAINERIZED
     if (sentinelFile)
     {
-        if(sentinelFile->exists() && !sentinelFile->isDirectory())
+        if(sentinelFile->exists() && sentinelFile->isDirectory()!=fileBool::foundYes)
         {
             DBGLOG("Removing sentinel file %s", sentinelFile->queryFilename());
             try
@@ -6924,7 +6924,7 @@ public:
 
 IDirectoryIterator *getSortedDirectoryIterator(IFile *directory, SortDirectoryMode mode, bool rev, const char *mask, bool sub, bool includedirs)
 {
-    if (!directory || !directory->isDirectory())
+    if (!directory || directory->isDirectory()!=fileBool::foundYes)
         throw MakeStringException(-1, "Invalid IFile input in getSortedDirectoryIterator()");
 
     Owned<IDirectoryIterator> files = directory->directoryFiles(mask, sub, includedirs);

system/jlib/jfile.hpp

@@ -81,7 +81,7 @@ interface ICopyFileProgress
 
 class RemoteFilename;
 
-enum fileBool { foundNo = false, foundYes = true, notFound = 2 };
+enum class fileBool { foundNo = false, foundYes = true, notFound = 2 };
 interface IFile :extends IInterface
 {
     virtual bool exists() = 0; // NB this can raise exceptions if the machine doesn't exist or other fault

system/jlib/jfile.ipp

@@ -142,7 +142,6 @@ public:
 
 protected:
     Linked<IFileIO>     io;
-    offset_t            curOffset;
     offset_t            headerSize;
     offset_t            maxLength;
 };

testing/unittests/unittests.cpp

@@ -208,14 +208,14 @@ int main(int argc, char* argv[])
         Owned<IFile> file = createIFile(location);
         switch (file->isDirectory())
         {
-        case notFound:
+        case fileBool::notFound:
             if (verbose && !useDefaultLocations)
                 DBGLOG("Specified library location %s not found", location);
             break;
-        case foundYes:
+        case fileBool::foundYes:
             loadDlls(objects, location);
             break;
-        case foundNo:
+        case fileBool::foundNo:
             LoadedObject *loaded = loadDll(location);
             if (loaded)
                 objects.append(*loaded);

thorlcr/thorutil/thormisc.cpp

@@ -676,7 +676,7 @@ public:
             ForEach (*iter)
             {
                 IFile &file = iter->query();
-                if (file.isFile())
+                if (file.isFile()==fileBool::foundYes)
                 {
                     if (log)
                         LOG(MCdebugInfo, thorJob, "Deleting %s", file.queryFilename());
@@ -1133,7 +1133,7 @@ void CFifoFileCache::init(const char *cacheDir, unsigned _limit, const char *pat
     ForEach (*iter)
     {
         IFile &file = iter->query();
-        if (file.isFile())
+        if (file.isFile()==fileBool::foundYes)
             deleteFile(file);
     }
 }

tools/backupnode/backupnode.cpp

@@ -282,7 +282,7 @@ static void CopyDirectory(const char *source, const char *target, unsigned numSl
     ForEach (*dir)
     {
         IFile &sourceFile = dir->query();
-        if (sourceFile.isFile())
+        if (sourceFile.isFile()==fileBool::foundYes)
         {
             if (includeFile(sourceFile, numSlaves))
             {
@@ -310,7 +310,7 @@ static void CopyDirectory(const char *source, const char *target, unsigned numSl
             else if (verbose)
                 println("Skipping file %s (cluster size mismatch)", sourceFile.queryFilename());
         }
-        else if (sourceFile.isDirectory())
+        else if (sourceFile.isDirectory()==fileBool::foundYes)
         {
             StringBuffer newSource(source);
             StringBuffer newTarget(target);

tools/copyexp/copyexp.cpp

@@ -155,7 +155,7 @@ int copyExpanded(const char *from, const char *to, bool stats)
         return ret;
     Owned<IFile> dstfile = createIFile(to);
     StringBuffer fulldst;
-    if (dstfile->isDirectory()==foundYes) {
+    if (dstfile->isDirectory()==fileBool::foundYes) {
         dstfile.clear();
         addPathSepChar(fulldst.append(to)).append(pathTail(from));
         to = fulldst.str();
@@ -274,7 +274,7 @@ void copyCompress(const char *from, const char *to, size32_t rowsize, bool fast,
 
     Owned<IFile> dstfile = createIFile(to);
     StringBuffer fulldst;
-    if (dstfile->isDirectory()==foundYes) {
+    if (dstfile->isDirectory()==fileBool::foundYes) {
         dstfile.clear();
         addPathSepChar(fulldst.append(to)).append(pathTail(from));
         to = fulldst.str();

tools/esdlcmd/esdlcmd_common.hpp

@@ -321,7 +321,7 @@ protected:
         serviceDefFile.setown( createIFile(sourceFileName) );
         if( serviceDefFile->exists() )
         {
-            if( serviceDefFile->isFile() )
+            if( serviceDefFile->isFile()==fileBool::foundYes )
             {
                 if( serviceDefFile->size() > 0 )
                 {

tools/testsocket/testsocket.cpp

@@ -1027,7 +1027,7 @@ int main(int argc, char **argv)
             sendFileAfterQuery = true;
             sendFileName.append(argv[arg+1]);
             OwnedIFile f = createIFile(sendFileName.str());
-            if (!f->exists() || !f->isFile())
+            if (!f->exists() || f->isFile()==fileBool::foundNo)
             {
                 printf("file %s does not exist\n", sendFileName.str());
                 exit (EXIT_FAILURE);