coverity 17742 fixed

[u/mrichter/AliRoot.git] / HLT / BASE / AliHLTLogging.cxx

diff --git a/HLT/BASE/AliHLTLogging.cxx b/HLT/BASE/AliHLTLogging.cxx
index 7f3a0dc8ce8c9e0326d4ac738bd47e7812bd4d79..ed7fc8cbe152fef400ceef9054dae512ea632b5c 100644 (file)
--- a/HLT/BASE/AliHLTLogging.cxx
+++ b/HLT/BASE/AliHLTLogging.cxx
@@ -40,8 +40,7 @@ ClassImp(AliHLTLogging);
 
 AliHLTLogging::AliHLTLogging()
   :
-  //fLocalLogFilter(kHLTLogDefault),
-  fLocalLogFilter(kHLTLogAll),
+  fLocalLogFilter(fgLocalLogDefault),
   fpDefaultKeyword(NULL),
   fpCurrentKeyword(NULL)
 {
@@ -71,6 +70,7 @@ AliHLTLogging& AliHLTLogging::operator=(const AliHLTLogging&)
 
 ostringstream AliHLTLogging::fgLogstr;
 AliHLTComponentLogSeverity AliHLTLogging::fgGlobalLogFilter=kHLTLogAll;
+AliHLTComponentLogSeverity AliHLTLogging::fgLocalLogDefault=kHLTLogAll;
 AliHLTfctLogging AliHLTLogging::fgLoggingFunc=NULL;
 AliHLTLogging::AliHLTDynamicMessage AliHLTLogging::fgAliLoggingFunc=NULL;
 int AliHLTLogging::fgUseAliLog=1;
@@ -151,7 +151,7 @@ int AliHLTLogging::InitAliLogFunc(AliHLTComponentHandler* pHandler)
     fgAliLoggingFunc=(AliHLTLogging::AliHLTDynamicMessage)pHandler->FindSymbol(ALILOG_WRAPPER_LIBRARY, "AliDynamicMessage");
     if (fgAliLoggingFunc==NULL) {
       Message(NULL, kHLTLogError, "AliHLTLogging::InitAliLogFunc", "init logging",
-             "symbol lookp failure: can not find AliDynamicMessage, switching to HLT logging system");
+             "symbol lookup failure: can not find AliDynamicMessage, switching to HLT logging system");
       iResult=-ENOSYS;
     }
   } else {
@@ -191,6 +191,9 @@ int AliHLTLogging::Message(void *param, AliHLTComponentLogSeverity severity,
   case kHLTLogFatal:
     strSeverity="fatal";
     break;
+  case kHLTLogImportant:
+    strSeverity="notify";
+    break;
   default:
     break;
   }
@@ -238,7 +241,7 @@ int AliHLTLogging::AliMessage(AliHLTComponentLogSeverity severity,
 }
 #endif
 
-const char* AliHLTLogging::BuildLogString(const char *format, va_list ap) 
+const char* AliHLTLogging::BuildLogString(const char *format, va_list &ap, bool bAppend) 
 {
   // see header file for class documentation
 
@@ -253,13 +256,22 @@ const char* AliHLTLogging::BuildLogString(const char *format, va_list ap)
   const char* fmt = format;
   if (fmt==NULL) fmt=va_arg(ap, const char*);
 
-  fgAliHLTLoggingTarget[0]=0;
+  unsigned int iOffset=0;
+  if (bAppend) {
+    iOffset=strlen(fgAliHLTLoggingTarget.GetArray());
+  } else {
+    fgAliHLTLoggingTarget[0]=0;
+  }
   while (fmt!=NULL) {
-    iResult=vsnprintf(fgAliHLTLoggingTarget.GetArray(), fgAliHLTLoggingTarget.GetSize(), fmt, ap);
+    iResult=vsnprintf(fgAliHLTLoggingTarget.GetArray()+iOffset, fgAliHLTLoggingTarget.GetSize()-iOffset, fmt, ap);
     if (iResult==-1)
       // for compatibility with older version of vsnprintf
       iResult=fgAliHLTLoggingTarget.GetSize()*2;
-    else if (iResult<fgAliHLTLoggingTarget.GetSize())
+    else
+      iResult+=iOffset;
+
+    if (iResult<fgAliHLTLoggingTarget.GetSize())
+      // everything in the limit
       break;
 
     // terminate if buffer is already at the limit
@@ -290,6 +302,25 @@ const char* AliHLTLogging::BuildLogString(const char *format, va_list ap)
   return fgAliHLTLoggingTarget.GetArray();
 }
 
+const char* AliHLTLogging::SetLogString(const void* p, const char* pfmt, const char *format, ...)
+{
+  // see header file for class documentation
+  if (!p || !pfmt) return NULL;
+  TString formatstr=format;
+  TString pstr;
+#ifdef __DEBUG
+  pstr.Form(pfmt, p);
+#endif
+  formatstr.ReplaceAll("_pfmt_", pstr);
+  va_list args;
+  va_start(args, format);
+
+  const char* message=BuildLogString(formatstr.Data(), args);
+  va_end(args);
+
+  return message;
+}
+
 int AliHLTLogging::Logging(AliHLTComponentLogSeverity severity,
                           const char* origin, const char* keyword,
                           const char* format, ... ) 
@@ -317,34 +348,42 @@ int AliHLTLogging::LoggingVarargs(AliHLTComponentLogSeverity severity,
                                  const char* file, int line,  ... ) const
 {
   // see header file for class documentation
+  int iResult=0;
 
-  if (file==NULL && line==0) {
-    // this is currently just to get rid of the warning "unused parameter"
+  va_list args;
+  va_start(args, line);
+
+  iResult=SendMessage(severity, originClass, originFunc, file, line, AliHLTLogging::BuildLogString(NULL, args ));
+  va_end(args);
+
+  return iResult;
+}
+
+int AliHLTLogging::SendMessage(AliHLTComponentLogSeverity severity, 
+                              const char* originClass, const char* originFunc,
+                              const char* file, int line,
+                              const char* message) const
+{
+  // see header file for class documentation
+  int iResult=0;
+  const char* separator="";
+  TString origin;
+  if (originClass) {
+    origin+=originClass;
+    separator="::";
+  }
+  if (originFunc) {
+    origin+=separator;
+    origin+=originFunc;
   }
-  int iResult=1; //CheckFilter(severity); // check moved to makro
-  if (iResult>0) {
-    const char* separator="";
-    TString origin;
-    if (originClass) {
-       origin+=originClass;
-       separator="::";
-    }
-    if (originFunc) {
-       origin+=separator;
-       origin+=originFunc;
-    }
-    va_list args;
-    va_start(args, line);
 
-    if (fgLoggingFunc) {
-      iResult=(*fgLoggingFunc)(NULL/*fParam*/, severity, origin.Data(), GetKeyword(), AliHLTLogging::BuildLogString(NULL, args ));
-    } else {
-      if (fgUseAliLog!=0 && fgAliLoggingFunc!=NULL)
-       iResult=(*fgAliLoggingFunc)(severity, originClass, originFunc, file, line, AliHLTLogging::BuildLogString(NULL, args ));
-      else
-       iResult=Message(NULL/*fParam*/, severity, origin.Data(), GetKeyword(), AliHLTLogging::BuildLogString(NULL, args ));
-    }
-    va_end(args);
+  if (fgLoggingFunc) {
+    iResult=(*fgLoggingFunc)(NULL/*fParam*/, severity, origin.Data(), GetKeyword(), message);
+  } else {
+    if (fgUseAliLog!=0 && fgAliLoggingFunc!=NULL)
+      iResult=(*fgAliLoggingFunc)(severity, originClass, originFunc, file, line, message);
+    else
+      iResult=Message(NULL/*fParam*/, severity, origin.Data(), GetKeyword(), message);
   }
   return iResult;
 }
@@ -353,7 +392,7 @@ int AliHLTLogging::CheckFilter(AliHLTComponentLogSeverity severity) const
 {
   // see header file for class documentation
 
-  int iResult=severity==kHLTLogNone || (severity&fgGlobalLogFilter)>0 && (severity&fLocalLogFilter)>0;
+  int iResult=severity==kHLTLogNone || ((severity&fgGlobalLogFilter)>0 && (severity&fLocalLogFilter)>0);
   return iResult;
 }
 
@@ -386,7 +425,13 @@ AliHLTComponentLogSeverity AliHLTLogging::GetLocalLoggingLevel()
   return fLocalLogFilter;
 }
 
-int AliHLTLogging::CheckGroup(const char* originClass) const
+void AliHLTLogging::SetLocalLoggingDefault(AliHLTComponentLogSeverity level)
+{
+  // see header file for class documentation
+  fgLocalLogDefault=level;
+}
+
+int AliHLTLogging::CheckGroup(const char* /*originClass*/) const
 {
   // see header file for class documentation