Fixed compiler warnings with non-const pointers.

This closes PR CactusBase 692.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/Boundary/trunk@146 6a38eb6e-646e-4a02-a296-d141613ad6c4

1 files changed, 81 insertions, 81 deletions

diff --git a/src/ScalarBoundary.c b/src/ScalarBoundary.c
index 815578c..776d0c7 100644
--- a/src/ScalarBoundary.c
+++ b/src/ScalarBoundary.c
@@ -35,63 +35,63 @@ CCTK_FILEVERSION(CactusBase_Boundary_ScalarBoundary_c)
    here only follow the fortran wrapper prototypes */
 void CCTK_FCALL CCTK_FNAME (BndScalarDirVI)
                            (int *ierr,
-                            cGH *GH,
+                            const cGH *GH,
                             const int *stencil_size,
                             const int *dir,
                             const CCTK_REAL *scalar,
                             const int *vi);
 void CCTK_FCALL CCTK_FNAME (BndScalarVI)
                            (int *ierr,
-                            cGH *GH,
-                            int stencil[],
+                            const cGH *GH,
+                            const int *stencil,
                             const CCTK_REAL *scalar,
                             const int *vi);
 void CCTK_FCALL CCTK_FNAME (BndScalarDirGI)
                            (int *ierr,
-                            cGH *GH,
+                            const cGH *GH,
                             const int *stencil_size,
                             const int *dir,
                             const CCTK_REAL *scalar,
                             const int *gi);
 void CCTK_FCALL CCTK_FNAME (BndScalarGI)
                            (int *ierr,
-                            cGH *GH,
-                            int stencil[],
+                            const cGH *GH,
+                            const int *stencil,
                             const CCTK_REAL *scalar,
                             const int *gi);
 void CCTK_FCALL CCTK_FNAME (BndScalarDirGN)
                            (int *ierr,
-                            cGH *GH,
+                            const cGH *GH,
                             const int *stencil_size,
                             const int *dir,
                             const CCTK_REAL *scalar,
                             ONE_FORTSTRING_ARG);
 void CCTK_FCALL CCTK_FNAME (BndScalarGN)
                            (int *ierr,
-                            cGH *GH,
-                            int stencil[],
+                            const cGH *GH,
+                            const int *stencil,
                             const CCTK_REAL *scalar,
                             ONE_FORTSTRING_ARG);
 void CCTK_FCALL CCTK_FNAME (BndScalarDirVN)
                            (int *ierr,
-                            cGH *GH,
+                            const cGH *GH,
                             const int *stencil_size,
                             const int *dir,
                             const CCTK_REAL *scalar,
                             ONE_FORTSTRING_ARG);
 void CCTK_FCALL CCTK_FNAME (BndScalarVN)
                            (int *ierr,
-                            cGH *GH,
-                            int stencil[],
+                            const cGH *GH,
+                            const int *stencil,
                             const CCTK_REAL *scalar,
                             ONE_FORTSTRING_ARG);
 
 /********************************************************************
  ********************    Internal Routines   ************************
  ********************************************************************/
-static int ApplyBndScalar (cGH *GH,
+static int ApplyBndScalar (const cGH *GH,
                            int stencil_dir,
-                           int stencil_alldirs[],
+                           const int *stencil_alldirs,
                            int dir,
                            CCTK_REAL scalar,
                            int first_var,
@@ -110,7 +110,7 @@ static int ApplyBndScalar (cGH *GH,
 
    @var        GH
    @vdesc      Pointer to CCTK grid hierarchy
-   @vtype      cGH *
+   @vtype      const cGH *
    @vio        in
    @endvar
    @var        stencil_size
@@ -140,7 +140,7 @@ static int ApplyBndScalar (cGH *GH,
                -1 if invalid variable index was given
    @endreturndesc
 @@*/
-int BndScalarDirVI (cGH *GH,
+int BndScalarDirVI (const cGH *GH,
                     int stencil_size,
                     int dir,
                     CCTK_REAL scalar,
@@ -165,7 +165,7 @@ int BndScalarDirVI (cGH *GH,
 
 void CCTK_FCALL CCTK_FNAME (BndScalarDirVI)
                            (int *ierr,
-                            cGH *GH,
+                            const cGH *GH,
                             const int *stencil_size,
                             const int *dir,
                             const CCTK_REAL *scalar,
@@ -186,7 +186,7 @@ void CCTK_FCALL CCTK_FNAME (BndScalarDirVI)
 
    @var        GH
    @vdesc      Pointer to CCTK grid hierarchy
-   @vtype      cGH *
+   @vtype      const cGH *
    @vio        in
    @endvar
    @var        stencil
@@ -211,8 +211,8 @@ void CCTK_FCALL CCTK_FNAME (BndScalarDirVI)
                -1 if invalid variable index was given
    @endreturndesc
 @@*/
-int BndScalarVI (cGH *GH,
-                 int stencil[],
+int BndScalarVI (const cGH *GH,
+                 const int *stencil,
                  CCTK_REAL scalar,
                  int vi)
 {
@@ -235,8 +235,8 @@ int BndScalarVI (cGH *GH,
 
 void CCTK_FCALL CCTK_FNAME (BndScalarVI)
                            (int *ierr,
-                            cGH *GH,
-                            int stencil[],
+                            const cGH *GH,
+                            const int *stencil,
                             const CCTK_REAL *scalar,
                             const int *vi)
 {
@@ -258,7 +258,7 @@ void CCTK_FCALL CCTK_FNAME (BndScalarVI)
 
    @var        GH
    @vdesc      Pointer to CCTK grid hierarchy
-   @vtype      cGH *
+   @vtype      const cGH *
    @vio        in
    @endvar
    @var        stencil_size
@@ -288,7 +288,7 @@ void CCTK_FCALL CCTK_FNAME (BndScalarVI)
                -1 if invalid group index was given
    @endreturndesc
 @@*/
-int BndScalarDirGI (cGH *GH,
+int BndScalarDirGI (const cGH *GH,
                     int stencil_size,
                     int dir,
                     CCTK_REAL scalar,
@@ -315,7 +315,7 @@ int BndScalarDirGI (cGH *GH,
 
 void CCTK_FCALL CCTK_FNAME (BndScalarDirGI)
                            (int *ierr,
-                            cGH *GH,
+                            const cGH *GH,
                             const int *stencil_size,
                             const int *dir,
                             const CCTK_REAL *scalar,
@@ -336,7 +336,7 @@ void CCTK_FCALL CCTK_FNAME (BndScalarDirGI)
 
    @var        GH
    @vdesc      Pointer to CCTK grid hierarchy
-   @vtype      cGH *
+   @vtype      const cGH *
    @vio        in
    @endvar
    @var        stencil
@@ -361,8 +361,8 @@ void CCTK_FCALL CCTK_FNAME (BndScalarDirGI)
                -1 if invalid group index was given
    @endreturndesc
 @@*/
-int BndScalarGI (cGH *GH,
-                 int stencil[],
+int BndScalarGI (const cGH *GH,
+                 const int *stencil,
                  CCTK_REAL scalar,
                  int gi)
 {
@@ -387,8 +387,8 @@ int BndScalarGI (cGH *GH,
 
 void CCTK_FCALL CCTK_FNAME (BndScalarGI)
                            (int *ierr,
-                            cGH *GH,
-                            int stencil[],
+                            const cGH *GH,
+                            const int *stencil,
                             const CCTK_REAL *scalar,
                             const int *gi)
 {
@@ -409,7 +409,7 @@ void CCTK_FCALL CCTK_FNAME (BndScalarGI)
 
    @var        GH
    @vdesc      Pointer to CCTK grid hierarchy
-   @vtype      cGH *
+   @vtype      const cGH *
    @vio        in
    @endvar
    @var        stencil_size
@@ -427,9 +427,9 @@ void CCTK_FCALL CCTK_FNAME (BndScalarGI)
    @vtype      CCTK_REAL
    @vio        in
    @endvar
-   @var        gn
+   @var        gname
    @vdesc      name of group to apply BC to
-   @vtype      char []
+   @vtype      const char *
    @vio        in
    @endvar
 
@@ -439,16 +439,16 @@ void CCTK_FCALL CCTK_FNAME (BndScalarGI)
                -1 if invalid group name was given
    @endreturndesc
 @@*/
-int BndScalarDirGN (cGH *GH,
+int BndScalarDirGN (const cGH *GH,
                     int stencil_size,
                     int dir,
                     CCTK_REAL scalar,
-                    char gn[])
+                    const char *gname)
 {
   int gi, retval;
 
 
-  gi = CCTK_GroupIndex (gn);
+  gi = CCTK_GroupIndex (gname);
   if (gi >= 0)
   {
     retval = BndScalarDirGI (GH, stencil_size, dir, gi, scalar);
@@ -456,7 +456,7 @@ int BndScalarDirGN (cGH *GH,
   else
   {
     CCTK_VWarn (2, __LINE__, __FILE__, CCTK_THORNSTRING,
-                "Invalid group name '%s' in BndScalarDirGN", gn);
+                "Invalid group name '%s' in BndScalarDirGN", gname);
     retval = -1;
   }
 
@@ -465,15 +465,15 @@ int BndScalarDirGN (cGH *GH,
 
 void CCTK_FCALL CCTK_FNAME (BndScalarDirGN)
                            (int *ierr,
-                            cGH *GH,
+                            const cGH *GH,
                             const int *stencil_size,
                             const int *dir,
                             const CCTK_REAL *scalar,
                             ONE_FORTSTRING_ARG)
 {
-  ONE_FORTSTRING_CREATE (gn)
-  *ierr = BndScalarDirGN (GH, *stencil_size, *dir, *scalar, gn);
-  free (gn);
+  ONE_FORTSTRING_CREATE (gname)
+  *ierr = BndScalarDirGN (GH, *stencil_size, *dir, *scalar, gname);
+  free (gname);
 }
 
 
@@ -488,7 +488,7 @@ void CCTK_FCALL CCTK_FNAME (BndScalarDirGN)
 
    @var        GH
    @vdesc      Pointer to CCTK grid hierarchy
-   @vtype      cGH *
+   @vtype      const cGH *
    @vio        in
    @endvar
    @var        stencil
@@ -501,9 +501,9 @@ void CCTK_FCALL CCTK_FNAME (BndScalarDirGN)
    @vtype      CCTK_REAL
    @vio        in
    @endvar
-   @var        gn
+   @var        gname
    @vdesc      name of group to apply BC to
-   @vtype      char []
+   @vtype      const char *
    @vio        in
    @endvar
 
@@ -513,15 +513,15 @@ void CCTK_FCALL CCTK_FNAME (BndScalarDirGN)
                -1 if invalid group name was given
    @endreturndesc
 @@*/
-int BndScalarGN (cGH *GH,
-                 int stencil[],
+int BndScalarGN (const cGH *GH,
+                 const int *stencil,
                  CCTK_REAL scalar,
-                 char gn[])
+                 const char *gname)
 {
   int gi, retval;
 
 
-  gi = CCTK_GroupIndex (gn);
+  gi = CCTK_GroupIndex (gname);
   if (gi >= 0)
   {
     retval = BndScalarGI (GH, stencil, scalar, gi);
@@ -529,7 +529,7 @@ int BndScalarGN (cGH *GH,
   else
   {
     CCTK_VWarn (2, __LINE__, __FILE__, CCTK_THORNSTRING,
-                "Invalid group name '%s' in BndScalarGN", gn);
+                "Invalid group name '%s' in BndScalarGN", gname);
     retval = -1;
   }
 
@@ -538,14 +538,14 @@ int BndScalarGN (cGH *GH,
 
 void CCTK_FCALL CCTK_FNAME (BndScalarGN)
                            (int *ierr,
-                            cGH *GH,
-                            int stencil[],
+                            const cGH *GH,
+                            const int *stencil,
                             const CCTK_REAL *scalar,
                             ONE_FORTSTRING_ARG)
 {
-  ONE_FORTSTRING_CREATE (gn)
-  *ierr = BndScalarGN (GH, stencil, *scalar, gn);
-  free (gn);
+  ONE_FORTSTRING_CREATE (gname)
+  *ierr = BndScalarGN (GH, stencil, *scalar, gname);
+  free (gname);
 }
 
 
@@ -560,7 +560,7 @@ void CCTK_FCALL CCTK_FNAME (BndScalarGN)
 
    @var        GH
    @vdesc      Pointer to CCTK grid hierarchy
-   @vtype      cGH *
+   @vtype      const cGH *
    @vio        in
    @endvar
    @var        stencil_size
@@ -578,9 +578,9 @@ void CCTK_FCALL CCTK_FNAME (BndScalarGN)
    @vtype      CCTK_REAL
    @vio        in
    @endvar
-   @var        vn
+   @var        vname
    @vdesc      name of variable to apply BC to
-   @vtype      char []
+   @vtype      const char *
    @vio        in
    @endvar
 
@@ -590,16 +590,16 @@ void CCTK_FCALL CCTK_FNAME (BndScalarGN)
                -1 if invalid variable name was given
    @endreturndesc
 @@*/
-int BndScalarDirVN (cGH *GH,
+int BndScalarDirVN (const cGH *GH,
                     int stencil_size,
                     int dir,
                     CCTK_REAL scalar,
-                    char vn[])
+                    const char *vname)
 {
   int vi, retval;
 
 
-  vi = CCTK_VarIndex (vn);
+  vi = CCTK_VarIndex (vname);
   if (vi >= 0)
   {
     retval = BndScalarDirVI (GH, stencil_size, dir, scalar, vi);
@@ -607,7 +607,7 @@ int BndScalarDirVN (cGH *GH,
   else
   {
     CCTK_VWarn (2, __LINE__, __FILE__, CCTK_THORNSTRING,
-                "Invalid variable name '%s' in BndScalarDirVN", vn);
+                "Invalid variable name '%s' in BndScalarDirVN", vname);
     retval = -1;
   }
 
@@ -616,15 +616,15 @@ int BndScalarDirVN (cGH *GH,
 
 void CCTK_FCALL CCTK_FNAME (BndScalarDirVN)
                            (int *ierr,
-                            cGH *GH,
+                            const cGH *GH,
                             const int *stencil_size,
                             const int *dir,
                             const CCTK_REAL *scalar,
                             ONE_FORTSTRING_ARG)
 {
-  ONE_FORTSTRING_CREATE (vn)
-  *ierr = BndScalarDirVN (GH, *stencil_size, *dir, *scalar, vn);
-  free (vn);
+  ONE_FORTSTRING_CREATE (vname)
+  *ierr = BndScalarDirVN (GH, *stencil_size, *dir, *scalar, vname);
+  free (vname);
 }
 
 
@@ -639,7 +639,7 @@ void CCTK_FCALL CCTK_FNAME (BndScalarDirVN)
 
    @var        GH
    @vdesc      Pointer to CCTK grid hierarchy
-   @vtype      cGH *
+   @vtype      const cGH *
    @vio        in
    @endvar
    @var        stencil
@@ -652,9 +652,9 @@ void CCTK_FCALL CCTK_FNAME (BndScalarDirVN)
    @vtype      CCTK_REAL
    @vio        in
    @endvar
-   @var        vn
+   @var        vname
    @vdesc      name of variable to apply BC to
-   @vtype      char []
+   @vtype      const char *
    @vio        in
    @endvar
 
@@ -664,15 +664,15 @@ void CCTK_FCALL CCTK_FNAME (BndScalarDirVN)
                -1 if invalid variable name was given
    @endreturndesc
 @@*/
-int BndScalarVN (cGH *GH,
-                 int stencil[],
+int BndScalarVN (const cGH *GH,
+                 const int *stencil,
                  CCTK_REAL scalar,
-                 char vn[])
+                 const char *vname)
 {
   int vi, retval;
 
 
-  vi = CCTK_VarIndex (vn);
+  vi = CCTK_VarIndex (vname);
   if (vi >= 0)
   {
     retval = BndScalarVI (GH, stencil, scalar, vi);
@@ -680,7 +680,7 @@ int BndScalarVN (cGH *GH,
   else
   {
     CCTK_VWarn (2, __LINE__, __FILE__, CCTK_THORNSTRING,
-                "Invalid variable name '%s' in BndScalarVN", vn);
+                "Invalid variable name '%s' in BndScalarVN", vname);
     retval = -1;
   }
 
@@ -689,14 +689,14 @@ int BndScalarVN (cGH *GH,
 
 void CCTK_FCALL CCTK_FNAME (BndScalarVN)
                            (int *ierr,
-                            cGH *GH,
-                            int stencil[],
+                            const cGH *GH,
+                            const int *stencil,
                             const CCTK_REAL *scalar,
                             ONE_FORTSTRING_ARG)
 {
-  ONE_FORTSTRING_CREATE (vn)
-  *ierr = BndScalarVN (GH, stencil, *scalar, vn);
-  free (vn);
+  ONE_FORTSTRING_CREATE (vname)
+  *ierr = BndScalarVN (GH, stencil, *scalar, vname);
+  free (vname);
 }
 
 
@@ -835,7 +835,7 @@ void CCTK_FCALL CCTK_FNAME (BndScalarVN)
 
    @var        GH
    @vdesc      Pointer to CCTK grid hierarchy
-   @vtype      cGH *
+   @vtype      const cGH *
    @vio        in
    @endvar
    @var        stencil_dir
@@ -885,9 +885,9 @@ void CCTK_FCALL CCTK_FNAME (BndScalarVN)
                -4 if variable type is not supported
    @endreturndesc
 @@*/
-static int ApplyBndScalar (cGH *GH,
+static int ApplyBndScalar (const cGH *GH,
                            int stencil_dir,
-                           int stencil_alldirs[],
+                           const int *stencil_alldirs,
                            int dir,
                            CCTK_REAL scalar,
                            int first_var,