From 2ee2983465623ada68c2280603b9426cb7b75d1f Mon Sep 17 00:00:00 2001 From: eschnett Date: Fri, 21 Jan 2011 01:45:12 +0000 Subject: Correct function signatures git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGH/PUGH/trunk@505 b61c5cb5-eaca-4651-9a7a-d64986f99364 --- src/GHExtension.c | 10 ++++------ src/PughUtils.c | 12 ++++++------ src/SetupPGH.c | 3 +-- src/include/pugh.h | 2 +- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/GHExtension.c b/src/GHExtension.c index 4a3a9d6..8828930 100644 --- a/src/GHExtension.c +++ b/src/GHExtension.c @@ -27,7 +27,7 @@ CCTK_FILEVERSION(CactusPUGH_pugh_GHExtension_c); /* prototypes of routines defined in this source file */ -int PUGH_PrintTimingInfo (const cGH *GH); +void PUGH_PrintTimingInfo (CCTK_ARGUMENTS); void PUGH_RegisterCallFunc (int (* func) (void *function, cFunctionData *fdata, void *data)); @@ -515,16 +515,16 @@ void PUGH_RegisterCallFunc (int (* func) (void *function, always returns 0 @endreturndesc @@*/ -int PUGH_PrintTimingInfo (const cGH *GH) +void PUGH_PrintTimingInfo (CCTK_ARGUMENTS) { int i; cTimerData *info; - const pGH *pughGH = PUGH_pGH (GH); + const pGH *pughGH = PUGH_pGH (cctkGH); if (pughGH->comm_time < 0) { - return 0; + return; } info = CCTK_TimerCreateData (); @@ -564,6 +564,4 @@ int PUGH_PrintTimingInfo (const cGH *GH) CCTK_WARN (1, "Couldn't create timer info structure ! " "No timing output available."); } - - return (0); } diff --git a/src/PughUtils.c b/src/PughUtils.c index 1c9eabf..621cc48 100644 --- a/src/PughUtils.c +++ b/src/PughUtils.c @@ -35,10 +35,10 @@ CCTK_FILEVERSION(CactusPUGH_PUGH_PughUtils_c); ******************** External Routines ************************ ********************************************************************/ int PUGH_QueryGroupStorage (const cGH *GH, int group, const char *groupname); -void PUGH_Report(const cGH *GH); -void PUGH_PrintStorageReport (const cGH *GH); +void PUGH_Report(cGH *GH); +void PUGH_PrintStorageReport (cGH *GH); void PUGHi_PrintStorageReport (void); -void PUGH_PrintFinalStorageReport (const cGH *GH); +void PUGH_PrintFinalStorageReport (cGH *GH); void PUGH_PrintStorage(const cGH *GH); void CCTK_FCALL CCTK_FNAME (PUGH_PrintStorage) (const cGH **GH); @@ -75,7 +75,7 @@ const int *PUGH_Topology (const cGH *GH, int dim) Report on PUGH set up @enddesc @@*/ -void PUGH_Report (const cGH *GH) +void PUGH_Report (cGH *GH) { pGH *pughGH; int i,gi,dim; @@ -295,7 +295,7 @@ MPI_Datatype PUGH_MPIDataType (const pGH *pughGH, int cctk_type) Print a report about the use of storage @enddesc @@*/ -void PUGH_PrintStorageReport (const cGH *GH) +void PUGH_PrintStorageReport (cGH *GH) { DECLARE_CCTK_PARAMETERS @@ -316,7 +316,7 @@ void PUGH_PrintStorageReport (const cGH *GH) Print a report about the use of storage @enddesc @@*/ -void PUGH_PrintFinalStorageReport (const cGH *GH) +void PUGH_PrintFinalStorageReport (cGH *GH) { GH = GH; PUGHi_PrintStorageReport (); diff --git a/src/SetupPGH.c b/src/SetupPGH.c index 2a1198d..cbccf71 100644 --- a/src/SetupPGH.c +++ b/src/SetupPGH.c @@ -227,13 +227,12 @@ pGH *PUGH_SetupPGH (void *callerid, 0 for success @endreturndesc @@*/ -int PUGH_Terminate (cGH *GH) +void PUGH_Terminate (cGH *GH) { pGH *pughGH = PUGH_pGH (GH); PUGH_DestroyPGH (&pughGH); - return (0); } diff --git a/src/include/pugh.h b/src/include/pugh.h index 16bdd70..4ca23f0 100644 --- a/src/include/pugh.h +++ b/src/include/pugh.h @@ -162,7 +162,7 @@ void PUGH_InitializeMemory (const char *do_initialize_memory, int bytes, void *data); -int PUGH_Terminate (cGH *GH); +void PUGH_Terminate (cGH *GH); int PUGH_ParallelInit(cGH *GH); -- cgit v1.2.3