[svn-r12635] Purpose:

Code cleanup.

Description:
Removed argc and argv from the function arguments of h5tools_get_fapl() and
h5tools_fopen().  They were used to call MPI_Init() which was no longer
needed.

Tested:
heping (serial and parallel).

4 files changed, 7 insertions, 14 deletions

diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index c99fd11..a390232 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -3436,7 +3436,7 @@ main(int argc, const char *argv[])
     }
     fname = argv[opt_ind];
 
-    fid = h5tools_fopen(fname, driver, NULL, 0, argc, argv);
+    fid = h5tools_fopen(fname, driver, NULL, 0);
 
     if (fid < 0) {
         error_msg(progname, "unable to open file \"%s\"\n", fname);
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index 620d12c..9aa05c6 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -2214,7 +2214,7 @@ main (int argc, const char *argv[])
         file = -1;
 
         while (fname && *fname) {
-            file = h5tools_fopen(fname, preferred_driver, drivername, sizeof drivername, argc, argv);
+            file = h5tools_fopen(fname, preferred_driver, drivername, sizeof drivername);
 
             if (file>=0) {
                 if (verbose_g) {
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index 83e9a89..b26519f 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -162,13 +162,7 @@ h5tools_close(void)
  *-------------------------------------------------------------------------
  */
 static hid_t
-h5tools_get_fapl(const char *driver, unsigned *drivernum,
-#ifdef H5_HAVE_PARALLEL
-int argc, const char *argv[]
-#else /* H5_HAVE_PARALLEL */
-int UNUSED argc, const char UNUSED *argv[]
-#endif /* H5_HAVE_PARALLEL */
-)
+h5tools_get_fapl(const char *driver, unsigned *drivernum)
 {
     hid_t               fapl = H5P_DEFAULT;
 
@@ -313,7 +307,7 @@ error:
  */
 hid_t
 h5tools_fopen(const char *fname, const char *driver, char *drivername,
-              size_t drivername_size, int argc, const char *argv[])
+              size_t drivername_size)
 {
     unsigned    drivernum;
     hid_t       fid = FAIL;
@@ -321,7 +315,7 @@ h5tools_fopen(const char *fname, const char *driver, char *drivername,
 
     if (driver && *driver) {
         /* Get the correct FAPL for the given driver */
-        if((fapl=h5tools_get_fapl(driver,&drivernum,argc,argv))<0)
+        if((fapl=h5tools_get_fapl(driver,&drivernum))<0)
             goto done;
 
         H5E_BEGIN_TRY {
@@ -335,7 +329,7 @@ h5tools_fopen(const char *fname, const char *driver, char *drivername,
         /* Try to open the file using each of the drivers */
         for (drivernum = 0; drivernum < NUM_DRIVERS; drivernum++) {
             /* Get the correct FAPL for the given driver */
-            if((fapl=h5tools_get_fapl(drivernames[drivernum],NULL,argc,argv))<0)
+            if((fapl=h5tools_get_fapl(drivernames[drivernum],NULL))<0)
                 goto done;
 
             H5E_BEGIN_TRY {
diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h
index 3400008..1d900f1 100644
--- a/tools/lib/h5tools.h
+++ b/tools/lib/h5tools.h
@@ -363,8 +363,7 @@ extern FILE   *rawdatastream;       /*output stream for raw data            */
 extern void     h5tools_init(void);
 extern void     h5tools_close(void);
 extern hid_t    h5tools_fopen(const char *fname, const char *driver,
-                              char *drivername, size_t drivername_len,
-                              int argc, const char *argv[]);
+                              char *drivername, size_t drivername_len);
 extern int      h5tools_dump_dset(FILE *stream, const h5tool_format_t *info, hid_t dset,
                                   hid_t p_typ, struct subset_t *sset, int indentlevel);
 extern int      h5tools_dump_mem(FILE *stream, const h5tool_format_t *info, hid_t obj_id,