summaryrefslogtreecommitdiffstats
path: root/src/H5Ofill.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2009-12-17 22:38:50 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2009-12-17 22:38:50 (GMT)
commit80385ab8dd171a8410bd8e7dfce0e6b679c3fc97 (patch)
treef3ed5401e74382b5f316a7057c091d6c336ef0a1 /src/H5Ofill.c
parent0db6255d805b625f3fbbbb0b0893032af229d234 (diff)
downloadhdf5-80385ab8dd171a8410bd8e7dfce0e6b679c3fc97.zip
hdf5-80385ab8dd171a8410bd8e7dfce0e6b679c3fc97.tar.gz
hdf5-80385ab8dd171a8410bd8e7dfce0e6b679c3fc97.tar.bz2
[svn-r18032] Description:
Bring r18031 from trunk to 1.8 branch: Bring r18030 from merge_metadata_journaling branch to trunk: Bring "brush clearing" changes (whitespace & style issues, mostly) from metadata_journaling branch to the "merging" branch, to converge the trunk and the metadata_journaling branch. Also, some other minor cleanups along the way. Tested on: FreeBSD/32 6.3 (duty) in debug mode FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode (h5committested on trunk)
Diffstat (limited to 'src/H5Ofill.c')
-rw-r--r--src/H5Ofill.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Ofill.c b/src/H5Ofill.c
index d133a0a..f403b81 100644
--- a/src/H5Ofill.c
+++ b/src/H5Ofill.c
@@ -556,7 +556,7 @@ H5O_fill_copy(const void *_src, void *_dst)
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, NULL, "datatype conversion failed")
} /* end if */
@@ -564,7 +564,7 @@ H5O_fill_copy(const void *_src, void *_dst)
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 */
} /* end if */