From 81fbca3d13187a4bf2348a0774e9b9067739357b Mon Sep 17 00:00:00 2001 From: lanfer Date: Thu, 15 Jul 1999 12:36:15 +0000 Subject: fixing Slicing registration git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinBase/CoordGauge/trunk@3 edbb7e70-9571-45d5-a481-0a560a9b4751 --- src/Slicing.c | 14 +++++++------- src/Slicing.h | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Slicing.c b/src/Slicing.c index 5856dd3..4d41b55 100644 --- a/src/Slicing.c +++ b/src/Slicing.c @@ -31,7 +31,7 @@ static char *rcsid = "$Id$"; /* Local data holding info on slicings..*/ static int num_slics = 0; -static cHandleData *Eslicings = NULL; +static cHandledData *Eslicings = NULL; /*@@ @routine Einstein_RegisterSlicing @@ -50,14 +50,14 @@ static cHandleData *Eslicings = NULL; @@*/ -int Einstein_RegisterSlicing(const char slice_name) +int Einstein_RegisterSlicing(const char *slice_name) { int handle; struct Einstein_slicing *new_slicing; /*Check that this Slicing has not been registered, yet */ - handle = Einstein_GetSlicing(slic_name); + handle = Einstein_GetSlicing(slice_name); if (handle<0) { @@ -72,7 +72,7 @@ int Einstein_RegisterSlicing(const char slice_name) /*Initialize the Einstein_slicing structure */ /* we know the slicing name */ - new_slicing->name = (char *)name; + new_slicing->name = (char *)slice_name; /* Function pointer , evaluates if to perform this slicings, allowing for iteration checks, gridfucntion behavior, etc. Will be set by @@ -119,7 +119,7 @@ int Einstein_SetSliceActive(int handle, int flag) int return_code; struct Einstein_slicing *slicing; - slicing = CCTK_GetHandledData(Einstein_slicing, handle); + slicing = CCTK_GetHandledData(Eslicings, handle); if (slicing) { slicing->param_active = flag; @@ -152,12 +152,12 @@ int Einstein_SetSliceActive(int handle, int flag) @@*/ -int Einstein_RegisterTimeToSlice(int handle, void *(*func)(tFleshConfig *, int , cGH)) +int Einstein_RegisterTimeToSlice(int handle, void (*func)(cGH *)) { int return_code; struct Einstein_slicing *slicing; - slicing = CCTK_GetHandledData(Einstein_slicing, handle); + slicing = CCTK_GetHandledData(Eslicings, handle); if (slicing) { slicing->timetoslice=func; diff --git a/src/Slicing.h b/src/Slicing.h index 174e3d6..d7031db 100644 --- a/src/Slicing.h +++ b/src/Slicing.h @@ -15,21 +15,21 @@ extern "C" { struct Einstein_slicing { - char * name; - int param_active; - void *(*func) timetoslice; + char *name; + int param_active; + void (*timetoslice)(cGH*); }; -int Einstein_RegsiterSlicing(const char *name); +int Einstein_RegisterSlicing(const char *name); int Einstein_SetSliceActive(int handle,int flag); -int Einstein_RegisterTimeToSlice(int handle, void *(*func)(tfleshConfig *, int, cGH)); +int Einstein_RegisterTimeToSlice(int handle,void (*func)(cGH *)); #ifdef __cplusplus } #endif -#endif + -- cgit v1.2.3