Code cleanup before moving into producion mode.

You must also update BetaThorns/IOHDF5Util now.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IOHDF5/trunk@124 4825ed28-b72c-4eae-9704-e50c059e567d

1 files changed, 14 insertions, 18 deletions

diff --git a/src/RecoverGH.c b/src/RecoverGH.c
index a6854bf..e8c4b8d 100644
--- a/src/RecoverGH.c
+++ b/src/RecoverGH.c
@@ -39,10 +39,8 @@ int IOHDF5_RecoverParameters (void);
 /********************************************************************
  ********************    Internal Routines   ************************
  ********************************************************************/
-static int IOHDF5_OpenFile (cGH *GH,
-                            const char *basefilename,
-                            int called_from,
-                            fileinfo_t *fileinfo);
+static int OpenFile (cGH *GH, const char *basefilename, int called_from,
+                     fileinfo_t *fileinfo);
 
 
  /*@@
@@ -72,7 +70,7 @@ static int IOHDF5_OpenFile (cGH *GH,
    @vio        in
    @endvar
 
-   @calls      IOHDF5_OpenFile
+   @calls      OpenFile
                IOHDF5Util_RecoverParameters
                IOHDF5Util_RecoverVariables
                IOHDF5Util_RecoverGHextensions
@@ -114,7 +112,7 @@ int IOHDF5_Recover (cGH *GH, const char *basefilename, int called_from)
       called_from == FILEREADER_DATA ||
       (GH && (GH->cctk_levfac[0] > 1 || GH->cctk_convlevel > 0)))
   {
-    if (IOHDF5_OpenFile (GH, basefilename, called_from, &fileinfo) < 0)
+    if (OpenFile (GH, basefilename, called_from, &fileinfo) < 0)
     {
       return (-1);
     }
@@ -175,7 +173,7 @@ int IOHDF5_Recover (cGH *GH, const char *basefilename, int called_from)
                     fileinfo.filename);
       }
     }
-    IOHDF5_ERROR (H5Fclose (fileinfo.file));
+    HDF5_ERROR (H5Fclose (fileinfo.file));
 
     if (called_from == CP_RECOVER_DATA && recover_and_remove)
     {
@@ -250,11 +248,11 @@ int IOHDF5_RecoverParameters (void)
 }
 
 
-/**************************************************************************/
-/*                            local routines                              */
-/**************************************************************************/
+/********************************************************************
+ ********************    Internal Routines   ************************
+ ********************************************************************/
  /*@@
-   @routine    IOHDF5_OpenFile
+   @routine    OpenFile
    @date       Tue Oct 10 2000
    @author     Thomas Radke
    @desc
@@ -295,10 +293,8 @@ int IOHDF5_RecoverParameters (void)
                0 for success, -1 if file could not be opened
    @endreturndesc
 @@*/
-static int IOHDF5_OpenFile (cGH *GH,
-                            const char *basefilename,
-                            int called_from,
-                            fileinfo_t *fileinfo)
+static int OpenFile (cGH *GH, const char *basefilename, int called_from,
+                     fileinfo_t *fileinfo)
 {
   int nprocs, myproc;
   hid_t group, version_attr;
@@ -409,10 +405,10 @@ static int IOHDF5_OpenFile (cGH *GH,
       fileinfo->has_version = version_attr >= 0;
       if (version_attr >= 0)
       {
-        IOHDF5_ERROR (H5Aclose (version_attr));
+        HDF5_ERROR (H5Aclose (version_attr));
       }
 
-      IOHDF5_ERROR (H5Gclose (group));
+      HDF5_ERROR (H5Gclose (group));
 
       /* If we recover from multiple files the number of
        * writing processors must match the number of reading 
@@ -512,6 +508,6 @@ static int IOHDF5_OpenFile (cGH *GH,
   /* set the filename in the info structure */
   fileinfo->filename = strdup (filename);
 
-  /* Return 0 for success otherwise negative */
+  /* return 0 for success otherwise negative */
   return (fileinfo->is_HDF5_file ? 0 : -1);
 }