diff options
| author | Jacob Smith <jake.smith@hdfgroup.org> | 2019-07-22 21:55:37 (GMT) |
|---|---|---|
| committer | Jacob Smith <jake.smith@hdfgroup.org> | 2019-07-22 21:55:37 (GMT) |
| commit | 7ff3a63d5f6c74210a7e5ee064086306436c4062 (patch) | |
| tree | 812406ba59c35ae766ded6e7a53ea0db793667d3 /tools/src | |
| parent | 9103fd59530cc45cef39cba81e0f1330a94b4807 (diff) | |
| download | hdf5-7ff3a63d5f6c74210a7e5ee064086306436c4062.zip hdf5-7ff3a63d5f6c74210a7e5ee064086306436c4062.tar.gz hdf5-7ff3a63d5f6c74210a7e5ee064086306436c4062.tar.bz2 | |
Minor formatting adjustments.
Diffstat (limited to 'tools/src')
| -rw-r--r-- | tools/src/h5repack/h5repack.c | 18 | ||||
| -rw-r--r-- | tools/src/h5repack/h5repack_main.c | 8 |
2 files changed, 6 insertions, 20 deletions
diff --git a/tools/src/h5repack/h5repack.c b/tools/src/h5repack/h5repack.c index 7dc38e6..c9cc020 100644 --- a/tools/src/h5repack/h5repack.c +++ b/tools/src/h5repack/h5repack.c @@ -382,15 +382,7 @@ copy_attr( */ for (u = 0; u < (unsigned) oinfo.num_attrs; u++) { /* open attribute */ - attr_id = H5Aopen_by_idx( - loc_in, - ".", - H5_INDEX_CRT_ORDER, - H5_ITER_INC, - (hsize_t) u, - H5P_DEFAULT, - H5P_DEFAULT); - if (attr_id < 0) + if((attr_id = H5Aopen_by_idx(loc_in, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t) u, H5P_DEFAULT, H5P_DEFAULT)) < 0) HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Aopen_by_idx failed"); if (H5Aget_name(attr_id, (size_t) 255, name) < 0) @@ -410,13 +402,7 @@ copy_attr( HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Iget_file_id failed"); /* Copy named dt */ - wtype_id = copy_named_datatype( - ftype_id, - fidout, - named_dt_head_p, - travt, - options); - if (wtype_id < 0) { + if ((wtype_id = copy_named_datatype(ftype_id, fidout, named_dt_head_p, travt, options)) < 0) { H5Fclose(fidout); HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "copy_named_datatype failed"); diff --git a/tools/src/h5repack/h5repack_main.c b/tools/src/h5repack/h5repack_main.c index 19eabd0..b4e5470 100644 --- a/tools/src/h5repack/h5repack_main.c +++ b/tools/src/h5repack/h5repack_main.c @@ -90,11 +90,11 @@ static void usage(const char *prog) { PRINTVALSTREAM(rawoutstream, " This option will take precedence over the options\n"); PRINTVALSTREAM(rawoutstream, " --low and --high\n"); PRINTVALSTREAM(rawoutstream, " --low=BOUND The low bound for library release versions to use\n"); - PRINTVALSTREAM(rawoutstream, " when creating objects in the file (default is 0\n"); - PRINTVALSTREAM(rawoutstream, " [H5F_LIBVER_EARLIEST])\n"); + PRINTVALSTREAM(rawoutstream, " when creating objects in the file\n"); + PRINTVALSTREAM(rawoutstream, " (default is H5F_LIBVER_EARLIEST)\n"); PRINTVALSTREAM(rawoutstream, " --high=BOUND The high bound for library release versions to use\n"); - PRINTVALSTREAM(rawoutstream, " when creating objects in the file (default is 2\n"); - PRINTVALSTREAM(rawoutstream, " [H5F_LIBVER_V110 this release; H5F_LIBVER_LATEST])\n"); + PRINTVALSTREAM(rawoutstream, " when creating objects in the file\n"); + PRINTVALSTREAM(rawoutstream, " (default is H5F_LIBVER_LATEST)\n"); PRINTVALSTREAM(rawoutstream, " -c L1, --compact=L1 Maximum number of links in header messages\n"); PRINTVALSTREAM(rawoutstream, " -d L2, --indexed=L2 Minimum number of links in the indexed format\n"); PRINTVALSTREAM(rawoutstream, " -s S[:F], --ssize=S[:F] Shared object header message minimum size\n"); |