Changeset 0a297f2 in git

Timestamp:

Apr 26, 2016, 4:09:29 PM (8 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

f7f33af

Parents:

75f49a7

Message:

replace strcpy and strcat with stringstream in ExRootConfReader.cc

File:

• external/ExRootAnalysis/ExRootConfReader.cc (modified) (4 diffs)

external/ExRootAnalysis/ExRootConfReader.cc

@@ -186 +186 @@
 int ModuleObjCmdProc(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-  ExRootConfReader *reader;
+  ExRootConfReader *reader = static_cast<ExRootConfReader*>(clientData);
 
   if(objc < 3)
@@ -193 +193 @@
     return TCL_ERROR;
   }
-
-  reader = (ExRootConfReader*) clientData;
 
   // add module to a list of modules to be created
@@ -217 +215 @@
 int SourceObjCmdProc(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-  const char *fileName;
-  char *fullName;
-  ExRootConfReader *reader;
-  size_t size;
+  ExRootConfReader *reader = static_cast<ExRootConfReader*>(clientData);
+  stringstream fileName;
 
   if(objc != 2)
@@ -228 +224 @@
   }
 
-  reader = (ExRootConfReader*) clientData;
-  fileName = Tcl_GetStringFromObj(objv[1], 0);
-  size = strlen(reader->GetTopDir()) + strlen(fileName) + 2;
-  fullName = static_cast<char *>(malloc(size));
-  strcpy(fullName, reader->GetTopDir());
-  strcat(fullName, "/");
-  strcat(fullName, fileName);
-  reader->ReadFile(fullName, false);
-  free(fullName);
+  fileName << reader->GetTopDir() << "/" << Tcl_GetStringFromObj(objv[1], 0);
+  reader->ReadFile(fileName.str().c_str(), false);
 
   return TCL_OK;