ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/utils/StringUtils.cpp
(Generate patch)

Comparing branches/development/src/utils/StringUtils.cpp (file contents):
Revision 1767 by gezelter, Fri Jul 6 22:01:58 2012 UTC vs.
Revision 1874 by gezelter, Wed May 15 15:09:35 2013 UTC

# Line 35 | Line 35
35   *                                                                      
36   * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37   * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38 < * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
38 > * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
39   * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40   * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
# Line 110 | Line 110 | namespace OpenMD {
110      int foundText = 0;
111      int lineNum;
112      char* the_token;
113    char* eof_test;
113  
114      // rewind the stream
115      theStream.seekg (0, std::ios::beg);
# Line 184 | Line 183 | namespace OpenMD {
183      foo = strtok(working_line, " ,;\t");
184  
185      if (foo != NULL) {
186 +      
187 +      if (!strcasecmp(foo, "end")) {
188 +        free(working_line);
189 +        return 1;
190 +      }
191  
188      if (!strcasecmp(foo, "end")) return 1;
189
192      }
193  
194 +    free(working_line);
195      return 0;
196    }
197    
# Line 261 | Line 264 | namespace OpenMD {
264    
265    /**
266     *    memparse - parse a string with mem suffixes into a number
267 <   *    @ptr: Where parse begins
268 <   *    @retptr: (output) Pointer to next char after parse completes
267 >   *    @param ptr: Where parse begins
268 >   *    @param retptr: (output) Pointer to next char after parse completes
269     *
270 <   *    Parses a string into a number.  The number stored at @ptr is
270 >   *    Parses a string into a number.  The number stored at @param ptr is
271     *    potentially suffixed with %K (for kilobytes, or 1024 bytes),
272     *    %M (for megabytes, or 1048576 bytes), or %G (for gigabytes, or
273     *    1073741824).  If the number is suffixed with K, M, or G, then

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines