Function renamings:

ParameterGet       -> CCTK_ParameterGet
ParameterValString -> CCTK_ParameterValString


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

3 files changed, 18 insertions, 17 deletions

diff --git a/src/include/cctk_ParameterFunctions.h b/src/include/cctk_ParameterFunctions.h
index 2ecbfbb0..cf4e547e 100644
--- a/src/include/cctk_ParameterFunctions.h
+++ b/src/include/cctk_ParameterFunctions.h
@@ -103,20 +103,21 @@ int CCTK_ParameterSet (
                        const char *value);      /* The value of the parameter */
 
 /* get the data pointer to and type of a parameter's value */
-void *ParameterGet (
-                    const char *name,        /* The name of the parameter  */
-                    const char *thorn,       /* The originating thorn      */
-                    int *type);              /* Holds type of parameter    */
+void *CCTK_ParameterGet (
+                    const char *name,           /* The name of the parameter  */
+                    const char *thorn,          /* The originating thorn      */
+                    int *type);                 /* Holds type of parameter    */
 
 /* get the string representation of a parameter's value
    (string should be freed afterwards) */
-char *ParameterValString (const char *name,  /* The name of the parameter  */
-                          const char *thorn);      /* The originating thorn      */
+char *CCTK_ParameterValString (
+                 const char *name,              /* The name of the parameter  */
+                 const char *thorn);            /* The originating thorn      */
 
 /* walk through list of parameters */
 const char *CCTK_ParameterWalk(
-                               int first,               /* Get first parameter or not */
-                               const char *origin);     /* The origin of this walk    */
+                 int first,                     /* Get first parameter or not */
+                 const char *origin);           /* The origin of this walk    */
 
 /* get list of parameter names for given thorn */
 int CCTK_ParameterList (const char* thorn, char ***paramlist, int *n_param);
diff --git a/src/main/Groups.c b/src/main/Groups.c
index 7995e401..efec21d6 100644
--- a/src/main/Groups.c
+++ b/src/main/Groups.c
@@ -1563,7 +1563,7 @@ static CCTK_INT **CCTKi_ExtractSize(int dimension, const char *thorn, const char
             strcpy(tmp, last_comma);
           }
 
-          size_array[i] = (CCTK_INT *)ParameterGet(tmp, thorn, &type);
+          size_array[i] = (CCTK_INT *)CCTK_ParameterGet(tmp, thorn, &type);
         }
       }
     }
diff --git a/src/main/Parameters.c b/src/main/Parameters.c
index 9980d8de..d73f4602 100644
--- a/src/main/Parameters.c
+++ b/src/main/Parameters.c
@@ -520,7 +520,7 @@ int ParameterPrintDescription(const char *name,
 }
 
 /*@@
-   @routine    ParameterGet
+   @routine    CCTK_ParameterGet
    @date       Tue Jun 29 10:28:20 1999
    @author     Tom Goodale
    @desc 
@@ -567,9 +567,9 @@ int ParameterPrintDescription(const char *name,
    @endreturndesc
 
 @@*/
-void *ParameterGet(const char *name,
-                   const char *thorn,
-                   int *type)
+void *CCTK_ParameterGet(const char *name,
+                        const char *thorn,
+                        int *type)
 {
   void *retval;
   t_param *param;
@@ -592,7 +592,7 @@ void *ParameterGet(const char *name,
 }
 
 /*@@
-   @routine    ParameterValString
+   @routine    CCTK_ParameterValString
    @date       Thu Jan 21 2000
    @author     Thomas Radke
    @desc 
@@ -620,15 +620,15 @@ void *ParameterGet(const char *name,
    @endreturndesc
 
 @@*/
-char *ParameterValString (const char *param_name,
-                          const char *thorn)
+char *CCTK_ParameterValString (const char *param_name,
+                               const char *thorn)
 {
   int param_type;
   void *param_data;
   char *retval = NULL;
   char buffer [80];
 
-  param_data = ParameterGet (param_name, thorn, &param_type);
+  param_data = CCTK_ParameterGet (param_name, thorn, &param_type);
   if (param_data == NULL) return (NULL);
 
   switch (param_type)