diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-20 20:20:35 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-20 20:20:35 (GMT) |
| commit | 8a27e4f4a6a624931ba0b86444e8f21e8d735888 (patch) | |
| tree | 9d82d6116ce2eb20be8f9a45ce468fd717ea2215 /src/H5D.c | |
| parent | 97f8b83e2d35fe3be71217977b339077cbbd46d8 (diff) | |
| download | hdf5-8a27e4f4a6a624931ba0b86444e8f21e8d735888.zip hdf5-8a27e4f4a6a624931ba0b86444e8f21e8d735888.tar.gz hdf5-8a27e4f4a6a624931ba0b86444e8f21e8d735888.tar.bz2 | |
[svn-r18601] Description:
Bring r18581:18600 from trunk to revise_chunks branch.
Tested on:
Mac OS X/32 10.6.3 (amazon) w/debug
(h5committest not required on this branch)
Diffstat (limited to 'src/H5D.c')
| -rw-r--r-- | src/H5D.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -622,7 +622,7 @@ H5Dget_create_plist(hid_t dset_id) H5I_dec_ref(src_id, FALSE); H5I_dec_ref(dst_id, FALSE); if(bkg_buf) - (void)H5FL_BLK_FREE(type_conv, bkg_buf); + bkg_buf = H5FL_BLK_FREE(type_conv, bkg_buf); HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, FAIL, "datatype conversion failed") } /* end if */ @@ -630,7 +630,7 @@ H5Dget_create_plist(hid_t dset_id) H5I_dec_ref(src_id, FALSE); H5I_dec_ref(dst_id, FALSE); if(bkg_buf) - (void)H5FL_BLK_FREE(type_conv, bkg_buf); + bkg_buf = H5FL_BLK_FREE(type_conv, bkg_buf); } /* end if */ } /* end if */ @@ -1038,9 +1038,9 @@ done: HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release dataspace") } /* end if */ if(vlen_bufsize.fl_tbuf != NULL) - (void)H5FL_BLK_FREE(vlen_fl_buf, vlen_bufsize.fl_tbuf); + vlen_bufsize.fl_tbuf = H5FL_BLK_FREE(vlen_fl_buf, vlen_bufsize.fl_tbuf); if(vlen_bufsize.vl_tbuf != NULL) - (void)H5FL_BLK_FREE(vlen_vl_buf, vlen_bufsize.vl_tbuf); + vlen_bufsize.vl_tbuf = H5FL_BLK_FREE(vlen_vl_buf, vlen_bufsize.vl_tbuf); if(vlen_bufsize.xfer_pid > 0) { if(H5I_dec_ref(vlen_bufsize.xfer_pid, FALSE) < 0) HDONE_ERROR(H5E_DATASET, H5E_CANTDEC, FAIL, "unable to decrement ref count on property list") |