浏览代码

HPCC-11280 Fix other clang warnings

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Gavin Halliday 11 年之前
父节点
当前提交
16e78acee7
共有 2 个文件被更改,包括 7 次插入7 次删除
  1. 4 4
      deployment/configutils/confighelper.cpp
  2. 3 3
      esp/test/httptest/httptest.hpp

+ 4 - 4
deployment/configutils/confighelper.cpp

@@ -84,7 +84,7 @@ CConfigHelper* CConfigHelper::getInstance(const IPropertyTree *cfg, const char*
                 StringBuffer msg;
                 e->errorMessage(msg);
 
-                delete e;
+                ::Release(e);
 
                 if (p_sConfigHelper->m_cbDeployment.get() != NULL)
                 {
@@ -115,7 +115,7 @@ CConfigHelper* CConfigHelper::getInstance(const IPropertyTree *cfg, const char*
                 }
                 // TODO: log message to configmgr log but continue execution
 
-                delete e;
+                ::Release(e);
             }
 
             return p_sConfigHelper;
@@ -222,7 +222,7 @@ void CConfigHelper::appendBuildSetFromPlugins()
                                                         "Error adding buildset with xpath %s[%d] from location %s", strXPath.str(), nIdx, strPluginBuildSetPath.str());
                         }
 
-                        delete e;
+                        ::Release(e);
                     }
                 }
             }
@@ -348,7 +348,7 @@ void CConfigHelper::addPluginsToConfigGenCompList(IPropertyTree *pCGenComplist,
                         m_cbDeployment->printStatus(STATUS_WARN, NULL, NULL, NULL,
                                                 "Unable to load cgencomplist.xml from  %s", strPluginCGenCompListPath.str());
                     }
-                    delete e;
+                    ::Release(e);
                 }
 
                 Owned<IPropertyTreeIterator> pCGenCompListIterator = pPluginCGenCompList->getElements(strXPath);

+ 3 - 3
esp/test/httptest/httptest.hpp

@@ -48,10 +48,10 @@ public:
         fprintf(ofile, "Total hits:                       %d\n", numrequests);
         fprintf(ofile, "Time taken(millisecond):          %d\n", msecs);
         fprintf(ofile, "Hits per second:                  %3.1f\n", numrequests/(msecs*0.001));
-        fprintf(ofile, "Total data sent:                  %Ld\n", totalreqlen);
-        fprintf(ofile, "Total data received:              %Ld\n", totalresplen);
+        fprintf(ofile, "Total data sent:                  %"I64F"d\n", totalreqlen);
+        fprintf(ofile, "Total data received:              %"I64F"d\n", totalresplen);
         __int64 totallen = totalreqlen + totalresplen;
-        fprintf(ofile, "Total data transferred:           %Ld\n", totallen);
+        fprintf(ofile, "Total data transferred:           %"I64F"d\n", totallen);
         fprintf(ofile, "Data transfered per second:       %5.1f\n", totallen/(msecs*0.001));
         fprintf(ofile, "Slowest round trip(millisecond):  %d\n", slowest);
         fprintf(ofile, "Fastest round trip(millisecond):  %d\n", fastest);