Some tidying up.

Tom


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

4 files changed, 32 insertions, 74 deletions

diff --git a/src/main/CactusDefaultInitialise.c b/src/main/CactusDefaultInitialise.c
index 9f72c10e..42bad96a 100644
--- a/src/main/CactusDefaultInitialise.c
+++ b/src/main/CactusDefaultInitialise.c
@@ -19,6 +19,20 @@
 static char *rcsid = "$Id$";
 
 
+ /*@@
+   @routine    CactusDefaultInitialise
+   @date       Tue Sep 29 12:45:04 1998
+   @author     Tom Goodale
+   @desc 
+   Default initialisation routine.
+   @enddesc 
+   @calls     
+   @calledby   
+   @history 
+ 
+   @endhistory 
+
+@@*/
 int CactusDefaultInitialise(tFleshConfig *config)
 {
   cGH *GH;
@@ -44,6 +58,21 @@ int CactusDefaultInitialise(tFleshConfig *config)
 }
 
 
+
+ /*@@
+   @routine    CactusDefaultShutdown
+   @date       Tue Sep 29 12:45:04 1998
+   @author     Tom Goodale
+   @desc 
+   DEfault shutdown routine.
+   @enddesc 
+   @calls     
+   @calledby   
+   @history 
+ 
+   @endhistory 
+
+@@*/
 int CactusDefaultShutdown(tFleshConfig *config)
 {
   printf("I'm in the default shutdown routine\n");
diff --git a/src/main/CreateGroup.c b/src/main/CreateGroup.c
index ec5a09c2..8157505c 100644
--- a/src/main/CreateGroup.c
+++ b/src/main/CreateGroup.c
@@ -13,8 +13,8 @@
 #include <stdarg.h>
 
 #include "flesh.h"
+#include "Misc.h"
 
-int CCTK_ExtractImplementation(char **imp, char **name, const char *parameter);
 cGroupDefinition *CCTK_SetupGroup(const char *implementation, const char *group_name, int n_variables);
 
 
@@ -53,7 +53,7 @@ int CCTK_CreateGroup(const char *fullname,
   int variable;
 
   /* Find the name of the implementation and of the group. */
-  CCTK_ExtractImplementation(&implementation, &group_name, fullname);
+  CCTK_SplitString(&implementation, &group_name, fullname, "::");
 
   if(implementation)
   {
diff --git a/src/main/ProcessParameterDatabase.c b/src/main/ProcessParameterDatabase.c
index b78ea55e..d4ace7b4 100644
--- a/src/main/ProcessParameterDatabase.c
+++ b/src/main/ProcessParameterDatabase.c
@@ -38,8 +38,6 @@ int ProcessParameterDatabase(tFleshConfig *ConfigData)
   int retval;
   FILE *parameter_file;
 
-  CCTK_InitialiseParameters(ConfigData);
-
   if((parameter_file = fopen(ConfigData->parameter_file_name, "r")))
   {
     ParseFile(parameter_file, CCTK_SetParameter);
@@ -56,7 +54,3 @@ int ProcessParameterDatabase(tFleshConfig *ConfigData)
   return 0;
 }
 
-int CCTK_InitialiseParameters(tFleshConfig *ConfigData)
-{
-  return 1;
-}
diff --git a/src/main/SetParams.c b/src/main/SetParams.c
index cce1c646..e1eb3d91 100644
--- a/src/main/SetParams.c
+++ b/src/main/SetParams.c
@@ -8,11 +8,6 @@
  @@*/
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "flesh.h"
-#include "Implementations.h"
 
 static char *rcsid = "$Id$";
 
@@ -37,7 +32,7 @@ int CCTK_SetParameter(const char *parameter, const char *value)
   retval = CCTK_BindingsParameterSet(parameter, value);
 
 
-  if(!retval)
+  if(retval)
   {
     fprintf(stderr, "Unknown parameter %s\n", parameter);
   }
@@ -45,63 +40,3 @@ int CCTK_SetParameter(const char *parameter, const char *value)
   return retval;
 }
 
- /*@@
-   @routine    CCTK_ExtractImplementation
-   @date       Wed Jan 13 11:23:37 1999
-   @author     Tom Goodale
-   @desc 
-   Takes a parameter name of the form imp::name and splits it.
-   @enddesc 
-   @calls     
-   @calledby   
-   @history 
- 
-   @endhistory 
-
-@@*/
-int CCTK_ExtractImplementation(char **imp, char **name, const char *parameter)
-{
-  int retval;
-  char *position;
-
-  /* Find location of the seperator */
-  position = strstr(parameter, "::");
-
-  if(position)
-  {
-    /*Allocate memory for return strings. */
-    *imp  = (char *)malloc((position-parameter+1)*sizeof(char));
-    *name = (char *)malloc((strlen(parameter)-(position-parameter)-2+1)*sizeof(char));
-
-    /* Check that the allocation succeeded. */
-    if(!*imp || !*name)
-    {
-      free(*imp);
-      *imp = NULL;
-      free(*name);
-      *name = NULL;
-      retval = 2;
-    }
-  }
-  else
-  {
-    *imp = NULL;
-    *name = NULL;
-    retval = 1;
-  }
-
-  if(position && imp && name)
-  {
-    /* Copy the data */
-    strncpy(*imp, parameter, (int)(position-parameter));
-    (*imp)[(int)(position-parameter)] = '\0';
-  
-    strncpy(*name, position+2, strlen(parameter)-(int)(position-parameter)-2);
-    (*name)[strlen(parameter)-(position-parameter)-2] = '\0';
-    
-    retval = 0;
-  }
-
-  return retval;
-}
-