From 9656c09545501df6f2294a12cfeaaf07011139be Mon Sep 17 00:00:00 2001
From: eschnett <eschnett@17b73243-c579-4c4c-a9d2-2d5706c11dac>
Date: Thu, 25 Oct 2012 19:43:35 +0000
Subject: Use CCTKi prefix for ExitIfParamCheckOnly

git-svn-id: http://svn.cactuscode.org/flesh/trunk@4894 17b73243-c579-4c4c-a9d2-2d5706c11dac
---
 src/main/Parameters.c         |  2 +-
 src/main/ProcessCommandLine.c |  2 +-
 src/main/WarnLevel.c          | 10 ++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/main')

diff --git a/src/main/Parameters.c b/src/main/Parameters.c
index 48467434..fcb4e7c0 100644
--- a/src/main/Parameters.c
+++ b/src/main/Parameters.c
@@ -2229,7 +2229,7 @@ static int ParameterSetInteger (t_param *param, const char *value)
       }
       else if(fabs(round(val.value.rval) - val.value.rval) < 1e-12) /* enforce integer result */
       {
-        inval = (int)round(val.value.rval);
+        inval = (int)rint(round(val.value.rval));
       }
       else
       {
diff --git a/src/main/ProcessCommandLine.c b/src/main/ProcessCommandLine.c
index 46301f15..47ee66ce 100644
--- a/src/main/ProcessCommandLine.c
+++ b/src/main/ProcessCommandLine.c
@@ -340,7 +340,7 @@ void CCTK_FCALL CCTK_FNAME(CCTK_ParameterFilename)
   *retval = CCTK_ParameterFilename(*len,name);
 }
 
-int CCTK_ExitAfterParamCheck()
+int CCTKi_ExitAfterParamCheck()
 {
     return exit_after_param_check;
 }
diff --git a/src/main/WarnLevel.c b/src/main/WarnLevel.c
index a1d6c283..9e1cd221 100644
--- a/src/main/WarnLevel.c
+++ b/src/main/WarnLevel.c
@@ -30,6 +30,7 @@
 # endif
 #endif
 
+#include "CommandLine.h"
 #include "StoreKeyedData.h"
 
 #include "cctk_Comm.h"
@@ -138,6 +139,8 @@ static void CCTKi_WarnCallbacksCall(int level,
 
 static void CCTKi_InfoCallbacksCall(const char *thorn, const char *message);
 
+static void CCTKi_ExitIfParamCheckOnly(void);
+
 /********************************************************************
  *********************    Static Data   *****************************
  ********************************************************************/
@@ -1137,7 +1140,6 @@ int CCTKi_SetErrorLevel (int level)
 }
 
 
-int CCTK_ExitAfterParamCheck (void);
  /*@@
    @routine    ExitIfParamCheckOnly
    @date       Mon May 16 2012
@@ -1147,9 +1149,9 @@ int CCTK_ExitAfterParamCheck (void);
    @enddesc
 
 @@*/
-void CCTK_ExitIfParamCheckOnly (void)
+static void CCTKi_ExitIfParamCheckOnly(void)
 {
-    if(CCTK_ExitAfterParamCheck()) {
+    if(CCTKi_ExitAfterParamCheck()) {
         printf("Exit after param check requested using the --exit-after-param-check option.\n");
         CCTK_Exit(NULL, 0);
     }
@@ -1210,7 +1212,7 @@ void CCTKi_FinaliseParamWarn (void)
       }
     }
   }
-  CCTK_ExitIfParamCheckOnly();
+  CCTKi_ExitIfParamCheckOnly();
 }
 
 
-- 
cgit v1.2.3