Fix GCC warning: forbidden conversion to char*

GCC 11 warning: ISO C++ forbids converting a string constant to 'char*' [-Wwrite-strings] GCC 485 warning: deprecated conversion from string constant to 'char*' [-Wwrite-strings]
star-bnl · Sep 3, 2022 · d0fce01 · d0fce01
1 parent 7f24ac6
commit d0fce01
Show file tree

Hide file tree

Showing 36 changed files with 70 additions and 71 deletions.
diff --git a/StRoot/RTS/EventTracker/gl3Histo.cxx b/StRoot/RTS/EventTracker/gl3Histo.cxx
@@ -15,7 +15,7 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 //
 //####################################################################################
-gl3Histo::gl3Histo ( char iId[10], char iTitle[100], 
+gl3Histo::gl3Histo (const char iId[10], const char iTitle[100],
       int iNBins,  double iXMin, double iXMax ) {
    info = 0 ;
    if ( iNBins < 0 ) {

diff --git a/StRoot/RTS/EventTracker/gl3Histo.h b/StRoot/RTS/EventTracker/gl3Histo.h
@@ -29,7 +29,7 @@ class gl3Histo {
    double*   info ;
 
 public:
-   gl3Histo ( char iId[10]="id", char iTitle[100]="name", 
+   gl3Histo (const char iId[10]="id", const char iTitle[100]="name",
                    int iNBins=100,  double iXMin=0., double iXMax=100. ) ;
    ~gl3Histo ( ) ;
    int   Fill   (double x, double weight=1) ;

diff --git a/StRoot/RTS/EventTracker/l3CoordinateTransformer.cxx b/StRoot/RTS/EventTracker/l3CoordinateTransformer.cxx
@@ -66,7 +66,7 @@ l3CoordinateTransformer::~l3CoordinateTransformer()
 
 #include "mapbin.h"
 
-int l3CoordinateTransformer::LoadTPCLookupTable(char *)
+int l3CoordinateTransformer::LoadTPCLookupTable(const char *)
 {
   //     if (TPCmap) free(TPCmap);
   //     TPCmap = NULL;

diff --git a/StRoot/RTS/EventTracker/l3CoordinateTransformer.h b/StRoot/RTS/EventTracker/l3CoordinateTransformer.h
@@ -36,7 +36,7 @@ class l3CoordinateTransformer{
   l3CoordinateTransformer() ;  // Init parameters and variables
   virtual ~l3CoordinateTransformer() ; // Delete variables
 
-  int LoadTPCLookupTable(char * filename = "/L3/etc/map.bin");
+  int LoadTPCLookupTable(const char * filename = "/L3/etc/map.bin");
 
   // Memberfunctions
   // raw -> global

diff --git a/StRoot/RTS/include/fcfClass.hh b/StRoot/RTS/include/fcfClass.hh
@@ -201,7 +201,7 @@ public:
 	int compare(u_int *p1[3], u_int *p2[3]) ;
 
 	void decode(u_int *data, fcfHit *h, u_int *sim = 0) ;	// utility: from FCF to local
-	void print_hit(char *, fcfHit *hit) ;	// utility
+	void print_hit(const char *, fcfHit *hit) ;	// utility
 
 	u_int do_swap ;		// 0=no, 1=yes => set by "burn"
 	u_int do_merge ;	// merge broken rows

diff --git a/StRoot/RTS/src/DAQ_BTOW/daq_btow.cxx b/StRoot/RTS/src/DAQ_BTOW/daq_btow.cxx
@@ -136,10 +136,9 @@ daq_dta *daq_btow::handle_raw()
 	char *from, *st ;
 	int bytes ;
 	char str[256] ;	
-	char *full_name = "?" ;	// just a dummy...
+	const char *full_name = "?" ;	// just a dummy...
 
 	from = 0 ;
-	full_name = "?" ;
 
 	assert(caller) ;
 

diff --git a/StRoot/RTS/src/DAQ_EMC/emc_reader.cxx b/StRoot/RTS/src/DAQ_EMC/emc_reader.cxx
@@ -62,11 +62,11 @@ static char *inst2char(int inst)
 static struct emc_describe_t {
 	int id ;
 
-	char *p ;
-	char *secp ;
-	char *rbp ;
-	char *adcr ;
-	char *adcd ;	
+	const char *p ;
+	const char *secp ;
+	const char *rbp ;
+	const char *adcr ;
+	const char *adcd ;
 	int trg_index ;
 	int type ;	// 0 Barrel, 1 Endcap
 	int sub ;	// 0 tower, 1 SMD

diff --git a/StRoot/RTS/src/DAQ_EMC/emc_single_reader.cxx b/StRoot/RTS/src/DAQ_EMC/emc_single_reader.cxx
@@ -8,10 +8,10 @@
 #include <DAQ_READER/daq_det.h>
 
 const struct hdrs {
-	char *emcp ;
-	char *secp ;
-	char *rbp ;
-	char *adc ;
+	const char *emcp ;
+	const char *secp ;
+	const char *rbp ;
+	const char *adc ;
 } hdrs[2] = {
 	{ CHAR_EMCP, CHAR_EMCSECP, CHAR_EMCRBP, CHAR_EMCADCR },
 	{ CHAR_EECP, CHAR_EECSECP, CHAR_EECRBP, CHAR_EECADCR }

diff --git a/StRoot/RTS/src/DAQ_READER/daqReader.cxx b/StRoot/RTS/src/DAQ_READER/daqReader.cxx
@@ -1141,7 +1141,7 @@ char *daqReader::skip_then_get(int numToSkip, int num, int type)
   }
 
 
-  char *daqReader::getInputType()
+  const char *daqReader::getInputType()
     {
       switch(input_type) {
       case none: 

diff --git a/StRoot/RTS/src/DAQ_READER/daqReader.h b/StRoot/RTS/src/DAQ_READER/daqReader.h
@@ -246,7 +246,7 @@ class daqReader {
   u_int L3summary[4];
 
   int fixDatapSummary(DATAP *datap);
-  char *getInputType();
+  const char *getInputType();
   int getNextEventFilename(int num, int type);
   int getNextEventFilenameFromLive(int type);
   int getNextEventFilenameFromDir(int eventNum);

diff --git a/StRoot/RTS/src/DAQ_READER/daq_det.cxx b/StRoot/RTS/src/DAQ_READER/daq_det.cxx
@@ -313,7 +313,7 @@ daq_dta  *daq_det::put(const char *bank,int c1, int c2, int c3, void *p1, void *
 
 
 // helpers
-int checkBank(char *in, char *expect) 
+int checkBank(char *in, const char *expect) 
 { 
 	char buff[12] ;
 

diff --git a/StRoot/RTS/src/DAQ_READER/daq_det.h b/StRoot/RTS/src/DAQ_READER/daq_det.h
@@ -33,7 +33,7 @@ class daqReader ;
 class daq_det ;
 
 // helpers
-extern int checkBank(char *in, char *expect) ;
+extern int checkBank(char *in, const char *expect) ;
 extern int *legacyDetp(int rts_id, char *datap) ;
 
 

diff --git a/StRoot/RTS/src/FCF/fcfAfterburner.cxx b/StRoot/RTS/src/FCF/fcfAfterburner.cxx
@@ -46,7 +46,7 @@ fcfAfterburner::fcfAfterburner()
 	If "str" is non-NULL it prepends it to the line
 	as a label.
 */
-void fcfAfterburner::print_hit(char *str, struct fcfHit *h)
+void fcfAfterburner::print_hit(const char *str, struct fcfHit *h)
 {
         if(str) {
                 fprintf(stdout,"%s: ",str) ; 

diff --git a/StRoot/RTS/src/SFS/fs_index.cxx b/StRoot/RTS/src/SFS/fs_index.cxx
@@ -356,7 +356,7 @@ int fs_index::initmount()
   return 0;
 }
 
-void fs_index::getFullPath(char *fullpath, char *name)
+void fs_index::getFullPath(char *fullpath, const char *name)
 {
   if(name[0] == '/') {
     strcpy(fullpath,name);
@@ -436,7 +436,7 @@ void fs_index::umount()
   index_created = 0;
 }
 
-fs_dirent *fs_index::readdirent(char *dir, fs_dirent *ent)
+fs_dirent *fs_index::readdirent(const char *dir, fs_dirent *ent)
 {
   if(ent == NULL) {
       ent = &_readdirent_static_;
@@ -473,7 +473,7 @@ fs_dirent *fs_index::readdirent(char *dir, fs_dirent *ent)
 }
 
 
-fs_dir *fs_index::opendir(char *dir)
+fs_dir *fs_index::opendir(const char *dir)
 {
   if(!index_created) return NULL;
 
@@ -582,7 +582,7 @@ fs_inode *fs_index::alloc_inode(const char *name, long long int off, int sz, int
   return n;
 }
 
-int fs_index::fileSize(char *fn)
+int fs_index::fileSize(const char *fn)
 {
   if(!index_created) return -1;
 
@@ -595,7 +595,7 @@ int fs_index::fileSize(char *fn)
   return entry->sz;
 }
 
-int fs_index::read(char *fn, char *buff, int maxsize)
+int fs_index::read(const char *fn, char *buff, int maxsize)
 {
   if(!index_created) return -1;
 

diff --git a/StRoot/RTS/src/SFS/fs_index.h b/StRoot/RTS/src/SFS/fs_index.h
@@ -131,30 +131,30 @@ class fs_index {
   char *pwd() { return cwd; };
 
   // directory functions
-  fs_dir *opendir(char *dir);
+  fs_dir *opendir(const char *dir);
   void closedir(fs_dir *dir);
   fs_dirent *readdir(fs_dir *dir, fs_dirent *storage=NULL);
-  fs_dirent *readdirent(char *name, fs_dirent *storage=NULL);
+  fs_dirent *readdirent(const char *name, fs_dirent *storage=NULL);
 
   // meant for users that have memory mapped/memory sfs indexes
   // and want to use the buffers in place to avoid memcpy
   // access the data through the dirent's offset / size
   // 
-  inline fs_dirent *opendirent(char *name) { return readdirent(name); };
+  inline fs_dirent *opendirent(const char *name) { return readdirent(name); };
 
   int mem_ls(fs_filelist *filelist, int recurse, fs_dir *dir);
 
   // File operations
-  int read(char *fn, char *buff, int sz);
+  int read(const char *fn, char *buff, int sz);
   virtual int write(char *fn, char *buff, int sz) { return -1; };
   virtual int getwritevsz(fs_iovec *fsiovec, int n) { return 0; };
   virtual int writev(fs_iovec *iovec, int n) { return -1; };
   virtual int writev_sticky(fs_iovec *iovec, int n, int *sticky) { return -1; };
 
-  int fileSize(char *fn);
+  int fileSize(const char *fn);
 
   int n_inodes;
-  void getFullPath(char *fullname, char *name);
+  void getFullPath(char *fullname, const char *name);
   virtual void dump(int fd)=0;
 
   wrapfile wfile;

diff --git a/StRoot/StDaqLib/GENERIC/EventReader.cxx b/StRoot/StDaqLib/GENERIC/EventReader.cxx
@@ -921,7 +921,7 @@ char * EventReader::findBank(char *bankid)
 
 }
 
-void EventReader::fprintError(int err, char *file, int line, char *userstring)
+void EventReader::fprintError(int err, char *file, int line, const char *userstring)
 {
   if (logfd==NULL) return; //no file designated
   if (err<0 || err>MX_MESSAGE) return; //protect against bad error code

diff --git a/StRoot/StDaqLib/GENERIC/EventReader.hh b/StRoot/StDaqLib/GENERIC/EventReader.hh
@@ -477,7 +477,7 @@ public:
   int system_present(Bank_DATAP *datap, int sys);
 
   void printEventInfo(FILE *fd=stdout);
-  void fprintError(int err, char *file, int line, char *userstring);
+  void fprintError(int err, char *file, int line, const char *userstring);
 
   int runno() { return runnum; }
   int errorNo() { return errnum; };

diff --git a/StRoot/StFlowMaker/StFlowEvent.cxx b/StRoot/StFlowMaker/StFlowEvent.cxx
@@ -376,7 +376,7 @@ TVector2 StFlowEvent::Q(StFlowSelection* pFlowSelect) {
 
 //-------------------------------------------------------------
 
-TVector2 StFlowEvent::ReCentPar(StFlowSelection* pFlowSelect, char* TPC) {
+TVector2 StFlowEvent::ReCentPar(StFlowSelection* pFlowSelect, const char* TPC) {
   // For LYZ
   // Calculate weighted recentering vector per particle for each TPC
   // TPC can be "TPC", "TPCE", or "TPCW"
@@ -417,7 +417,7 @@ TVector2 StFlowEvent::ReCentPar(StFlowSelection* pFlowSelect, char* TPC) {
 
 //-------------------------------------------------------------
 
-TVector2 StFlowEvent::ReCentEPPar(StFlowSelection* pFlowSelect, char* TPC) {
+TVector2 StFlowEvent::ReCentEPPar(StFlowSelection* pFlowSelect, const char* TPC) {
   // For ana
   // Calculate the recentering vector per particle for each TPC
   // TPC can be "TPCE", "TPCW", "FTPCE", or "FTPCW"

diff --git a/StRoot/StFlowMaker/StFlowEvent.h b/StRoot/StFlowMaker/StFlowEvent.h
@@ -56,8 +56,8 @@ class StFlowEvent  : public StObject {
   TVector2       Q(StFlowSelection*);
   TVector2       NormQ(StFlowSelection* pFlowSelect);
   TVector2       QPart(StFlowSelection*);
-  TVector2       ReCentEPPar(StFlowSelection*, char*); // for ana
-  TVector2       ReCentPar(StFlowSelection*, char*); // for LYZ
+  TVector2       ReCentEPPar(StFlowSelection*, const char*); // for ana
+  TVector2       ReCentPar(StFlowSelection*, const char*); // for LYZ
   TVector2       ReCent(Int_t selN, Int_t harN, StFlowTrack* pFlowTrack) const;
   TVector2       ReCentEP(Int_t selN, Int_t harN, StFlowTrack* pFlowTrack) const;
   Float_t        q(StFlowSelection*);

diff --git a/StRoot/StSpinPool/StSpinDbMaker/StSpinDbMaker.cxx b/StRoot/StSpinPool/StSpinDbMaker/StSpinDbMaker.cxx
@@ -187,7 +187,7 @@ void  StSpinDbMaker::optimizeTables  (){
 
   } 
 
-  char *polDir="scrambled";
+  string polDir="scrambled";
   if(isPolDirTrans()) polDir="Transverse";
   if(isPolDirLong()) polDir="Longitudinal";
 
@@ -487,9 +487,9 @@ void StSpinDbMaker::print(int level) {
     int yellBx=(bXstar+getBucketOffsets()[yellRing]/3)%SPINDbMaxBXings;
     int spin8=spin8usingBX48(bx48);
     int spin4=spin4usingBX48(bx48);
-    char *ftt="empty ";
+    const char *ftt="empty ";
     if (isBXfilledUsingBX48(bx48))ftt="filled";
-    char *mtt="use "; 
+    const char *mtt="use ";
     if(isMaskedUsingBX48(bx48))mtt="*mask*";
      printf("  %3d    0x%02x       %2d    %6s   %6s   %3d     %3d    %3d\n",bXstar,spin8,spin4,ftt,mtt,bx48,blueBx,yellBx);
     //  printf("bx48=%d mU=%d bxStar=%d mR=%d\n", bx48,isMaskedUsingBX48(bx48),bXstar,mTabSpinBXmask->bXmask[bXstar]);

diff --git a/StRoot/StSvtDaqMaker/StSvtDaqData.cc b/StRoot/StSvtDaqMaker/StSvtDaqData.cc
@@ -52,7 +52,7 @@ StSvtDaqData::StSvtDaqData() :
   StSvtData()
 {}
 
-StSvtDaqData::StSvtDaqData(const char* config, StSVTReader* reader, char* option, int run, int event, int trigger) : 
+StSvtDaqData::StSvtDaqData(const char* config, StSVTReader* reader, const char* option, int run, int event, int trigger) :
   StSvtData(config, run, event, trigger)
 {
   // The Same as StSvtHybridCollection, with two additional parameters: 
@@ -66,7 +66,7 @@ StSvtDaqData::StSvtDaqData(const char* config, StSVTReader* reader, char* option
     setData(reader,option);
 }
 
-StSvtDaqData::StSvtDaqData(StSvtConfig* config, StSVTReader* reader, char* option, int run, int event, int trigger) : 
+StSvtDaqData::StSvtDaqData(StSvtConfig* config, StSVTReader* reader, const char* option, int run, int event, int trigger) :
   StSvtData(config, run, event, trigger)
 {
   // The Same as StSvtHybridCollection, with two additional parameters: 
@@ -80,7 +80,7 @@ StSvtDaqData::StSvtDaqData(StSvtConfig* config, StSVTReader* reader, char* optio
     setData(reader,option);
 }
 
-int StSvtDaqData::setData(StSVTReader* reader, char* option)
+int StSvtDaqData::setData(StSVTReader* reader, const char* option)
 {
   int status, index;
 

diff --git a/StRoot/StSvtDaqMaker/StSvtDaqData.hh b/StRoot/StSvtDaqMaker/StSvtDaqData.hh
@@ -30,10 +30,10 @@ class StSvtDaqData: public StSvtData
 {
 public:
   StSvtDaqData();
-  StSvtDaqData(const char* config, StSVTReader* reader=0, char* option = "ZS", int run=0, int event=0, int trigger=0);
-  StSvtDaqData(StSvtConfig* config, StSVTReader* reader=0, char* option = "ZS", int run=0, int event=0, int trigger=0);
+  StSvtDaqData(const char* config, StSVTReader* reader=0, const char* option = "ZS", int run=0, int event=0, int trigger=0);
+  StSvtDaqData(StSvtConfig* config, StSVTReader* reader=0, const char* option = "ZS", int run=0, int event=0, int trigger=0);
 
-  int setData(StSVTReader* reader, char* option = "ZS");
+  int setData(StSVTReader* reader, const char* option = "ZS");
 
 protected:
 

diff --git a/StRoot/StSvtDaqMaker/StSvtHybridDaqData.cc b/StRoot/StSvtDaqMaker/StSvtHybridDaqData.cc
@@ -39,7 +39,7 @@
 
 ClassImp(StSvtHybridDaqData)
 
-StSvtHybridDaqData::StSvtHybridDaqData(int barrel, int ladder, int wafer, int hybrid, StSVTReader* reader, char* option) : 
+StSvtHybridDaqData::StSvtHybridDaqData(int barrel, int ladder, int wafer, int hybrid, StSVTReader* reader, const char* option) :
   StSvtHybridData(barrel, ladder, wafer, hybrid)
 {
   assert(sizeof(TPCSequence)==sizeof(StSequence));
@@ -51,7 +51,7 @@ StSvtHybridDaqData::StSvtHybridDaqData(int barrel, int ladder, int wafer, int hy
     setHybridData(reader,option);
 }
 
-int StSvtHybridDaqData::setHybridData(StSVTReader* reader, char* option)
+int StSvtHybridDaqData::setHybridData(StSVTReader* reader, const char* option)
 {
   // fills the data members of this object, 
   // so one can access the data through the two methods mentioned below. 

diff --git a/StRoot/StSvtDaqMaker/StSvtHybridDaqData.hh b/StRoot/StSvtDaqMaker/StSvtHybridDaqData.hh
@@ -25,9 +25,9 @@ class StSVTReader;
 class StSvtHybridDaqData: public StSvtHybridData
 {
 public:
-  StSvtHybridDaqData(int barrel, int ladder, int wafer, int hybrid, StSVTReader* reader=0, char* option="ZS");
+  StSvtHybridDaqData(int barrel, int ladder, int wafer, int hybrid, StSVTReader* reader=0, const char* option="ZS");
 
-  int setHybridData(StSVTReader* reader, char* option = "ZS");
+  int setHybridData(StSVTReader* reader, const char* option = "ZS");
 
 protected:
 

diff --git a/StRoot/StSvtPool/SvtMatchedTree/SvtMatchedTree.h b/StRoot/StSvtPool/SvtMatchedTree/SvtMatchedTree.h
@@ -16,7 +16,7 @@ class SvtMatchedTree : public StMaker {
   void Print(Option_t *opt="") const;
   void SetMinNoHits(Int_t MinNoHits=0) {fMinNoHits = MinNoHits;}
   void SetpCut(Double_t pCut=0.0) {fpCut = pCut;}
-  void SetOut(Char_t *Out="Event") {fOut = Out;}
+  void SetOut(const Char_t *Out="Event") {fOut = Out;}
   void MakeListOfRotations();
  private:
   TFile   *fFile;

diff --git a/StRoot/StTofCalibMaker/StTofCalibMaker.cxx b/StRoot/StTofCalibMaker/StTofCalibMaker.cxx
@@ -466,7 +466,7 @@ Int_t StTofCalibMaker::initParameters(int runnumber)
 
     if(Debug()) gMessMgr->Info("","OS") << " Number of rows read in: " << numRows << " for INL tables" << endm;
 
-    Char_t *boardName;
+    const Char_t *boardName;
     Short_t boardId;
     Short_t tdcId;
     Float_t INLcorr[1024];

diff --git a/StRoot/StTofUtil/StTofrGeometry.cxx b/StRoot/StTofUtil/StTofrGeometry.cxx
@@ -48,9 +48,9 @@
 
 Bool_t StTofrNode::mDebug = kFALSE;
 Double_t const StTofrGeomSensor::mSensorDy = 10.35;   // Actual module length;
-char* const StTofrGeometry::sectorPref = "BSEC";
-char* const StTofrGeometry::trayPref   = "BTRA";
-char* const StTofrGeometry::senPref    = "BRMD";
+const char* const StTofrGeometry::sectorPref = "BSEC";
+const char* const StTofrGeometry::trayPref   = "BTRA";
+const char* const StTofrGeometry::senPref    = "BRMD";
 
 //_____________________________________________________________________________
 StTofrNode::StTofrNode(TVolumeView *element, TVolumeView *top)

diff --git a/StRoot/StTofUtil/StTofrGeometry.h b/StRoot/StTofUtil/StTofrGeometry.h
@@ -362,9 +362,9 @@ class StTofrGeometry : public TNamed {
 
    static Bool_t   mDebug;     //!Control message printing of this class
 
-   static char* const sectorPref ;//= "BSEC";
-   static char* const trayPref   ;//= "BTRA";
-   static char* const senPref    ;//= "BRMD";
+   static const char* const sectorPref ;//= "BSEC";
+   static const char* const trayPref   ;//= "BTRA";
+   static const char* const senPref    ;//= "BRMD";
 
  protected:
    //void        InitFromXdf(const char* xdffile);