diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-15 18:22:32 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-15 18:22:32 (GMT) |
commit | 597e1d894ed72095f1d12217d3343ee2e78cbefd (patch) | |
tree | 581d98bdb4c7f62b0f13d599af4a2acca4566c02 /src/H5Defl.c | |
parent | fb651812e6132d65d1f586488ef6fe267da7348d (diff) | |
download | hdf5-597e1d894ed72095f1d12217d3343ee2e78cbefd.zip hdf5-597e1d894ed72095f1d12217d3343ee2e78cbefd.tar.gz hdf5-597e1d894ed72095f1d12217d3343ee2e78cbefd.tar.bz2 |
[svn-r18566] Description:
Bring r18564 & r18565 from trunk to 1.8 branch: clean up compiler warnings
and whitespace issues.
Tested on:
Mac OS X/32 10.6.3 (amazon)
(too minor to require h5committest)
Diffstat (limited to 'src/H5Defl.c')
-rw-r--r-- | src/H5Defl.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/H5Defl.c b/src/H5Defl.c index 8b2da6a..18750c8 100644 --- a/src/H5Defl.c +++ b/src/H5Defl.c @@ -269,16 +269,16 @@ H5D_efl_read(const H5O_efl_t *efl, haddr_t addr, size_t size, uint8_t *buf) } /* Read the data */ - while (size) { + while(size) { HDassert(buf); - if (u>=efl->nused) - HGOTO_ERROR (H5E_EFL, H5E_OVERFLOW, FAIL, "read past logical end of file") - if (H5F_OVERFLOW_HSIZET2OFFT (efl->slot[u].offset+skip)) - HGOTO_ERROR (H5E_EFL, H5E_OVERFLOW, FAIL, "external file address overflowed") - if ((fd=HDopen (efl->slot[u].name, O_RDONLY, 0))<0) - HGOTO_ERROR (H5E_EFL, H5E_CANTOPENFILE, FAIL, "unable to open external raw data file") - if (HDlseek (fd, (off_t)(efl->slot[u].offset+skip), SEEK_SET)<0) - HGOTO_ERROR (H5E_EFL, H5E_SEEKERROR, FAIL, "unable to seek in external raw data file") + if(u>=efl->nused) + HGOTO_ERROR(H5E_EFL, H5E_OVERFLOW, FAIL, "read past logical end of file") + if(H5F_OVERFLOW_HSIZET2OFFT (efl->slot[u].offset + skip)) + HGOTO_ERROR(H5E_EFL, H5E_OVERFLOW, FAIL, "external file address overflowed") + if((fd = HDopen(efl->slot[u].name, O_RDONLY, 0)) < 0) + HGOTO_ERROR(H5E_EFL, H5E_CANTOPENFILE, FAIL, "unable to open external raw data file") + if(HDlseek(fd, (off_t)(efl->slot[u].offset + skip), SEEK_SET) < 0) + HGOTO_ERROR(H5E_EFL, H5E_SEEKERROR, FAIL, "unable to seek in external raw data file") #ifndef NDEBUG tempto_read = MIN(efl->slot[u].size-skip,(hsize_t)size); H5_CHECK_OVERFLOW(tempto_read,hsize_t,size_t); |