diff options
| author | James Laird <jlaird@hdfgroup.org> | 2007-01-22 21:03:24 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2007-01-22 21:03:24 (GMT) |
| commit | 681d9231cf2fb1f01ef84c14285195c059d64a16 (patch) | |
| tree | 5248154a2267ee64b89905933f1d14f5fe27ffd0 /src | |
| parent | 0b49961db746a9ef67ae803a9c889bc10caf6b86 (diff) | |
| download | hdf5-681d9231cf2fb1f01ef84c14285195c059d64a16.zip hdf5-681d9231cf2fb1f01ef84c14285195c059d64a16.tar.gz hdf5-681d9231cf2fb1f01ef84c14285195c059d64a16.tar.bz2 | |
[svn-r13166] Fixed bug in H5Ocopy where shared attributes that were deleted during H5Ocopy
would become shared NULL messages (oops!).
Added a test for this case.
Also fixed the #define that caused errors on Windows (and probably other
platforms). This may fix the Daily Test error.
Tested on Windows, smirom, kagiso, and juniper.
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Ocopy.c | 4 | ||||
| -rw-r--r-- | src/H5Pdcpl.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c index 8c263f5..f51533b 100644 --- a/src/H5Ocopy.c +++ b/src/H5Ocopy.c @@ -478,8 +478,10 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */, /* If we're preserving deleted messages, set their types to 'NULL' * in the destination. */ - if(cpy_info->preserve_null && deleted[mesgno]) + if(cpy_info->preserve_null && deleted[mesgno]) { mesg_dst->type = H5O_MSG_NULL; + mesg_dst->flags = 0; + } /* Check for shared message to operate on */ /* (Use destination message, in case the message has been removed (i.e diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c index 898700b..7306fd4 100644 --- a/src/H5Pdcpl.c +++ b/src/H5Pdcpl.c @@ -76,7 +76,7 @@ #define H5D_CRT_EXT_FILE_LIST_CMP H5P_dcrt_ext_file_list_cmp /* Definitions for data filter pipeline */ #define H5D_CRT_DATA_PIPELINE_SIZE sizeof(H5O_pline_t) -#define H5D_CRT_DATA_PIPELINE_DEF {0, 0, NULL, {0, {{NULL, HADDR_UNDEF, FALSE}}}} +#define H5D_CRT_DATA_PIPELINE_DEF {{0, {{NULL, HADDR_UNDEF, FALSE}}}, 0, 0, NULL} #define H5D_CRT_DATA_PIPELINE_CMP H5P_dcrt_data_pipeline_cmp |