diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2002-04-17 18:49:49 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2002-04-17 18:49:49 (GMT) |
| commit | 4433c857661d50e748788afcbd862a12133ce756 (patch) | |
| tree | 29b6d55263e14006c1471e174fc1e79f5a2680b6 /src/H5D.c | |
| parent | 67d22cb484f9d81cdef578deceb4a8ee5046a88b (diff) | |
| download | hdf5-4433c857661d50e748788afcbd862a12133ce756.zip hdf5-4433c857661d50e748788afcbd862a12133ce756.tar.gz hdf5-4433c857661d50e748788afcbd862a12133ce756.tar.bz2 | |
[svn-r5195] Purpose:
Code cleanup
Description:
Got rid of the "H5T_BKG_TEMP" setting that was used internally to the
library, since temporary background buffers are now handled by the
individual conversion routines instead of in a global background buffer.
No APIs were changed or affected by this.
Platforms tested:
FreeBSD 4.5 (sleipnir)
Diffstat (limited to 'src/H5D.c')
| -rw-r--r-- | src/H5D.c | 15 |
1 files changed, 3 insertions, 12 deletions
@@ -2547,7 +2547,7 @@ printf("%s: check 2.0, src_type_size=%d, dst_type_size=%d, target_size=%d, min_e #endif /* QAK */ #endif /* QAK */ - if (H5T_BKG_YES==need_bkg) { + if (need_bkg) { #ifdef H5S_DEBUG H5_timer_begin(&timer); #endif @@ -2560,10 +2560,7 @@ printf("%s: check 2.0, src_type_size=%d, dst_type_size=%d, target_size=%d, min_e #endif if (n!=smine_nelmts) HGOTO_ERROR (H5E_IO, H5E_READERROR, FAIL, "mem gather failed"); - } else if (need_bkg) { - assert((request_nelmts*dst_type_size)==(hsize_t)((size_t)(request_nelmts*dst_type_size))); /*check for overflow*/ - HDmemset(bkg_buf, 0, (size_t)(request_nelmts*dst_type_size)); - } + } /* end if */ #ifdef QAK printf("%s: check 7.0\n",FUNC); @@ -3058,7 +3055,7 @@ printf("%s: check 2.0, src_type_size=%d, dst_type_size=%d, target_size=%d\n",FUN printf("%s: check 6.0, tconv_buf=%p, *tconv_buf=%p\n",FUNC,tconv_buf,*(char **)tconv_buf); #endif - if (H5T_BKG_YES==need_bkg) { + if (need_bkg) { #ifdef QAK printf("%s: check 6.1, need_bkg=%d\n",FUNC,(int)need_bkg); #endif @@ -3077,12 +3074,6 @@ printf("%s: check 2.0, src_type_size=%d, dst_type_size=%d, target_size=%d\n",FUN #endif if (n!=smine_nelmts) HGOTO_ERROR (H5E_IO, H5E_WRITEERROR, FAIL, "file gather failed"); - } else if (need_bkg) { -#ifdef QAK - printf("%s: check 6.2, need_bkg=%d\n",FUNC,(int)need_bkg); -#endif - H5_CHECK_OVERFLOW(request_nelmts*dst_type_size,hsize_t,size_t); - HDmemset(bkg_buf, 0, (size_t)(request_nelmts*dst_type_size)); } /* end if */ /* |