diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/h5copy/h5copygentest.c | 1 | ||||
-rw-r--r-- | tools/h5copy/testh5copy.sh | 1 | ||||
-rw-r--r-- | tools/h5dump/h5dumpgentest.c | 6 | ||||
-rw-r--r-- | tools/h5repack/h5repack.c | 2 | ||||
-rw-r--r-- | tools/h5repack/h5repack_main.c | 2 | ||||
-rw-r--r-- | tools/h5repack/h5repacktst.c | 4 | ||||
-rw-r--r-- | tools/h5stat/h5stat.c | 14 | ||||
-rw-r--r-- | tools/h5stat/testh5stat.sh.in | 1 |
8 files changed, 18 insertions, 13 deletions
diff --git a/tools/h5copy/h5copygentest.c b/tools/h5copy/h5copygentest.c index 42bc3cd..b6346de 100644 --- a/tools/h5copy/h5copygentest.c +++ b/tools/h5copy/h5copygentest.c @@ -528,7 +528,6 @@ static herr_t gen_region_ref(hid_t loc_id) char data[3][16] = {"The quick brown", "fox jumps over ", "the 5 lazy dogs"}; hsize_t dims2[2] = {3,16}; hsize_t coords[4][2] = { {0,1}, {2,11}, {1,0}, {2,4} }; - hdset_reg_ref_t rr_data[2]; hsize_t start[2] = {0,0}; hsize_t stride[2] = {2,11}; diff --git a/tools/h5copy/testh5copy.sh b/tools/h5copy/testh5copy.sh index 31104dd..3f24bdf 100644 --- a/tools/h5copy/testh5copy.sh +++ b/tools/h5copy/testh5copy.sh @@ -261,6 +261,7 @@ COPY_OBJECTS() # Remove any output file left over from previous test run rm -f $FILEOUT + echo "Testing from `basename $TESTFILE` to `basename $FILEOUT` for the following tests:" echo "Test copying various forms of datasets" TOOLTEST -i $TESTFILE -o $FILEOUT -v -s simple -d simple TOOLTEST -i $TESTFILE -o $FILEOUT -v -s chunk -d chunk diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c index f4e0b7b..c3fe11d 100644 --- a/tools/h5dump/h5dumpgentest.c +++ b/tools/h5dump/h5dumpgentest.c @@ -104,6 +104,8 @@ /* utility functions */ static int +make_dset(hid_t loc_id, const char *name, hid_t sid, hid_t tid, hid_t dcpl, void *buf); +static int write_attr(hid_t loc_id, int rank, hsize_t *dims, const char *attr_name, hid_t tid, void *buf); static int @@ -377,7 +379,6 @@ gent_dataset2(void) H5Fclose(fid); } - static void gent_attribute(void) { @@ -2952,7 +2953,6 @@ static void gent_array8(void) hsize_t sdims[] = {F64_DIM0}; hsize_t tdims[] = {F64_DIM1}; int wdata[(F64_DIM1) * sizeof(int)]; /* Write buffer */ - int ndims; int i; /* @@ -6481,7 +6481,6 @@ gent_extlinks(void) } - /*------------------------------------------------------------------------- * Function: main * @@ -6554,7 +6553,6 @@ int main(void) gent_fpformat(); gent_extlinks(); - return 0; } diff --git a/tools/h5repack/h5repack.c b/tools/h5repack/h5repack.c index 9adb1af..0256650 100644 --- a/tools/h5repack/h5repack.c +++ b/tools/h5repack/h5repack.c @@ -96,7 +96,7 @@ int h5repack_init (pack_opt_t *options, int k, n; memset(options,0,sizeof(pack_opt_t)); options->min_comp = 1024; - options->verbose = verbose; + options->verbose = verbose; for ( n = 0; n < H5_REPACK_MAX_NFILTERS; n++) { diff --git a/tools/h5repack/h5repack_main.c b/tools/h5repack/h5repack_main.c index 659e4b8..f52aa5a 100644 --- a/tools/h5repack/h5repack_main.c +++ b/tools/h5repack/h5repack_main.c @@ -106,7 +106,7 @@ int main(int argc, const char **argv) int ret=-1; /* initialize options */ - h5repack_init (&options,0); + h5repack_init(&options,0); parse_command_line(argc, argv, &options); diff --git a/tools/h5repack/h5repacktst.c b/tools/h5repack/h5repacktst.c index d302dd4..d77ba5f 100644 --- a/tools/h5repack/h5repacktst.c +++ b/tools/h5repack/h5repacktst.c @@ -313,7 +313,7 @@ int main (void) GOERROR; if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0) GOERROR; - if (h5repack_verify(FNAME4OUT,&pack_options)<=0) + if (h5repack_verify(FNAME4OUT, &pack_options) <= 0) GOERROR; if (h5repack_end (&pack_options) < 0) GOERROR; @@ -602,7 +602,7 @@ int main (void) GOERROR; if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0) GOERROR; - if (h5repack_verify(FNAME4OUT,&pack_options)<=0) + if (h5repack_verify(FNAME4OUT, &pack_options) <= 0) GOERROR; if (h5repack_end (&pack_options) < 0) GOERROR; diff --git a/tools/h5stat/h5stat.c b/tools/h5stat/h5stat.c index efcac48..4554c40 100644 --- a/tools/h5stat/h5stat.c +++ b/tools/h5stat/h5stat.c @@ -571,6 +571,7 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi) return 0; } /* end dataset_stats() */ + /*------------------------------------------------------------------------- * Function: datatype_stats * @@ -878,17 +879,19 @@ print_file_info(const iter_t *iter) static herr_t print_file_metadata(const iter_t *iter) { - printf("File space information for file metadata (in bytes):\n"); + HDfprintf(stdout, "File space information for file metadata (in bytes):\n"); HDfprintf(stdout, "\tSuperblock extension: %Hu\n", iter->super_ext_size); HDfprintf(stdout, "\tUser block: %Hu\n", iter->ublk_size); HDfprintf(stdout, "\tObject headers: (total/unused)\n"); - HDfprintf(stdout, "\t\tGroups: %Hu/%Hu\n", iter->group_ohdr_info.total_size, + HDfprintf(stdout, "\t\tGroups: %Hu/%Hu\n", + iter->group_ohdr_info.total_size, iter->group_ohdr_info.free_size); HDfprintf(stdout, "\t\tDatasets(exclude compact data): %Hu/%Hu\n", iter->dset_ohdr_info.total_size, iter->dset_ohdr_info.free_size); - HDfprintf(stdout, "\t\tDatatypes: %Hu/%Hu\n", iter->dtype_ohdr_info.total_size, + HDfprintf(stdout, "\t\tDatatypes: %Hu/%Hu\n", + iter->dtype_ohdr_info.total_size, iter->dtype_ohdr_info.free_size); HDfprintf(stdout, "\tGroups:\n"); @@ -970,6 +973,7 @@ print_group_info(const iter_t *iter) return 0; } /* print_group_info() */ + /*------------------------------------------------------------------------- * Function: print_group_metadata * @@ -997,6 +1001,7 @@ print_group_metadata(const iter_t *iter) return 0; } /* print_group_metadata() */ + /*------------------------------------------------------------------------- * Function: print_dataset_info * @@ -1089,6 +1094,7 @@ print_dataset_info(const iter_t *iter) return 0; } /* print_dataset_info() */ + /*------------------------------------------------------------------------- * Function: print_dataset_metadata * @@ -1160,6 +1166,7 @@ print_dset_dtype_meta(const iter_t *iter) return 0; } /* print_dset_dtype_meta() */ + /*------------------------------------------------------------------------- * Function: print_attr_info * @@ -1253,7 +1260,6 @@ print_file_statistics(const iter_t *iter) if(display_attr) print_attr_info(iter); } /* print_file_statistics() */ - /*------------------------------------------------------------------------- * Function: print_object_statistics diff --git a/tools/h5stat/testh5stat.sh.in b/tools/h5stat/testh5stat.sh.in index 6c0bb3e..1437cdd 100644 --- a/tools/h5stat/testh5stat.sh.in +++ b/tools/h5stat/testh5stat.sh.in @@ -141,3 +141,4 @@ else echo "$TESTNAME tests failed with $nerrors errors." exit $EXIT_FAILURE fi + |