diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-03-10 19:00:39 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-03-10 19:00:39 (GMT) |
| commit | b4ff3e6e79a46fb474eb1786a11a7d2451455111 (patch) | |
| tree | b73756af2d3eaee487c4087d55fbb04e1eba62b5 /tools/h5stat | |
| parent | da5058310c324dcce93dc9328ef2bd53bf1fed02 (diff) | |
| download | hdf5-b4ff3e6e79a46fb474eb1786a11a7d2451455111.zip hdf5-b4ff3e6e79a46fb474eb1786a11a7d2451455111.tar.gz hdf5-b4ff3e6e79a46fb474eb1786a11a7d2451455111.tar.bz2 | |
[svn-r16560] Description:
Remove another call to H5E_clear_stack() from within the library.
Clean up lots of compiler warnings.
Tested on:
Mac OS X/32 10.5.6 (amazon)
(followup on other platforms forthcoming)
Diffstat (limited to 'tools/h5stat')
| -rw-r--r-- | tools/h5stat/h5stat.c | 5 | ||||
| -rw-r--r-- | tools/h5stat/h5stat_gentest.c | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tools/h5stat/h5stat.c b/tools/h5stat/h5stat.c index e95a9ee..315c558 100644 --- a/tools/h5stat/h5stat.c +++ b/tools/h5stat/h5stat.c @@ -98,9 +98,7 @@ int d_status = EXIT_SUCCESS; static int display_all = TRUE; static int display_file_metadata = FALSE; static int display_file = FALSE; -static int display_group_metadata = FALSE; static int display_group = FALSE; -static int display_dset_metadata = FALSE; static int display_dset = FALSE; static int display_dtype_metadata = FALSE; static int display_object = FALSE; @@ -698,7 +696,6 @@ parse_command_line(int argc, const char *argv[]) case 'G': display_all = FALSE; - display_group_metadata = TRUE; break; case 'g': @@ -713,7 +710,6 @@ parse_command_line(int argc, const char *argv[]) case 'D': display_all = FALSE; - display_dset_metadata = TRUE; break; case 'd': @@ -1106,7 +1102,6 @@ print_file_statistics(const iter_t *iter) display_file = TRUE; display_file_metadata = TRUE; display_group = TRUE; - display_group_metadata = TRUE; display_dset = TRUE; display_dtype_metadata = TRUE; display_attr = TRUE; diff --git a/tools/h5stat/h5stat_gentest.c b/tools/h5stat/h5stat_gentest.c index 250226e..3f933f2 100644 --- a/tools/h5stat/h5stat_gentest.c +++ b/tools/h5stat/h5stat_gentest.c @@ -23,6 +23,7 @@ * of the expected output and update the corresponding *.ddl files. */ +#include <assert.h> #include "hdf5.h" #define FILE "h5stat_newgrat.h5" @@ -47,6 +48,7 @@ static void gen_file(void) fapl = H5Pcreate(H5P_FILE_ACCESS); ret = H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST); + assert(ret >= 0); /* Create dataset */ file = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, fapl); @@ -68,12 +70,17 @@ static void gen_file(void) sprintf(attrname, "%s%d", ATTR_NAME,i); attr_id = H5Acreate2(dset_id, attrname, type_id, space_id, H5P_DEFAULT, H5P_DEFAULT); ret = H5Aclose(attr_id); + assert(ret >= 0); } /* end for */ ret = H5Dclose(dset_id); + assert(ret >= 0); ret = H5Sclose(space_id); + assert(ret >= 0); ret = H5Tclose(type_id); + assert(ret >= 0); ret = H5Fclose(file); + assert(ret >= 0); } int main(void) |