summaryrefslogtreecommitdiffstats
path: root/tools/h5repack/h5repack_copy.c
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2007-04-02 20:28:14 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2007-04-02 20:28:14 (GMT)
commit104e1cd848e26eda1c774937c3beb38ff5861fd8 (patch)
tree6060c90d638783dd85f3b413e4e2ad15cba3e609 /tools/h5repack/h5repack_copy.c
parent26fdccf6cd0325756a9365c86fd373d3eb955095 (diff)
downloadhdf5-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/h5repack/h5repack_copy.c')
-rw-r--r--tools/h5repack/h5repack_copy.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c
index e8d0f90..1782502 100644
--- a/tools/h5repack/h5repack_copy.c
+++ b/tools/h5repack/h5repack_copy.c
@@ -186,7 +186,6 @@ int do_copy_objects(hid_t fidin,
hsize_t dims[H5S_MAX_RANK];/* dimensions of dataset */
hsize_t dsize_in; /* input dataset size before filter */
hsize_t dsize_out; /* output dataset size after filter */
- int next; /* external files */
int apply_s; /* flag for apply filter to small dataset sizes */
int apply_f; /* flag for apply filter to return error on H5Dcreate */
double per; /* percent utilization of storage */
@@ -303,18 +302,7 @@ int do_copy_objects(hid_t fidin,
if ((msize=H5Tget_size(wtype_id))==0)
goto error;
-
- /*-------------------------------------------------------------------------
- * check for external files
- *-------------------------------------------------------------------------
- */
- if ((next=H5Pget_external_count (dcpl_id))<0)
- goto error;
-
- if (next)
- fprintf(stderr," <warning: %s has external files, ignoring read...>\n",
- travt->objs[i].name );
-
+
/*-------------------------------------------------------------------------
* check if the dataset creation property list has filters that
* are not registered in the current configuration
@@ -322,7 +310,7 @@ int do_copy_objects(hid_t fidin,
* 2) the internal filters might be turned off
*-------------------------------------------------------------------------
*/
- if (next==0 && h5tools_canreadf((travt->objs[i].name),dcpl_id)==1)
+ if (h5tools_canreadf((travt->objs[i].name),dcpl_id)==1)
{
apply_s=1;
apply_f=1;