HPCC-17148 Fix various minor warnings and unreachable code

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>

ecl/eclccserver/eclccserver.cpp

@@ -590,7 +590,7 @@ static void generatePrecompiledHeader()
 
 static void removePrecompiledHeader()
 {
-    remove("eclinclude4.hpp.gch");
+    removeFileTraceIfFail("eclinclude4.hpp.gch");
 }
 #endif
 

ecl/hql/hqlfold.cpp

@@ -1738,7 +1738,7 @@ IHqlExpression * foldEmbeddedCall(IHqlExpression* expr, unsigned foldOptions, IT
         {
             double value = paramValue->getRealValue();
             if (paramType->getSize()==4)
-                __ctx->bindFloatParam(name, value);
+                __ctx->bindFloatParam(name, (float)value);
             else
                 __ctx->bindRealParam(name, value);
             break;

ecl/hql/hqlmeta.cpp

@@ -1224,7 +1224,7 @@ bool isSortedForGroup(IHqlExpression * table, IHqlExpression *sortList, bool isL
     if (numToGroup > numExistingOrder)
         return false;
 
-    bool allowReordering = false;
+    const bool allowReordering = false;  // MORE: Can this be set to true?
     if (!allowReordering)
     {
         // Each of the leading components of the sort criteria need to match the elements in the group.

ecl/hql/hqlstack.cpp

@@ -46,9 +46,7 @@ FuncCallStack::~FuncCallStack() {
     
     // Free memory used by string/data parameters
     for(int i = 0; i < numToFree; i++) {
-        if(toFree[i]) {
-            free(toFree[i]);
-        }
+        free(toFree[i]);
     }
 }
 

ecl/hqlcpp/hqlckey.cpp

@@ -620,7 +620,7 @@ static IHqlExpression * expandDatasetReferences(IHqlExpression * expr, IHqlExpre
         break;
     case childdataset_left: 
         UNIMPLEMENTED;
-        mapParent.setown(createSelector(no_left, dsParent, querySelSeq(ds)));
+        //mapParent.setown(createSelector(no_left, dsParent, querySelSeq(ds)));
         break;
     default:
         UNIMPLEMENTED;

ecl/hqlcpp/hqlcppds.cpp

@@ -5294,13 +5294,6 @@ void HqlCppTranslator::doBuildExprGetGraphResult(BuildCtx & ctx, IHqlExpression
     {
         doBuildAliasValue(ctx, expr, tgt, NULL);
         return;
-
-        if (!isCurrentActiveGraph(ctx, expr->queryChild(1)))
-        {
-            if (!buildExprInCorrectContext(ctx, expr, tgt, false))
-                throwError(HQLERR_GraphContextNotFound);
-            return;
-        }
     }
 
     switch (expr->queryType()->getTypeCode())

ecl/hqlcpp/hqlcse.cpp

@@ -365,7 +365,7 @@ IHqlExpression * CseSpotter::createTransformed(IHqlExpression * expr)
 //          aliasValue.setown(splitter->annotatedExpr->cloneAllAnnotations(aliasValue));
         OwnedHqlExpr alias = createAliasOwn(aliasValue.getClear(), splitter);
         return alias.getClear();
-        return expr->cloneAllAnnotations(alias);
+        //return expr->cloneAllAnnotations(alias);
     }
     return transformed.getClear();
 }

ecl/hqlcpp/hqlecl.cpp

@@ -604,11 +604,10 @@ bool HqlDllGenerator::doCompile(ICppCompiler * compiler)
     if (ok && deleteGenerated)
     {
         StringBuffer temp;
-        remove(temp.clear().append(wuname).append(".cpp").str());
-        remove(temp.clear().append(wuname).append(".hpp").str());
+        removeFileTraceIfFail(temp.clear().append(wuname).append(".hpp").str());
         ForEachItemIn(i, sourceFiles)
         {
-            remove(sourceFiles.item(i));
+            removeFileTraceIfFail(sourceFiles.item(i));
         }
     }
     return ok;

ecl/hqlcpp/hqlhtcpp.cpp

@@ -11684,7 +11684,7 @@ void HqlCppTranslator::generateSerializeAssigns(BuildCtx & ctx, IHqlExpression *
         case no_ifblock:
             //Filter on target...
             UNIMPLEMENTED;
-            generateSerializeAssigns(ctx, cur->queryChild(1), selector, selfSelect, leftSelect, srcDataset, tgtDataset, srcSelects, tgtSelects, needToClear, serializeOp, serialForm);
+            //generateSerializeAssigns(ctx, cur->queryChild(1), selector, selfSelect, leftSelect, srcDataset, tgtDataset, srcSelects, tgtSelects, needToClear, serializeOp, serialForm);
             break;
         }
     }
@@ -11780,7 +11780,7 @@ bool HqlCppTranslator::extractSerializeKey(SerializeKeyInfo & info, const Datase
             return false;
     }
 
-    bool aggressive = false;
+    const bool aggressive = false;
     // When projecting is done by the serialize() function this will be worth changing to true
     // otherwise the extra cost of the project probably isn't likely to outweigh the extra copy
     unsigned numToSerialize = aggressive ? info.filteredSorts.ordinality() : sorts.ordinality();

ecl/hqlcpp/hqlsource.cpp

@@ -3681,7 +3681,7 @@ MonitorExtractor::MonitorExtractor(IHqlExpression * _tableExpr, HqlCppTranslator
     expandKeyableFields();
     cleanlyKeyedExplicitly = false;
     keyedExplicitly = false;
-    allowDynamicFormatChange = tableExpr && !tableExpr->hasAttribute(fixedAtom);
+    allowDynamicFormatChange = !tableExpr->hasAttribute(fixedAtom);
 }
 
 void MonitorExtractor::callAddAll(BuildCtx & ctx, IHqlExpression * targetVar)

ecl/hqlcpp/hqlstmt.cpp

@@ -1392,9 +1392,6 @@ IHqlExpression * peepholeAddExpr(IHqlExpression * left, IHqlExpression * right)
     if (!ret)
         return value;
     return createValue(no_add, left->getType(), ret, value);
-    if ((left->getOperator() == no_constant) && (right->getOperator() == no_constant))
-        return getSizetConstant((size32_t)left->queryValue()->getIntValue() + (size32_t)right->queryValue()->getIntValue());
-    return createValue(no_add, left->getType(), LINK(left), LINK(right));
 }
 
 bool rightFollowsLeft(IHqlExpression * left, IHqlExpression * leftLen, IHqlExpression * right)

system/jlib/jcomp.cpp

@@ -722,26 +722,26 @@ StringBuffer & CppCompiler::getObjectName(StringBuffer & out, const char * filen
 void CppCompiler::removeTemporaries()
 {
     DBGLOG("Remove temporaries");
+
+    StringBuffer temp;
     switch (targetCompiler)
     {
     case Vs6CppCompiler:
+        {
+            removeFileTraceIfFail(temp.clear().append(targetDir).append(coreName).append(".exp").str());
+            removeFileTraceIfFail(temp.clear().append(targetDir).append(coreName).append(".lib").str());
+            removeFileTraceIfFail(temp.clear().append(targetDir).append(coreName).append(".res").str());
+            break;
+        }
     case GccCppCompiler:
         {
-            StringBuffer temp;
-            remove(temp.clear().append(targetDir).append(coreName).append(".exp").str());
-            remove(getObjectName(temp.clear(), coreName).str());
-            remove(temp.clear().append(targetDir).append(coreName).append(".lib").str());
-#ifdef _WIN32
-            remove(temp.clear().append(targetDir).append(coreName).append(".res").str());
-#else
             temp.clear().append(coreName).append(".res.s*");
             DBGLOG("Remove %s%s",targetDir.str(), temp.str());
             Owned<IDirectoryIterator> resTemps = createDirectoryIterator(targetDir, temp.str());
             ForEach(*resTemps)
             {
-                remove(resTemps->getName(temp.clear().append(targetDir)).str());
+                removeFileTraceIfFail(resTemps->getName(temp.clear().append(targetDir)).str());
             }
-#endif
             break;
         }
     }

system/jlib/jfile.cpp

@@ -6725,3 +6725,9 @@ jlib_decl StringBuffer & appendCurrentDirectory(StringBuffer & target, bool blan
     }
     return target.append(temp);
 }
+
+void removeFileTraceIfFail(const char * filename)
+{
+    if (remove(filename) != 0)
+        DBGLOG("Could not remove file '%s'", filename);
+}

system/jlib/jfile.hpp

@@ -616,7 +616,7 @@ extern jlib_decl size32_t SendFile(ISocket *target, IFileIO *fileio,offset_t sta
 extern jlib_decl void asyncClose(IFileIO *io);
 extern jlib_decl bool containsFileWildcard(const char * path);
 extern jlib_decl bool isDirectory(const char * path);
-
+extern jlib_decl void removeFileTraceIfFail(const char * filename);
 extern jlib_decl IFileIOCache* createFileIOCache(unsigned max);
 extern jlib_decl IFile * createSentinelTarget();
 extern jlib_decl void writeSentinelFile(IFile * file);