Some more const qualifiers for routine arguments.

git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/IOUtil/trunk@134 b32723a9-ab3a-4a60-88e2-2e5d99d7c17a

3 files changed, 34 insertions, 33 deletions

diff --git a/src/Utils.c b/src/Utils.c
index e5fd1b0..e27594e 100644
--- a/src/Utils.c
+++ b/src/Utils.c
@@ -44,7 +44,7 @@ CCTK_FILEVERSION(CactusBase_IOUtil_Utils_c)
 
    @var        GH
    @vdesc      Pointer to CCTK GH
-   @vtype      cGH *
+   @vtype      const cGH *
    @vio        in
    @endvar
    @var        num_dims
@@ -73,11 +73,11 @@ CCTK_FILEVERSION(CactusBase_IOUtil_Utils_c)
                0 for success
    @endreturndesc
  @@*/
-int IOUtil_1DLines (cGH *GH,
+int IOUtil_1DLines (const cGH *GH,
                     int num_dims,
-                    int *const origin_index[],
-                    CCTK_REAL *const origin_phys[],
-                    int *slice_center[])
+                    int *const *const origin_index,
+                    CCTK_REAL *const *const origin_phys,
+                    int *const *slice_center)
 {
   int dim, dir;
   char system_name[20];
@@ -138,8 +138,10 @@ int IOUtil_1DLines (cGH *GH,
                     'x' + dim, 'x' + dir, (double) origin_phys[dir][dim],
                     (double) lower_range[dim], (double) upper_range[dim]);
         CCTK_VWarn (1, __LINE__, __FILE__, CCTK_THORNSTRING,
-                    "IOUtil_1DLines: no 1D %c-line output will be written with "
-                    "this slice center default", 'x' + dir);
+                    "IOUtil_1DLines: no 1D %c-line output will be written for "
+                    "%dD variables with this slice center default",
+                    'x' + dir, num_dims);
+
         slice_center[dir][dim] = -1;
       }
       else 
@@ -177,7 +179,7 @@ int IOUtil_1DLines (cGH *GH,
 
    @var        GH
    @vdesc      Pointer to CCTK GH
-   @vtype      cGH *
+   @vtype      const cGH *
    @vio        in
    @endvar
    @var        num_dims
@@ -207,11 +209,11 @@ int IOUtil_1DLines (cGH *GH,
                -1 no coordinate system of given dimensions found
    @endreturndesc
  @@*/
-int IOUtil_2DPlanes (cGH *GH,
+int IOUtil_2DPlanes (const cGH *GH,
                      int num_dims,
-                     const int origin_index[],
-                     const CCTK_REAL origin_phys[],
-                     int slice_center[])
+                     const int *origin_index,
+                     const CCTK_REAL *origin_phys,
+                     int *slice_center)
 {
   int dir;
   char system_name[20];
@@ -224,7 +226,7 @@ int IOUtil_2DPlanes (cGH *GH,
   if (CCTK_CoordSystemHandle (system_name) < 0)
   {
     CCTK_VWarn (4, __LINE__, __FILE__, CCTK_THORNSTRING,
-                "IOUtil_1DLines: Cartesian coordinate system '%s' not found",
+                "IOUtil_2DPlanes: Cartesian coordinate system '%s' not found",
                 system_name);
     return (-1);
   }
@@ -271,9 +273,8 @@ int IOUtil_2DPlanes (cGH *GH,
                                 GH->cctk_delta_space[dir] - 1e-6);
 
 #ifdef DEBUG_IOUTIL
-      printf("sp2xyz for planes perpendicular to"
-             " %d-direction is %d\n",
-             dir,slice_center[dir]);
+      printf("sp2xyz for planes perpendicular to %d-direction is %d\n",
+             dir, (CCTK_INT) slice_center[dir]);
 #endif
     }
   }
@@ -307,20 +308,20 @@ int IOUtil_2DPlanes (cGH *GH,
    @endvar
    @var        timers
    @vdesc      array of timers
-   @vtype      int [ntimers]
+   @vtype      const int [ntimers]
    @vio        in
    @endvar
    @var        timer_descriptions
    @vdesc      array of timer descriptions
-   @vtype      const char * [ntimers]
+   @vtype      const char *const [ntimers]
    @vio        in
    @endvar
 @@*/
 
 void IOUtil_PrintTimings (const char *description,
                           int ntimers,
-                          int timers[/* ntimers */],
-                          const char *timer_descriptions[/* ntimers */])
+                          const int *timers,
+                          const char *const *const timer_descriptions)
 {
   int i, j;
   cTimerData *info;
@@ -396,7 +397,7 @@ void IOUtil_PrintTimings (const char *description,
 
    @var        GH
    @vdesc      pointer to the GH extensions
-   @vtype      cGH *
+   @vtype      const cGH *
    @vio        in
    @endvar
    @var        dirname
@@ -421,7 +422,7 @@ void IOUtil_PrintTimings (const char *description,
                return code of @seeroutine CCTK_CreateDirectory
    @endreturndesc
 @@*/
-int IOUtil_CreateDirectory (cGH *GH, const char *dirname,
+int IOUtil_CreateDirectory (const cGH *GH, const char *dirname,
                             int multiple_io_procs, int ioproc)
 {
   int myproc, retval;
diff --git a/src/ioutil_CheckpointRecovery.h b/src/ioutil_CheckpointRecovery.h
index dd5aa36..0cbd949 100644
--- a/src/ioutil_CheckpointRecovery.h
+++ b/src/ioutil_CheckpointRecovery.h
@@ -66,8 +66,8 @@ int   IOUtil_RestartFromRecovery (const cGH *GH);
 /* print the checkpoint/recovery timings to stdout */
 void  IOUtil_PrintTimings (const char *description,
                            int ntimers,
-                           int timers[/* ntimers */],
-                           const char *timer_descriptions[/* ntimers */]);
+                           const int *timers,
+                           const char *const *const timer_descriptions);
 
 #ifdef __cplusplus
 }
diff --git a/src/ioutil_Utils.h b/src/ioutil_Utils.h
index c7e8b2e..519f6ee 100644
--- a/src/ioutil_Utils.h
+++ b/src/ioutil_Utils.h
@@ -19,20 +19,20 @@ extern "C"
 
 
 /* set the slice center for 1D lines */
-int IOUtil_1DLines (cGH *GH,
+int IOUtil_1DLines (const cGH *GH,
                     int num_dims,
-                    int *const origin_index[],
-                    CCTK_REAL *const origin_phys[],
-                    int *slice_center[]);
+                    int *const *const origin_index,
+                    CCTK_REAL *const *const origin_phys,
+                    int *const *const slice_center);
 
 /* set the slice center for 2D planes */
-int IOUtil_2DPlanes (cGH *GH,
+int IOUtil_2DPlanes (const cGH *GH,
                      int num_dims,
-                     const int origin_index[],
-                     const CCTK_REAL origin_phys[],
-                     int slice_center[]);
+                     const int *origin_index,
+                     const CCTK_REAL *origin_phys,
+                     int *slice_center);
 
-int IOUtil_CreateDirectory (cGH *GH,
+int IOUtil_CreateDirectory (const cGH *GH,
                             const char *dirname,
                             int multiple_io_procs,
                             int ioproc);