Correct function prototypes: Functions in the startup bin must return

int, not void.  Functions in other bins must return void, not int.
None of the function can return an error code.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/CartGrid3D/trunk@234 c78560ca-4b45-4335-b268-5f3340f3cb52

1 files changed, 8 insertions, 23 deletions

diff --git a/src/Startup.c b/src/Startup.c
index 39dfacb..bbb6753 100644
--- a/src/Startup.c
+++ b/src/Startup.c
@@ -26,8 +26,8 @@ CCTK_FILEVERSION(CactusBase_CartGrid3D_Startup_c);
 /********************************************************************
  ********************    External Prototypes   **********************
  ********************************************************************/
-void SymmetryStartup (void);
-int RegisterCartGrid3DCoords (CCTK_ARGUMENTS);
+int SymmetryStartup (void);
+void RegisterCartGrid3DCoords (CCTK_ARGUMENTS);
 
 /********************************************************************
  ********************    Internal Prototypes   **********************
@@ -52,10 +52,11 @@ static void *SetupGH (tFleshConfig *config, int convlevel, cGH *GH);
 
    @returntype void
 @@*/
-void SymmetryStartup (void)
+int SymmetryStartup (void)
 {
   CCTK_RegisterGHExtensionSetupGH (CCTK_RegisterGHExtension ("Symmetry"),
                                    SetupGH);
+  return 0;
 }
 
 
@@ -76,14 +77,12 @@ void SymmetryStartup (void)
                0 for success, or negative in case of errors
    @endreturndesc
 @@*/
-int RegisterCartGrid3DCoords (CCTK_ARGUMENTS)
+void RegisterCartGrid3DCoords (CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
 
-  int ierr, coord_system_handle, retval;
-
-  retval = 0;
+  int ierr, coord_system_handle;
 
   /* Register coordinate systems */
   ierr =   Coord_SystemRegister(cctkGH, 3, "cart3d");
@@ -92,7 +91,6 @@ int RegisterCartGrid3DCoords (CCTK_ARGUMENTS)
   if (ierr < 0)
   {
     CCTK_WARN(0, "Error registering cartnd coordinate systems");
-    retval = ierr;
   }
   else
   {
@@ -110,7 +108,6 @@ int RegisterCartGrid3DCoords (CCTK_ARGUMENTS)
     if (ierr < 0)
     {
       CCTK_WARN(0, "Error registering cart3d coordinates");
-      retval += ierr;
     }
 
     /* Fill out rest of coordinate system table for cart3d */
@@ -118,7 +115,6 @@ int RegisterCartGrid3DCoords (CCTK_ARGUMENTS)
     if (ierr < 0)
     {
       CCTK_WARN(1, "Error registering cart3d type");
-      retval += ierr;
     }    
 
     /* Register coordinates for cart2d */
@@ -133,7 +129,6 @@ int RegisterCartGrid3DCoords (CCTK_ARGUMENTS)
     if (ierr < 0)
     {
       CCTK_WARN(0, "Error registering cart2d coordinates");
-      retval += ierr;
     }
 
     /* Fill out rest of coordinate system table for cart2d */
@@ -141,7 +136,6 @@ int RegisterCartGrid3DCoords (CCTK_ARGUMENTS)
     if (ierr < 0)
     {
       CCTK_WARN(1, "Error registering cart2d type");
-      retval += ierr;
     }    
 
     /* Register coordinate for cart1d */
@@ -155,7 +149,6 @@ int RegisterCartGrid3DCoords (CCTK_ARGUMENTS)
     if (ierr < 0)
     {
       CCTK_WARN(0, "Error registering cart1d coordinate");
-      retval += ierr;
     }
 
     /* Fill out rest of coordinate system table for cart1d */
@@ -163,7 +156,6 @@ int RegisterCartGrid3DCoords (CCTK_ARGUMENTS)
     if (ierr < 0)
     {
       CCTK_WARN(1, "Error registering cart1d type");
-      retval += ierr;
     }
 
     /* Register cartnd as the default coordinate systems */
@@ -175,37 +167,30 @@ int RegisterCartGrid3DCoords (CCTK_ARGUMENTS)
       if (ierr < 0)
       {
         CCTK_WARN(1, "Error registering cartnd as default coordinate systems");
-        retval += ierr;
       }
     }
   }
 
   /* Register coordinates under the old API */
-  retval += CCTK_CoordRegisterSystem(3,"cart3d");
-  retval += CCTK_CoordRegisterSystem(3,"spher3d");
+  CCTK_CoordRegisterSystem(3,"cart3d");
+  CCTK_CoordRegisterSystem(3,"spher3d");
 
   if (CCTK_CoordRegisterData (1, "grid::x", "x", "cart3d") < 0)
   {
     CCTK_WARN (1, "Problem with registering coordinate x");
-    retval--;
   }
   if (CCTK_CoordRegisterData (2, "grid::y", "y", "cart3d") < 0)
   {
     CCTK_WARN (1, "Problem with registering coordinate y");
-    retval--;
   }
   if (CCTK_CoordRegisterData (3, "grid::z", "z", "cart3d") < 0)
   {
     CCTK_WARN (1, "Problem with registering coordinate z");
-    retval--;
   }
   if (CCTK_CoordRegisterData (1, "grid::r", "r", "spher3d") < 0)
   {
     CCTK_WARN (1, "Problem with registering coordinate r");
-    retval--;
   }
-
-  return retval;
 }