diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2006-10-23 20:40:14 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2006-10-23 20:40:14 (GMT) |
| commit | e40557304fcfc662bb1a445abca516ee4b246d94 (patch) | |
| tree | c9f1692443a62e0c481c7c0278e39d7b83d1b419 /src/H5Dcontig.c | |
| parent | 1062b4f9d7080a3e439df7d3d527aee43f96d085 (diff) | |
| download | hdf5-e40557304fcfc662bb1a445abca516ee4b246d94.zip hdf5-e40557304fcfc662bb1a445abca516ee4b246d94.tar.gz hdf5-e40557304fcfc662bb1a445abca516ee4b246d94.tar.bz2 | |
[svn-r12803] Description:
Finish new version of the I/O pipeline message, which is much smaller than
the previous version. This version is used with the "use the latest version
of the format" flag.
Closed several memory leaks/overruns (found with valgrind).
Also, lots of compiler & formatting cleanups.
Tested on:
Linux/32 2.6 (chicago)
Linux/64 2.6 (chicago2)
Diffstat (limited to 'src/H5Dcontig.c')
| -rw-r--r-- | src/H5Dcontig.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c index 5b4b0d2..09b83ec 100644 --- a/src/H5Dcontig.c +++ b/src/H5Dcontig.c @@ -1110,9 +1110,14 @@ H5D_contig_copy(H5F_t *f_src, H5O_layout_t *layout_src, H5F_t *f_dst, is_vlen = TRUE; } /* Check for reference datatype */ - else if((H5T_get_class(dt_src, FALSE) == H5T_REFERENCE) && (f_src != f_dst)) { - /* need to fix values of reference */ - fix_ref = TRUE; + else if(H5T_get_class(dt_src, FALSE) == H5T_REFERENCE) { + /* Create datatype ID for src datatype, so it gets freed */ + if((tid_src = H5I_register(H5I_DATATYPE, dt_src)) < 0) + HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register source file datatype") + + /* Need to fix values of references when copying across files */ + if(f_src != f_dst) + fix_ref = TRUE; /* Set the number of bytes to read & write to the buffer size */ src_nbytes = dst_nbytes = mem_nbytes = buf_size; |