Merge pull request #18995 from richardkchapman/HPCC-32435

HPCC-32435 Fix variable not used errors Reviewed-by: Gavin Halliday <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · Sep 11, 2024 · 961512d · 961512d
2 parents 71c9ba5 + ebbdde4
commit 961512d
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 11 deletions.
diff --git a/dali/base/dafdesc.cpp b/dali/base/dafdesc.cpp
@@ -3243,14 +3243,12 @@ IFileDescriptor *createFileDescriptorFromRoxieXML(IPropertyTree *tree,const char
                     throw MakeStringException(-1,"createFileDescriptorFromRoxie: %s missing part %d loc path",id,p);
                 RemoteFilename rfn;
                 rfn.setRemotePath(path);
-                bool found = false;
                 ForEachItemIn(d,locdirs) {
                     if (strcmp(rfn.getLocalPath(locpath.clear()).str(),locdirs.item(d))==0) {
                         SocketEndpoint ep = rfn.queryEndpoint();
                         if (ep.port==DAFILESRV_PORT || ep.port==SECURE_DAFILESRV_PORT)
                             ep.port = 0;
                         epa[d].append(ep);
-                        found = true;
                         break;
                     }
                 }

diff --git a/deployment/deployutils/configenvhelper.cpp b/deployment/deployutils/configenvhelper.cpp
@@ -148,7 +148,6 @@ bool CConfigEnvHelper::addRoxieServers(const char* xmlArg)
   unsigned int nComputers = 0;//computers.size();
   IPropertyTree* pParent = m_pRoot->queryPropTree("Software");
   IPropertyTree* pFarm;
-  bool bNewFarm;
   StringBuffer sFarmName;
   StringBuffer xpath;
 
@@ -161,7 +160,6 @@ bool CConfigEnvHelper::addRoxieServers(const char* xmlArg)
       return false;
 
     sFarmName = pFarm->queryProp(XML_ATTR_NAME);
-    bNewFarm = false;
 
     if (!pFarm->hasProp("@port"))
       pFarm->addPropInt("@port", 9876);
@@ -184,7 +182,6 @@ bool CConfigEnvHelper::addRoxieServers(const char* xmlArg)
   {
     xpath.clear().appendf("RoxieCluster[@name='%s']/" XML_TAG_ROXIE_FARM, pszRoxieCluster);
     createUniqueName("farm", xpath.str(), sFarmName);
-    bNewFarm = true;
 
     Owned<IPropertyTreeIterator> iter = pSrcTree->getElements(XML_TAG_COMPONENT);
 

diff --git a/esp/test/httptest/httptest.cpp b/esp/test/httptest/httptest.cpp
@@ -952,7 +952,6 @@ void CHttpProxyThread::start()
 int CHttpProxyThread::run()
 {
     Thread::Link();
-
     int ret = 0;
     try
     {
@@ -1102,7 +1101,7 @@ int CHttpProxyThread::run()
 
     Thread::Release();
 
-    return 0;
+    return ret;
 }
 
 int CHttpProxyThread::readline(ISocket* socket, char* buf, int bufsize, bool& socketclosed)

diff --git a/roxie/roxiemem/roxiemem.cpp b/roxie/roxiemem/roxiemem.cpp
@@ -9193,7 +9193,6 @@ class RoxieMemStressTests : public CppUnit::TestFixture
         {
             for (unsigned i=0; i < 10000; i++)
             {
-                unsigned total = 0;
                 for (unsigned j=0; j < numAllocs; j++)
                 {
                     unsigned blks = ((rand() % 4) + 1);
@@ -9203,7 +9202,6 @@ class RoxieMemStressTests : public CppUnit::TestFixture
                         continue;
                     void * newrow = rowManager->allocate(size, 0);
                     rowset[target] = newrow;
-                    total += numAllocs;
                 }
             }
         }

diff --git a/system/lzma/LzmaEnc.cpp b/system/lzma/LzmaEnc.cpp
@@ -1923,11 +1923,10 @@ static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize
 static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
 {
   UInt32 beforeSize = kNumOpts;
-  Bool btMode;
   if (!RangeEnc_Alloc(&p->rc, alloc))
     return SZ_ERROR_MEM;
-  btMode = (p->matchFinderBase.btMode != 0);
   #ifdef COMPRESS_MF_MT
+  Bool btMode = (p->matchFinderBase.btMode != 0);
   p->mtMode = (p->multiThread && !p->fastMode && btMode);
   #endif