Issue #135 Merge failure from previous caused build break

Errors during the merge process for last checkin causing a build
break.

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

common/roxiehelper/roxiehelper.ipp

@@ -80,7 +80,7 @@ interface IRoxieContextLogger : extends IContextLogger
     virtual StringBuffer &getLogPrefix(StringBuffer &ret) const = 0;
     virtual bool isIntercepted() const = 0;
     virtual void CTXLOGa(TracingCategory category, const char *prefix, const char *text) const = 0;
-    virtual void CTXLOGae(IException *E, const char *file, unsigned line, const char *prefix, const char *format, ...) const __attribute__((format(printf, 2, 3))) = 0;
+    virtual void CTXLOGae(IException *E, const char *file, unsigned line, const char *prefix, const char *format, ...) const __attribute__((format(printf, 6, 7))) = 0;
     virtual void CTXLOGaeva(IException *E, const char *file, unsigned line, const char *prefix, const char *format, va_list args) const = 0;
     virtual void CTXLOGl(LogItem *) const = 0;
     virtual bool isBlind() const = 0;

dali/dfuXRefLib/dfuxreflib.cpp

@@ -106,7 +106,8 @@ typedef MapStringTo<COrphanEntryPtr> COrphanEntryMap;
 
 Owned <IFileIOStream> outfileio;
 
-void outf(const char *fmt, ...) __attribute__((format(printf, 1, 2)))
+void outf(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
+void outf(const char *fmt, ...) 
 {
     va_list args;
     va_start(args, fmt);
@@ -1220,7 +1221,7 @@ void CLogicalNameEntry::resolve(CFileEntry *entry)
     }
     if (entry->replicate()) {
         if (replicateresolved[part]) {
-            manager.error(lname.get(),"Part %d: Multiple replicated part entry %d",part+1);
+            manager.error(lname.get(),"Part %d: Multiple replicated part entry",part+1);
         }
         else {
             replicatenum++;

ecl/hqlcpp/hqlcerrors.hpp

@@ -327,7 +327,7 @@
 #define HQLERR_UnsupportedHashWorkunit_Text     "Unsupported option #WORKUNIT ('%s')"
 #define HQLERR_UnknownVirtualAttr_Text          "INTERNAL: Unsupported virtual attribute '%s'"
 #define HQLERR_IllegalPattern_Text              "Illegal pattern '%s..%s'"
-#define HQLERR_VirtualFieldInTempTable_Text     "Virtual fields are not supported in constant tables - please provide a value"
+#define HQLERR_VirtualFieldInTempTable_Text     "Virtual field %s not supported in constant table - please provide a value"
 #define HQLERR_VarSizeSortUseThor_Text          "THOR must be used for sorting or joining datasets with variable width rows"
 #define HQLERR_SubstringOutOfRange_Text         "Substring index %d is outside the field range"
 #define HQLERR_RankOnStored_Text                "RANK/RANKED not supported on list %s"

esp/scm/esp.ecm

@@ -212,9 +212,8 @@ interface IEspContainer : extends IInterface
     virtual LogLevel getLogLevel() = 0;
     virtual bool getLogRequests() = 0;
     virtual bool getLogResponses() = 0;
-    virtual void log(LogLevel level, const char*,...) = 0;
-    virtual unsigned getSlowProcessingTime() = 0;
     virtual void log(LogLevel level, const char*,...) __attribute__((format(printf, 3, 4))) = 0;
+    virtual unsigned getSlowProcessingTime() = 0;
     virtual void setFrameTitle(const char* title) = 0;
     virtual const char* getFrameTitle() = 0;
     virtual void sendSnmpMessage(const char* msg) = 0;

esp/services/ws_dfu/ws_dfuXRefService.cpp

@@ -27,7 +27,8 @@
 
 static const char* FEATURE_URL = "DfuXrefAccess";
 
-static void appendReplyMessage(StringBuffer &reply, const char *href,const char *format,...) __attribute__((format(printf, 3, 4)))
+static void appendReplyMessage(StringBuffer &reply, const char *href,const char *format,...) __attribute__((format(printf, 3, 4)));
+static void appendReplyMessage(StringBuffer &reply, const char *href,const char *format,...) 
 {
     va_list args;
     va_start(args, format);

esp/services/ws_smc/ws_smcService.cpp

@@ -33,7 +33,8 @@ const char* THORQUEUE_FEATURE = "ThorQueueAccess";
 
 const char* PERMISSIONS_FILENAME = "espsmc_permissions.xml";
 
-void AccessSuccess(IEspContext& context, char const * msg,...) __attribute__((format(printf, 2, 3)))
+void AccessSuccess(IEspContext& context, char const * msg,...) __attribute__((format(printf, 2, 3)));
+void AccessSuccess(IEspContext& context, char const * msg,...)
 {
     StringBuffer buf;
     buf.appendf("User %s: ",context.queryUserId());
@@ -44,7 +45,8 @@ void AccessSuccess(IEspContext& context, char const * msg,...) __attribute__((fo
     AUDIT(AUDIT_TYPE_ACCESS_SUCCESS,buf.str());
 }
 
-void AccessFailure(IEspContext& context, char const * msg,...) __attribute__((format(printf, 2, 3)))
+void AccessFailure(IEspContext& context, char const * msg,...) __attribute__((format(printf, 2, 3)));
+void AccessFailure(IEspContext& context, char const * msg,...)
 {
     StringBuffer buf;
     buf.appendf("User %s: ",context.queryUserId());

esp/services/ws_workunits/ws_workunitsService.cpp

@@ -941,7 +941,8 @@ int WUSchedule::run()
     return 0;
 }
 
-void AccessSuccess(IEspContext& context, char const * msg,...) __attribute__((format(printf, 2, 3)))
+void AccessSuccess(IEspContext& context, char const * msg,...) __attribute__((format(printf, 2, 3)));
+void AccessSuccess(IEspContext& context, char const * msg,...)
 {
     StringBuffer buf;
     buf.appendf("User %s: ",context.queryUserId());
@@ -952,7 +953,8 @@ void AccessSuccess(IEspContext& context, char const * msg,...) __attribute__((fo
     AUDIT(AUDIT_TYPE_ACCESS_SUCCESS,buf.str());
 }
 
-void AccessFailure(IEspContext& context, char const * msg,...) __attribute__((format(printf, 2, 3)))
+void AccessFailure(IEspContext& context, char const * msg,...) __attribute__((format(printf, 2, 3)));
+void AccessFailure(IEspContext& context, char const * msg,...) 
 {
     StringBuffer buf;
     buf.appendf("User %s: ",context.queryUserId());

esp/smc/SMCLib/exception_util.hpp

@@ -122,7 +122,7 @@ inline void FORWARDEXCEPTION(IEspContext &context, IException *e, unsigned codeN
     time_t tNow;
     struct tm timeStruct;
     char timeString[32];
-    StringBuffer eMsg, eMsgDisplay;
+    StringBuffer eMsg;
 
     int err = e->errorCode();
     e->errorMessage(eMsg);
@@ -134,8 +134,7 @@ inline void FORWARDEXCEPTION(IEspContext &context, IException *e, unsigned codeN
     time(&tNow);
     gmtime_r(&tNow, &timeStruct);
     strftime(timeString, 32, "%Y-%m-%d %H:%M:%S GMT", &timeStruct);
-    eMsgDisplay.appendf("%s: %s", timeString, eMsg.str());
-    throw MakeStringException(err, eMsgDisplay.str());
+    throw MakeStringException(err, "%s: %s", timeString, eMsg.str());
         
     return;
 }

thorlcr/thorutil/thmem.hpp

@@ -341,8 +341,8 @@ public:
 #ifdef _DEBUG
         assertex(sizing&&!raiseexceptions);
         if (sz>maxtotal) {
-            PROGLOG("CThorRowArray isFull(totalsize=%u,ptrbuf.length()=%u,ptrbuf.capacity()=%u,overhead=%u,maxtotal=%u",
-                     totalsize,ptrbuf.length(),ptrbuf.capacity(),overhead,maxtotal);
+            PROGLOG("CThorRowArray isFull(totalsize=%"I64F"u,ptrbuf.length()=%u,ptrbuf.capacity()=%u,overhead=%u,maxtotal=%"I64F"u",
+                     (unsigned __int64) totalsize,ptrbuf.length(),ptrbuf.capacity(),overhead,(unsigned __int64) maxtotal);
             return true;
         }
         return false;

tools/dumpkey/dumpkey.cpp

@@ -20,7 +20,8 @@
 #include "jhtree.hpp"
 #include "ctfile.hpp"
 
-void fatal(const char *format, ...) __attribute__((format(printf, 1, 2)))
+void fatal(const char *format, ...) __attribute__((format(printf, 1, 2)));
+void fatal(const char *format, ...)
 {
     va_list      args;
 

tools/vkey/vkey.cpp

@@ -173,7 +173,8 @@ unsigned long mcrc32(const char *buf, unsigned len, unsigned long crc)
     return(crc);
 }
 
-void noteError(offset_t offset, const char *format, ...) __attribute__((format(printf, 2, 3)))
+void noteError(offset_t offset, const char *format, ...) __attribute__((format(printf, 2, 3)));
+void noteError(offset_t offset, const char *format, ...)
 {
     va_list arg;
     va_start(arg, format);