Changed names for some functions which should just be internal

git-svn-id: http://svn.cactuscode.org/flesh/trunk@761 17b73243-c579-4c4c-a9d2-2d5706c11dac

4 files changed, 21 insertions, 32 deletions

diff --git a/src/include/WarnLevel.h b/src/include/WarnLevel.h
index 12108aa1..d8e6c822 100644
--- a/src/include/WarnLevel.h
+++ b/src/include/WarnLevel.h
@@ -14,11 +14,11 @@
 extern "C" {
 #endif
 
-int CCTK_SetWarnLevel(int level);
-int CCTK_Warn(int level, int line, const char *file, const char *thorn, const char *message);
+int CCTKi_SetWarnLevel(int level);
+void CCTK_Warn(int level, int line, const char *file, const char *thorn, const char *message);
 void CCTK_ParamWarn(const char *thorn, const char *message);
 void CCTKi_FinaliseParamWarn(void);
-int CCTK_SetErrorLevel(int level);
+int CCTKi_SetErrorLevel(int level);
 void CCTK_Info(const char *thorn, const char *message);
  
 #ifdef __cplusplus 
diff --git a/src/main/CommandLine.c b/src/main/CommandLine.c
index 7ec9341f..f3b27cfa 100644
--- a/src/main/CommandLine.c
+++ b/src/main/CommandLine.c
@@ -109,7 +109,7 @@ void CCTK_CommandLineWarningLevel(const char *optarg)
 
   warninglevel = atoi(optarg);
 
-  CCTK_SetWarnLevel(warninglevel);
+  CCTKi_SetWarnLevel(warninglevel);
 
 }
 
@@ -133,7 +133,7 @@ void CCTK_CommandLineErrorLevel(const char *optarg)
 
   errorlevel = atoi(optarg);
 
-  CCTK_SetErrorLevel(errorlevel);
+  CCTKi_SetErrorLevel(errorlevel);
 
 }
 
diff --git a/src/main/Groups.c b/src/main/Groups.c
index 70edbe17..ce31ca36 100644
--- a/src/main/Groups.c
+++ b/src/main/Groups.c
@@ -42,7 +42,7 @@ static int maxdim = 0;
 int _cctk_one = 1;
 
 
-cGroupDefinition *CCTK_SetupGroup(const char *implementation, const char *group_name, int n_variables);
+cGroupDefinition *CCTKi_SetupGroup(const char *implementation, const char *group_name, int n_variables);
 
 
 
@@ -122,7 +122,7 @@ int CCTK_GroupIndex(const char *fullgroupname)
 
 
  /*@@
-   @routine    CCTK_CreateGroup
+   @routine    CCTKi_CreateGroup
    @date       Thu Jan 14 15:25:54 1999
    @author     Tom Goodale
    @desc 
@@ -135,7 +135,7 @@ int CCTK_GroupIndex(const char *fullgroupname)
    @endhistory 
 
 @@*/
-int CCTK_CreateGroup(const char *gname, const char *thorn, const char *imp,
+int CCTKi_CreateGroup(const char *gname, const char *thorn, const char *imp,
 		     const char *gtype,
 		     const char *vtype,
 		     const char *gscope,
@@ -159,15 +159,15 @@ int CCTK_CreateGroup(const char *gname, const char *thorn, const char *imp,
   groupscope = CCTK_GroupScopeNumber(gscope);
   if (groupscope == GROUP_PUBLIC || groupscope == GROUP_PROTECTED)
   {
-    group = CCTK_SetupGroup(imp, gname, n_variables);
+    group = CCTKi_SetupGroup(imp, gname, n_variables);
   }
   else if (groupscope == GROUP_PRIVATE)
   {
-    group = CCTK_SetupGroup(thorn, gname, n_variables);
+    group = CCTKi_SetupGroup(thorn, gname, n_variables);
   }
   else
   {
-    CCTK_WARN(1,"Unrecognised group scope in CCTK_CreateGroup");
+    CCTK_WARN(1,"Unrecognised group scope in CCTKi_CreateGroup");
   }
 
   /* Allocate storage for the group and setup some stuff. */
@@ -217,7 +217,7 @@ int CCTK_CreateGroup(const char *gname, const char *thorn, const char *imp,
 
   if(retval)
   {
-    fprintf(stderr, "Error %d in CCTK_CreateGroup\n", retval);
+    fprintf(stderr, "Error %d in CCTKi_CreateGroup\n", retval);
   }
 
 #ifdef DEBUG_GROUPS
@@ -233,7 +233,7 @@ int CCTK_CreateGroup(const char *gname, const char *thorn, const char *imp,
 }
 
  /*@@
-   @routine    CCTK_SetupGroup
+   @routine    CCTKi_SetupGroup
    @date       Thu Jan 14 16:38:40 1999
    @author     Tom Goodale
    @desc 
@@ -246,7 +246,7 @@ int CCTK_CreateGroup(const char *gname, const char *thorn, const char *imp,
    @endhistory 
 
 @@*/
-cGroupDefinition *CCTK_SetupGroup(const char *implementation, 
+cGroupDefinition *CCTKi_SetupGroup(const char *implementation, 
 				  const char *name, 
 				  int n_variables)
 {
diff --git a/src/main/WarnLevel.c b/src/main/WarnLevel.c
index 68f7a326..16d52f96 100644
--- a/src/main/WarnLevel.c
+++ b/src/main/WarnLevel.c
@@ -38,7 +38,7 @@ static int warning_level = 1;
 static int error_level    = 0;
 
  /*@@
-   @routine    CCTK_SetWarnLevel
+   @routine    CCTKi_SetWarnLevel
    @date       Wed Feb 17 00:42:16 1999
    @author     Tom Goodale
    @desc 
@@ -51,7 +51,7 @@ static int error_level    = 0;
    @endhistory 
 
 @@*/
-int CCTK_SetWarnLevel(int level)
+int CCTKi_SetWarnLevel(int level)
 {
   int retval;
   int old_level;
@@ -104,13 +104,11 @@ int CCTK_SetWarnLevel(int level)
    @endhistory 
 
 @@*/
-int CCTK_Warn(int level, int line, const char *file, const char *thorn, const char *message)
+void CCTK_Warn(int level, int line, const char *file, const char *thorn, const char *message)
 {
 
   DECLARE_CCTK_PARAMETERS
 
-  int retval;
-
   if(level <= warning_level)
   {
     if (cctk_full_warnings)
@@ -118,37 +116,28 @@ int CCTK_Warn(int level, int line, const char *file, const char *thorn, const ch
       fprintf(stderr, "WARNING level %d in thorn %s (line %d of %s): \n", level, thorn, line, file);
       fprintf(stderr, "  -> %s\n",message);
       fflush(stderr);
-      retval = 1;
     }
     else
     {
       fprintf(stderr, "WARNING (%s): %s\n", thorn, message);
       fflush(stderr);
-      retval = 1;
     }
   }
-  else
-  {
-    retval = 0;
-  }
 
   if(level <= error_level)
   {
     exit(99);
   }
 
-  return retval;
 }
 
-int FMODIFIER FORTRAN_NAME(CCTK_Warn)(int *level, int *line, THREE_FORTSTRINGS_ARGS)
+void FMODIFIER FORTRAN_NAME(CCTK_Warn)(int *level, int *line, THREE_FORTSTRINGS_ARGS)
 {
   THREE_FORTSTRINGS_CREATE(file,thorn,message)
-  int retval;
-  retval = CCTK_Warn(*level,*line,file,thorn,message);
+  CCTK_Warn(*level,*line,file,thorn,message);
   free(thorn);
   free(message); 
   free(file);
-  return(retval);
 }
 
  /*@@
@@ -224,7 +213,7 @@ int FMODIFIER FORTRAN_NAME(CCTK_Info)(TWO_FORTSTRINGS_ARGS)
 
 
  /*@@
-   @routine    CCTK_SetErrorLevel
+   @routine    CCTKi_SetErrorLevel
    @date       Wed Feb 17 00:48:02 1999
    @author     Tom Goodale
    @desc 
@@ -237,7 +226,7 @@ int FMODIFIER FORTRAN_NAME(CCTK_Info)(TWO_FORTSTRINGS_ARGS)
    @endhistory 
 
 @@*/
-int CCTK_SetErrorLevel(int level)
+int CCTKi_SetErrorLevel(int level)
 {
   int retval;
   int old_level;