Changeset 114

Timestamp:

09/24/09 15:28:55 (15 years ago)

Author:

ogrimm

Message:

Bug fix with overloaded variadic print function

Location:

drsdaq

Files:

• DAQReadout.cc (modified) (2 diffs)
• DAQReadout.h (modified) (1 diff)

drsdaq/DAQReadout.cc

@@ -1047 +1047 @@
   va_list ArgumentPointer;
   va_start(ArgumentPointer, Format); 
-  PrintMessage(Format, ArgumentPointer, Target);
+  DoPrintMessage(Format, ArgumentPointer, Target);
   va_end(ArgumentPointer);
 }
@@ -1055 +1055 @@
   va_list ArgumentPointer;
   va_start(ArgumentPointer, Format);
-  if(CmdFromSocket) PrintMessage(Format, ArgumentPointer, MsgToSocket|MsgToLog);
-  else PrintMessage(Format, ArgumentPointer, MsgToConsole|MsgToLog);
+  if(CmdFromSocket) DoPrintMessage(Format, ArgumentPointer, MsgToSocket|MsgToLog);
+  else DoPrintMessage(Format, ArgumentPointer, MsgToConsole|MsgToLog);
   va_end(ArgumentPointer);
 }
 
 // Function doing the actual printing work
-// It is important that Target is here the last argument, otherwise
-// there can be confusion with the variadic versions (this function is 
-// called instead of PrintMessage(int, const char *, ...)
-void DAQReadout::PrintMessage(const char *Format, va_list ArgumentPointer, int Target) {
+// Note: Be careful when overloading variadic functions. va_list is
+// in gcc an int, which can be interpreted as char *...
+void DAQReadout::DoPrintMessage(const char *Format, va_list ArgumentPointer, int Target) {
 
   static char Textbuffer[MAX_COM_SIZE];  // static: it is only allocated once

drsdaq/DAQReadout.h

@@ -131 +131 @@
     void PrintMessage(int, const char*, ...);
     void PrintMessage(const char*, ...);
-    void PrintMessage(const char*, va_list, int); 
+    void DoPrintMessage(const char*, va_list, int); 
     bool OpenRawFile();
     bool WriteRunHeader();