Changeset c750cc

Timestamp:

Apr 29, 2008, 12:19:51 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

260934

Parents:

451148

Message:

char lengths of 255 and MAXDUMMYSTRING replaced with define MAXSTRINGSIZE in molecuilder and pcp

Location:

src

Files:

• builder.cpp (modified) (2 diffs)
• config.cpp (modified) (3 diffs)
• defs.hpp (modified) (1 diff)
• moleculelist.cpp (modified) (1 diff)
• molecules.cpp (modified) (7 diffs)
• molecules.hpp (modified) (1 diff)
• periodentafel.cpp (modified) (1 diff)

src/builder.cpp

@@ -691 +691 @@
 void SaveConfig(char *ConfigFileName, config *configuration, periodentafel *periode, molecule *mol)
 {
-  char filename[255];
+  char filename[MAXSTRINGSIZE];
   ofstream output;
 
@@ -752 +752 @@
   ofstream output;
   string line;
-  char filename[255];
+  char filename[MAXSTRINGSIZE];
   char *ConfigFileName = NULL;
   char *ElementsFileName = NULL;

src/config.cpp

@@ -13 +13 @@
 config::config()
 {
-  mainname = (char *) MallocString(sizeof(char)*255,"config constructor: mainname");
-  defaultpath = (char *) MallocString(sizeof(char)*255,"config constructor: mainname");
-  pseudopotpath = (char *) MallocString(sizeof(char)*255,"config constructor: mainname");
-  configpath = (char *) MallocString(sizeof(char)*255,"config constructor: mainname");
-  configname = (char *) MallocString(sizeof(char)*255,"config constructor: mainname");
+  mainname = (char *) MallocString(sizeof(char)*MAXSTRINGSIZE,"config constructor: mainname");
+  defaultpath = (char *) MallocString(sizeof(char)*MAXSTRINGSIZE,"config constructor: mainname");
+  pseudopotpath = (char *) MallocString(sizeof(char)*MAXSTRINGSIZE,"config constructor: mainname");
+  configpath = (char *) MallocString(sizeof(char)*MAXSTRINGSIZE,"config constructor: mainname");
+  configname = (char *) MallocString(sizeof(char)*MAXSTRINGSIZE,"config constructor: mainname");
   strcpy(mainname,"pcp");
   strcpy(defaultpath,"not specified");
@@ -414 +414 @@
   char *ptr = NULL;
   int last = -1;
-  for(int i=0;i<255;i++) {
+  for(int i=0;i<MAXSTRINGSIZE;i++) {
     if (filename[i] == '/')
       last = i;
@@ -1168 +1168 @@
                 case(string_type):
                   if (value != NULL) {
-                    if (maxlength == -1) maxlength = strlen((char *)value); // get maximum size of string array
+                    //if (maxlength == -1) maxlength = strlen((char *)value); // get maximum size of string array
+                    maxlength = MAXSTRINGSIZE;
                     length = maxlength > (dummy-dummy1) ? (dummy-dummy1) : maxlength; // cap at maximum
                     strncpy((char *)value, dummy1, length);  // copy as much

src/defs.hpp

@@ -37 +37 @@
 enum value_type { string_type, double_type, int_type, row_int, row_double, grid, lower_trigrid, upper_trigrid}; 
 
+// maximum length of any char array
+#define MAXSTRINGSIZE 255
+
 // various standard filenames
 #define DEFAULTCONFIG "main_pcp_linux"

src/moleculelist.cpp

@@ -304 +304 @@
 {
   ofstream outputFragment;
-  char FragmentName[255];
-  char PathBackup[255];
+  char FragmentName[MAXSTRINGSIZE];
+  char PathBackup[MAXSTRINGSIZE];
   bool result = true;
   bool intermediateResult = true;
   atom *Walker = NULL;
   vector BoxDimension;
-  char TEFilename[255];
+  char TEFilename[MAXSTRINGSIZE];
   char *FragmentNumber;
   int FragmentCounter = 0;

src/molecules.cpp

@@ -1892 +1892 @@
   ifstream KeySetFile;
   stringstream line;
-  char *filename = (char *) Malloc(sizeof(char)*255, "molecule::ParseKeySetFile - filename");
+  char *filename = (char *) Malloc(sizeof(char)*MAXSTRINGSIZE, "molecule::ParseKeySetFile - filename");
   
   if (FragmentList != NULL) { // check list pointer
@@ -1905 +1905 @@
     // each line represents a new fragment
     int NumberOfFragments = 0;
-    char *buffer = (char *) Malloc(sizeof(char)*255, "molecule::ParseKeySetFile - *buffer");
+    char *buffer = (char *) Malloc(sizeof(char)*MAXSTRINGSIZE, "molecule::ParseKeySetFile - *buffer");
     // 1. scan through file to know number of fragments
     while (!KeySetFile.eof()) {
-      KeySetFile.getline(buffer, 255);
+      KeySetFile.getline(buffer, MAXSTRINGSIZE);
       if (strlen(buffer) > 0) // there is at least on possible number on the parsed line
         NumberOfFragments++;
@@ -1919 +1919 @@
     NumberOfFragments = 0;
     while ((!KeySetFile.eof()) && (FragmentList->NumberOfMolecules > NumberOfFragments)) {
-      KeySetFile.getline(buffer, 255);
+      KeySetFile.getline(buffer, MAXSTRINGSIZE);
       KeySet CurrentSet;
       if ((strlen(buffer) > 0) && (ScanBufferIntoKeySet(out, buffer, CurrentSet)))  // if at least one valid atom was added, write config
@@ -1946 +1946 @@
   ofstream AdjacencyFile;
   atom *Walker = NULL;
-  char *filename = (char *) Malloc(sizeof(char)*255, "molecule::StoreAdjacencyToFile - filename");
+  char *filename = (char *) Malloc(sizeof(char)*MAXSTRINGSIZE, "molecule::StoreAdjacencyToFile - filename");
   bool status = true;
 
@@ -1982 +1982 @@
 bool molecule::CheckAdjacencyFileAgainstMolecule(ofstream *out, char *path, atom **ListOfAtoms, int bondorder)
 {
-  char *filename = (char *) Malloc(sizeof(char)*255, "molecule::CheckAdjacencyFileAgainstMolecule - filename");
+  char *filename = (char *) Malloc(sizeof(char)*MAXSTRINGSIZE, "molecule::CheckAdjacencyFileAgainstMolecule - filename");
   ifstream File;
   bool status = true;
@@ -1996 +1996 @@
 
     // determine order from file
-    File.getline(filename, 255);    
+    File.getline(filename, MAXSTRINGSIZE);    
     if (bondorder != atoi(&filename[5])) {
       *out << "Bond order desired is " << bondorder << " and does not match one in file " << filename[6] << "." << endl;
@@ -2003 +2003 @@
       // Parse the file line by line and count the bonds
       while (!File.eof()) {
-        File.getline(filename, 255);
+        File.getline(filename, MAXSTRINGSIZE);
         stringstream line;
         line.str(filename);

src/molecules.hpp

@@ -247 +247 @@
     element *start; //!< start of element list
     element *end;   //!< end of element list
-    char header1[255]; //!< store first header line
-    char header2[255]; //!< store second header line
+    char header1[MAXSTRINGSIZE]; //!< store first header line
+    char header2[MAXSTRINGSIZE]; //!< store second header line
   
   periodentafel();

src/periodentafel.cpp

@@ -175 +175 @@
     infile.open(filename);
   if (infile != NULL) {
-    infile.getline(header1, 255);
-    infile.getline(header2, 255); // skip first two header lines
+    infile.getline(header1, MAXSTRINGSIZE);
+    infile.getline(header2, MAXSTRINGSIZE); // skip first two header lines
     cout <<  "Parsed elements:";
     while (!infile.eof()) {