Changeset 111

Timestamp:

09/23/09 11:07:01 (15 years ago)

Author:

ogrimm

Message:

Small bug fix to printing routine

Location:

hvcontrol

Files:

• hvcontrol.cpp (modified) (4 diffs)
• src/ProcessIO.cc (modified) (3 diffs)
• src/ProcessIO.h (modified) (1 diff)

hvcontrol/hvcontrol.cpp

@@ -141 +141 @@
 void ConsoleCommand(ProcessIO *m) {
 
-  time_t Time;
-  char Buf[MAX_COM_SIZE], *Command;
+  char *Command;
 
   while (!m->Exit) {
@@ -167 +166 @@
 
     // Log command
-    strftime(Buf,MAX_COM_SIZE, "%d/%m/%y %X", localtime(&(Time=time(NULL))));
-    m->PrintMessage(MsgToLog, "CONSOLE(%s)> %s\n", Buf, Command);
+    m->PrintMessage(MsgToLog, "CONSOLE> %s\n", Command);
 
     // Process command     
@@ -202 +200 @@
   struct hostent *ClientName;
   socklen_t SizeClientAddress=sizeof(ClientAddress);
-  char Command[MAX_COM_SIZE], Buf[MAX_COM_SIZE];
-  time_t Time;
+  char Command[MAX_COM_SIZE];
 
   // Set up server socket
@@ -258 +255 @@
       
       // Log command
-      strftime(Buf, MAX_COM_SIZE, "%d/%m/%y %X", localtime(&(Time=time(NULL))));
-      m->PrintMessage(MsgToConsole|MsgToLog, "SOCKET(%s)> %s\n", Buf, Command);
+      m->PrintMessage(MsgToConsole|MsgToLog, "SOCKET> %s\n", Command);
             
       // Process command

hvcontrol/src/ProcessIO.cc

@@ -554 +554 @@
   va_list ArgumentPointer;
   va_start(ArgumentPointer, Format); 
-  PrintMessage(Target, Format, ArgumentPointer);
+  PrintMessage(Format, ArgumentPointer, Target);
   va_end(ArgumentPointer);
 }
@@ -562 +562 @@
   va_list ArgumentPointer;
   va_start(ArgumentPointer, Format);
-  if (CmdFromSocket) PrintMessage(MsgToSocket|MsgToLog, Format, ArgumentPointer);
-  else PrintMessage(MsgToConsole|MsgToLog, Format, ArgumentPointer);
+  if (CmdFromSocket) PrintMessage(Format, ArgumentPointer, MsgToSocket|MsgToLog);
+  else PrintMessage(Format, ArgumentPointer, MsgToConsole|MsgToLog);
   va_end(ArgumentPointer);
 }
 
 // Function doing the actual printing work
-void ProcessIO::PrintMessage(int Target, const char *Format, va_list ArgumentPointer) {
+// 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 ProcessIO::PrintMessage(const char *Format, va_list ArgumentPointer, int Target) {
 
   char Textbuffer[MAX_COM_SIZE];
@@ -592 +595 @@
       if(Textbuffer[i] == '\r') Textbuffer[i] = '\n';
     }
-    fprintf(Logfile, "%s", Textbuffer);
+    time_t Time;
+    strftime(Textbuffer+strlen(Textbuffer)+1,MAX_COM_SIZE-strlen(Textbuffer)-1, "%d/%m/%y %X", localtime(&(Time=time(NULL))));
+    fprintf(Logfile, "%s: %s", Textbuffer+strlen(Textbuffer)+1, Textbuffer);
     fflush(Logfile);
   }

hvcontrol/src/ProcessIO.h

@@ -65 +65 @@
   void PrintMessage(int, const char *, ...);
   void PrintMessage(const char *, ...);
-  void PrintMessage(int, const char *, va_list);
+  void PrintMessage(const char *, va_list, int);
   void CommandControl(char*);
   bool RampVoltage(unsigned int, int, int, int);