diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-08-04 20:19:04 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-08-04 20:19:51 (GMT) |
| commit | c60ceb8c08b6c5472bd79ebf2464b2409a398919 (patch) | |
| tree | aa7c4ba3198a66459dd32efd55194d627c848c53 /tools/src | |
| parent | ab1ce69900caa0b249e07db8992e66f95b0af1dc (diff) | |
| download | hdf5-c60ceb8c08b6c5472bd79ebf2464b2409a398919.zip hdf5-c60ceb8c08b6c5472bd79ebf2464b2409a398919.tar.gz hdf5-c60ceb8c08b6c5472bd79ebf2464b2409a398919.tar.bz2 | |
Merge reconciliation and VFD test fixes
Diffstat (limited to 'tools/src')
| -rw-r--r-- | tools/src/h5dump/h5dump.c | 1 | ||||
| -rw-r--r-- | tools/src/h5ls/h5ls.c | 1 | ||||
| -rw-r--r-- | tools/src/h5stat/h5stat.c | 13 |
3 files changed, 7 insertions, 8 deletions
diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c index a824197..347c189 100644 --- a/tools/src/h5dump/h5dump.c +++ b/tools/src/h5dump/h5dump.c @@ -1898,4 +1898,3 @@ add_prefix(char **prfx, size_t *prfx_len, const char *name) HDstrcat(HDstrcat(*prfx, "/"), name); } /* end add_prefix */ - diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c index c81da1e..2364f23 100644 --- a/tools/src/h5ls/h5ls.c +++ b/tools/src/h5ls/h5ls.c @@ -247,7 +247,6 @@ usage (void) } - /*------------------------------------------------------------------------- * Function: print_string * diff --git a/tools/src/h5stat/h5stat.c b/tools/src/h5stat/h5stat.c index 59038a0..5f0452c 100644 --- a/tools/src/h5stat/h5stat.c +++ b/tools/src/h5stat/h5stat.c @@ -74,14 +74,14 @@ typedef struct iter_t { ohdr_info_t group_ohdr_info; /* Object header information for groups */ hsize_t max_attrs; /* Maximum attributes from a group */ - unsigned long *num_small_attrs; /* Size of small attributes tracked */ + unsigned long *num_small_attrs; /* Size of small attributes tracked */ unsigned attr_nbins; /* Number of bins for attribute counts */ unsigned long *attr_bins; /* Pointer to array of bins for attribute counts */ unsigned max_dset_rank; /* Maximum rank of dataset */ unsigned long dset_rank_count[H5S_MAX_RANK]; /* Number of datasets of each rank */ hsize_t max_dset_dims; /* Maximum dimension size of dataset */ - unsigned long *small_dset_dims; /* Size of dimensions of small datasets tracked */ + unsigned long *small_dset_dims; /* Size of dimensions of small datasets tracked */ unsigned long dset_layouts[H5D_NLAYOUTS]; /* Type of storage for each dataset */ unsigned long dset_comptype[H5_NFILTERS_IMPL]; /* Number of currently implemented filters */ unsigned long dset_ntypes; /* Number of diff. dataset datatypes found */ @@ -320,9 +320,9 @@ static void usage(const char *prog) HDfprintf(stdout, " -s, --freespace Print free space information\n"); HDfprintf(stdout, " -S, --summary Print summary of file space information\n"); HDfprintf(stdout, " --enable-error-stack Prints messages from the HDF5 error stack as they occur\n"); - HDfprintf(stdout, " --s3-cred=<cred> Access file on S3, using provided credential\n"); - HDfprintf(stdout, " <cred> :: (region,id,key)\n"); - HDfprintf(stdout, " If <cred> == \"(,,)\", no authentication is used.\n"); + HDfprintf(stdout, " --s3-cred=<cred> Access file on S3, using provided credential\n"); + HDfprintf(stdout, " <cred> :: (region,id,key)\n"); + HDfprintf(stdout, " If <cred> == \"(,,)\", no authentication is used.\n"); HDfprintf(stdout, " --hdfs-attrs=<attrs> Access a file on HDFS with given configuration\n"); HDfprintf(stdout, " attributes.\n"); HDfprintf(stdout, " <attrs> :: (<namenode name>,<namenode port>,\n"); @@ -544,7 +544,8 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi) HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "attribute_stats() failed"); /* Get storage info */ - storage = H5Dget_storage_size(did); + if((storage = H5Dget_storage_size(did)) < 0) + HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dget_storage_size() failed"); /* Gather layout statistics */ if((dcpl = H5Dget_create_plist(did)) < 0) |