diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2007-04-02 20:28:14 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2007-04-02 20:28:14 (GMT) |
| commit | 104e1cd848e26eda1c774937c3beb38ff5861fd8 (patch) | |
| tree | 6060c90d638783dd85f3b413e4e2ad15cba3e609 /tools/lib | |
| parent | 26fdccf6cd0325756a9365c86fd373d3eb955095 (diff) | |
| download | hdf5-104e1cd848e26eda1c774937c3beb38ff5861fd8.zip hdf5-104e1cd848e26eda1c774937c3beb38ff5861fd8.tar.gz hdf5-104e1cd848e26eda1c774937c3beb38ff5861fd8.tar.bz2 | |
[svn-r13573]
Bug fixes
Reset external file list slots name_offset to a state when created (0) in H5P_dcrt_copy
so that it conforms to an assertion in H5D_update_entry_info that assumes the name_offset is 0 at this point
this fixes the problem of h5repack and external files, add a new test and files for an external file
h5diff, check for an error return in H5D_get_storage_size
tested linux 32, 64
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/h5diff_dset.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c index 602cce7..2360c70 100644 --- a/tools/lib/h5diff_dset.c +++ b/tools/lib/h5diff_dset.c @@ -235,10 +235,13 @@ hsize_t diff_datasetid( hid_t did1, storage_size1=H5Dget_storage_size(did1); storage_size2=H5Dget_storage_size(did2); - if (storage_size1<=0 && storage_size2<=0) + if (storage_size1<0 || storage_size2<0) + goto error; + + if (storage_size1==0 || storage_size2==0) { if (options->m_verbose && obj1_name && obj2_name) - parallel_print("<%s> and <%s> are empty datasets\n", obj1_name, obj2_name); + printf("<%s> or <%s> are empty datasets\n", obj1_name, obj2_name); cmp=0; options->not_cmp=1; } |