Changeset 79290f for pcp/src/init.c

Timestamp:

Jun 7, 2008, 1:13:29 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

02bc3c

Parents:

a97897

Message:

config.h is included in each and every file. After trying to compile on JUMP (with xlc).

File:

• pcp/src/init.c (modified) (7 diffs)

pcp/src/init.c

@@ -22 +22 @@
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
@@ -28 +32 @@
 
 // use double precision fft when we have it
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef HAVE_DFFTW_H
 #include "dfftw.h"
@@ -1305 +1305 @@
  * \sa ReadMainParameterFile Calling routine
  */
-int ParseForParameter(int verbose, FILE *file, const char *const name, int sequential, int const xth, int const yth, enum value_type type, void *value, int repetition, enum necessity critical) {
+int ParseForParameter(int verbose, FILE *file, const char *const name, int sequential, int const xth, int const yth, enum value_type type, void *value, int repetition, enum necessity BreaksOrNot) {
         int i,j;        // loop variables
         int me, length, maxlength = -1;
@@ -1326 +1326 @@
                         fgets(dummy1, 256, file);       // Read the whole line
       if (feof(file)) {
-        if ((critical) && (found == 0)) {
+        if ((BreaksOrNot) && (found == 0)) {
           Free(free_dummy, "ParseForParameter: free_dummy");
           Error(InitReading, name);
@@ -1369 +1369 @@
                 } else dummy = dummy1;
                 // ... and check if it is the keyword!
-                if ((name == NULL) || ((dummy-dummy1 >= 3) && (strncmp(dummy1, name, strlen(name)) == 0) && (dummy-dummy1 == strlen(name)))) {
+                if ((name == NULL) || ((dummy-dummy1 >= 3) && (strncmp(dummy1, name, strlen(name)) == 0) && ((size_t)(dummy-dummy1) == strlen(name)))) {
                         found++; // found the parameter!
                         //fprintf(stderr,"(%i) found %s at line %i\n",me, name, line);          
@@ -1381 +1381 @@
                                                         fgets(dummy1, 256, file);       // Read the whole line, skip commentary and empty ones
               if (feof(file)) {
-                if ((critical) && (found == 0)) {
+                if ((BreaksOrNot) && (found == 0)) {
                   Free(free_dummy, "ParseForParameter: free_dummy");
                   Error(InitReading, name);
@@ -1435 +1435 @@
                                                                 dummy = strchr(dummy1, '\n');    // ... at line end then
                                                                 if ((i < xth-1) && (type < 4)) {        // check if xth value or not yet
-                  if (critical) {
+                  if (BreaksOrNot) {
                     if (verbose) fprintf(stderr,"(%i)Error: EoL or comment at %i and still missing %i value(s) for parameter %s\n", me, line, yth-j, name);
                     Free(free_dummy, "ParseForParameter: free_dummy");