diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2006-08-28 00:55:27 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2006-08-28 00:55:27 (GMT) |
| commit | 66d2d26f5d97eed437683c5c5e3fa15e7d368664 (patch) | |
| tree | 20add75e189dd6446b48dba937d85f86099ed5a5 /tools/lib | |
| parent | 0265f1ca117cfeaea885f4619a2ad981dd92c9a0 (diff) | |
| download | hdf5-66d2d26f5d97eed437683c5c5e3fa15e7d368664.zip hdf5-66d2d26f5d97eed437683c5c5e3fa15e7d368664.tar.gz hdf5-66d2d26f5d97eed437683c5c5e3fa15e7d368664.tar.bz2 | |
[svn-r12634] 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).
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/h5tools.c | 14 | ||||
| -rw-r--r-- | tools/lib/h5tools.h | 3 |
2 files changed, 5 insertions, 12 deletions
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c index 8530dfa..013cecf 100644 --- a/tools/lib/h5tools.c +++ b/tools/lib/h5tools.c @@ -171,13 +171,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; @@ -325,7 +319,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; @@ -333,7 +327,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 { @@ -347,7 +341,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 672d72a..357154b 100644 --- a/tools/lib/h5tools.h +++ b/tools/lib/h5tools.h @@ -367,8 +367,7 @@ extern int bin_form; /* binary form */ 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, |