Fixed compiler warnings about a parameter named 'basename' which shadows

a global symbol of the same name.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IOFlexIO/trunk@214 ebee0441-1374-4afa-a3b5-247f3ba15b9a

1 files changed, 10 insertions, 10 deletions

diff --git a/src/RecoverGH.c b/src/RecoverGH.c
index 498283c..2248d40 100644
--- a/src/RecoverGH.c
+++ b/src/RecoverGH.c
@@ -41,13 +41,13 @@ CCTK_FILEVERSION(CactusPUGHIO_IOFlexIO_RecoverGH_c)
 
 
 /* prototypes of routines defined in this source file */
-int IOFlexIO_Recover (cGH *GH, const char *basename, int called_from);
+int IOFlexIO_Recover (cGH *GH, const char *basefilename, int called_from);
 int IOFlexIO_RecoverParameters (void);
 static int IOFlexIOi_RecoverParameters (fileinfo_t *file);
 static int IOFlexIOi_RecoverGHextensions (cGH *GH,
                                           fileinfo_t *file);
 static int IOFlexIOi_OpenFile (cGH *GH,
-                               const char *basename,
+                               const char *basefilename,
                                int called_from,
                                fileinfo_t *file);
 /* this one comes from RestoreFile.c */
@@ -72,8 +72,8 @@ int IOFlexIOi_RecoverVariables (cGH *GH,
    @vtype      cGH
    @vio        in
    @endvar
-   @var        basename
-   @vdesc      the basename of the file to recover from
+   @var        basefilename
+   @vdesc      the basefilename of the file to recover from
                The file suffix is appended by the routine.
    @vtype      const char *
    @vio        in
@@ -102,7 +102,7 @@ int IOFlexIOi_RecoverVariables (cGH *GH,
 
 @@*/
 
-int IOFlexIO_Recover (cGH *GH, const char *basename, int called_from)
+int IOFlexIO_Recover (cGH *GH, const char *basefilename, int called_from)
 {
   DECLARE_CCTK_PARAMETERS
   int result;
@@ -130,7 +130,7 @@ int IOFlexIO_Recover (cGH *GH, const char *basename, int called_from)
       called_from == FILEREADER_DATA ||
       (GH && (GH->cctk_levfac[0] > 1 || GH->cctk_convlevel > 0)))
   {
-    if (IOFlexIOi_OpenFile (GH, basename, called_from, &file) < 0)
+    if (IOFlexIOi_OpenFile (GH, basefilename, called_from, &file) < 0)
     {
       return (-1);
     }
@@ -256,7 +256,7 @@ int IOFlexIO_RecoverParameters (void)
 /**************************** local routines ******************************/
 
 static int IOFlexIOi_OpenFile (cGH *GH,
-                               const char *basename,
+                               const char *basefilename,
                                int called_from,
                                fileinfo_t *file)
 {
@@ -297,7 +297,7 @@ static int IOFlexIOi_OpenFile (cGH *GH,
            we need to try both file names. */
   /* at first try with unchunked mode */
   file->unchunked = 1;
-  IOUtil_PrepareFilename (GH, basename, file->filename, called_from, 0,
+  IOUtil_PrepareFilename (GH, basefilename, file->filename, called_from, 0,
                           file->unchunked);
   strcat (file->filename, ".ieee");
 
@@ -322,7 +322,7 @@ static int IOFlexIOi_OpenFile (cGH *GH,
 
       /* now try with chunked mode */
       file->unchunked = 0;
-      IOUtil_PrepareFilename (GH, basename, file->filename, called_from, 0,
+      IOUtil_PrepareFilename (GH, basefilename, file->filename, called_from, 0,
                               file->unchunked);
       strcat (file->filename, ".ieee");
 
@@ -467,7 +467,7 @@ static int IOFlexIOi_OpenFile (cGH *GH,
     /* Determine the IO processors for each node and the corresponding
        checkpoint file */
     file->ioproc = myproc - (myproc % file->ioproc_every);
-    IOUtil_PrepareFilename (GH, basename, file->filename, called_from,
+    IOUtil_PrepareFilename (GH, basefilename, file->filename, called_from,
                             file->ioproc/file->ioproc_every, file->unchunked);
     strcat (file->filename, ".ieee");