Fixed gcc verbose warnings about missing prototypes and use of variables

named 'index' which hides a global function index(3).
Also polished grdocs, added missing version and rcs IDs.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/IOASCII/trunk@32 94b1c47f-dcfd-45ef-a468-0854c0e9e350

1 files changed, 10 insertions, 10 deletions

diff --git a/src/Write2D.c b/src/Write2D.c
index fe2e304..8c1a563 100644
--- a/src/Write2D.c
+++ b/src/Write2D.c
@@ -89,7 +89,7 @@ CCTK_FILEVERSION(CactusBase_IOASCII_Write2D_c)
    @vtype     cGH *
    @vio       in
    @endvar
-   @var       index
+   @var       vindex
    @vdesc     index of variable to output
    @vtype     int
    @vio       in
@@ -100,7 +100,7 @@ CCTK_FILEVERSION(CactusBase_IOASCII_Write2D_c)
    @vio       in
    @endvar
 @@*/
-void IOASCII_Write2D (cGH *GH, int index, const char *alias)
+void IOASCII_Write2D (cGH *GH, int vindex, const char *alias)
 {
   DECLARE_CCTK_PARAMETERS
   int myproc;
@@ -120,20 +120,20 @@ void IOASCII_Write2D (cGH *GH, int index, const char *alias)
   char *fullname;
   char slicename[20];
   ioAdvertisedFileDesc advertised_file; 
-  const char *extensions[3] = {"yz", "xz", "xy"};
+  static char *extensions[3] = {"yz", "xz", "xy"};
 
 
   /* to make the compiler happy */
   fdset_2D = NULL;
 
   /* get the variable group indormation */
-  groupindex = CCTK_GroupIndexFromVarI (index);
+  groupindex = CCTK_GroupIndexFromVarI (vindex);
   CCTK_GroupData (groupindex, &groupinfo);
 
   /* check if variable has storage assigned */
   if (! CCTK_QueryGroupStorageI (GH, groupindex)) 
   {
-    fullname = CCTK_FullName (index);
+    fullname = CCTK_FullName (vindex);
     CCTK_VWarn (2, __LINE__, __FILE__, CCTK_THORNSTRING,
                 "No IOASCII 2D output for '%s' (no storage)", fullname);
     free (fullname);
@@ -226,9 +226,9 @@ FIXME: get rid of PUGH here
         /* FIXME: this can go when we permanently switch the the
                   new filename scheme */
         advertised_file.slice = new_filename_scheme ?
-                                slicename : (char *) extensions[dir];
+                                slicename : extensions[dir];
         advertised_file.thorn = CCTK_THORNSTRING;
-        advertised_file.varname = CCTK_FullName (index);
+        advertised_file.varname = CCTK_FullName (vindex);
         advertised_file.description = "Two-dimensional slice plots";
         advertised_file.mimetype = "application/gnuplot";
 
@@ -277,7 +277,7 @@ FIXME: get rid of PUGH here
   }
 
   /* get the timelevel for the variable to output */
-  timelevel = CCTK_NumTimeLevelsFromVarI (index) - 1;
+  timelevel = CCTK_NumTimeLevelsFromVarI (vindex) - 1;
   if (timelevel > 0)
   {
     timelevel--;
@@ -356,10 +356,10 @@ FIXME: get rid of PUGH here
     }
 
     /* get the variable slice */
-    if (Hyperslab_GetHyperslab (GH, 0, index, timelevel, 2, origin, directions,
+    if (Hyperslab_GetHyperslab (GH, 0, vindex, timelevel, 2, origin, directions,
                                 lengths, downsamples, &data, data_hsizes) < 0)
     {
-      fullname = CCTK_FullName (index);
+      fullname = CCTK_FullName (vindex);
       CCTK_VWarn (1, __LINE__, __FILE__, CCTK_THORNSTRING,
                   "Failed to extract 2D hyperslab for variable '%s'", fullname);
       free (fullname);