Changeset c510a7 for molecuilder/src/molecules.cpp

Timestamp:

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

Author:

Frederik Heber <heber@…>

Children:

e936b3

Parents:

307fd1

Message:

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

File:

• molecuilder/src/molecules.cpp (modified) (7 diffs)

molecuilder/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);