Changeset 27 for drsdaq/DAQReadout.cc

Timestamp:

04/01/09 14:39:16 (16 years ago)

Author:

ogrimm

Message:

Changed 'char *' to 'const char *'

File:

• drsdaq/DAQReadout.cc (modified) (8 diffs)

drsdaq/DAQReadout.cc

@@ -11 +11 @@
 #include "DAQReadout.h"
 
-static char* daq_state_str[] = {"active", "stopped"};
-static char* daq_runtype_str[] = {"data", "pedestal", "test"};
-
-static struct CL_Struct { char *Name;    
+static const char* daq_state_str[] = {"active", "stopped"};
+static const char* daq_runtype_str[] = {"data", "pedestal", "test"};
+
+static const struct CL_Struct { const char *Name;    
                           void (DAQReadout::*CommandPointer)();
                           bool NeedNotBusy;
-                          char *Parameters;
-                          char *Help;
+                          const char *Parameters;
+                          const char *Help;
   } CommandList[] = 
   {{"board", &DAQReadout::cmd_board, true, "<i> [j] | <all>" ,"Address board i, boards i-j, all boards"},
@@ -379 +379 @@
 void DAQReadout::cmd_calib() {
   if (NParam==4 && atof(Param[1]) && atof(Param[2]))
-    CalibrateDRS(Param[3],atof(Param[1]),atof(Param[2])); 
+    CalibrateDRS((char *) Param[3],atof(Param[1]),atof(Param[2])); 
   else if (NParam==3 && atof(Param[1]) && atof(Param[2]))
     CalibrateDRS(NULL,atof(Param[1]),atof(Param[2])); 
@@ -1059 +1059 @@
          
 // Print message to selected target
-void DAQReadout::PrintMessage(int Target, char *Format, ...) {
+void DAQReadout::PrintMessage(int Target, const char *Format, ...) {
   va_list ArgumentPointer;
   va_start(ArgumentPointer, Format); 
@@ -1067 +1067 @@
 
 // Print message to screen, log file and socket
-void DAQReadout::PrintMessage(char *Format, ...) {
+void DAQReadout::PrintMessage(const char *Format, ...) {
   va_list ArgumentPointer;
   va_start(ArgumentPointer, Format); 
@@ -1075 +1075 @@
 
 // Function doing the actual printing work
-void DAQReadout::PrintMessage(int Target, char *Format, va_list ArgumentPointer) {
+void DAQReadout::PrintMessage(int Target, const char *Format, va_list ArgumentPointer) {
 
   char Textbuffer[MAX_COM_SIZE];
@@ -1112 +1112 @@
 
 // Check if two strings match (min 1 character must match)
-int Match(char *str, char *cmd) {
-  return strncasecmp(str,cmd,strlen(str)==0 ? 1:strlen(str)) ? 0:1;
+bool Match(const char *str, const char *cmd) {
+  return strncasecmp(str,cmd,strlen(str)==0 ? 1:strlen(str)) ? false:true;
 }
 
@@ -1125 +1125 @@
 
 // Parse command line for white space and double-quote separated tokens 
-int ParseInput(char* Command, char *Param[]) {
+int ParseInput(char* Command, const char *Param[]) {
   int Count=0;
    
@@ -1146 +1146 @@
 
 // ReadCard function by F. Goebel
-int ReadCard(char *card_flag, void *store, char type, FILE *fptr) {
+int ReadCard(const char *card_flag, void *store, char type, FILE *fptr) {
   
   char *card_name, *card_val, line[160];