diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2004-07-22 14:27:37 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2004-07-22 14:27:37 (GMT) |
| commit | 2e6374407848d3c3a7b6a572e62ee88f4f18e8d0 (patch) | |
| tree | e7202aee3e87bf423bae3a008e0875e579e257fc /src/H5Zszip.c | |
| parent | 5bae554343a48a7c30d8d8908090e9f47ab72a14 (diff) | |
| download | hdf5-2e6374407848d3c3a7b6a572e62ee88f4f18e8d0.zip hdf5-2e6374407848d3c3a7b6a572e62ee88f4f18e8d0.tar.gz hdf5-2e6374407848d3c3a7b6a572e62ee88f4f18e8d0.tar.bz2 | |
[svn-r8927] Purpose:
Code cleanup
Description:
Clean up various recent changes a little.
Platforms tested:
FreeBSD 4.10 (sleipnir)
Too minor to require h5committest
Diffstat (limited to 'src/H5Zszip.c')
| -rw-r--r-- | src/H5Zszip.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/H5Zszip.c b/src/H5Zszip.c index 0ea7423..71abb54 100644 --- a/src/H5Zszip.c +++ b/src/H5Zszip.c @@ -148,14 +148,14 @@ H5Z_can_apply_szip(hid_t dcpl_id, hid_t type_id, hid_t space_id) /* Check the pixels per block against the 'scanline' size */ if(scanline<cd_values[H5Z_SZIP_PARM_PPB]) { - /* Get number of elements for the dataspace; use - total number of elements in the chunk to define the new 'scanline' size */ - if ((npoints=H5Sget_simple_extent_npoints(space_id))<0) - HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "unable to get number of points in the dataspace") - if(npoints<cd_values[H5Z_SZIP_PARM_PPB]) - HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FALSE, "pixels per block greater than total number of elements in the chunk") - scanline = MIN((cd_values[H5Z_SZIP_PARM_PPB] * SZ_MAX_BLOCKS_PER_SCANLINE), npoints); - goto done; + /* Get number of elements for the dataspace; use + total number of elements in the chunk to define the new 'scanline' size */ + if ((npoints=H5Sget_simple_extent_npoints(space_id))<0) + HGOTO_ERROR(H5E_PLINE, H5E_CANTGET, FAIL, "unable to get number of points in the dataspace") + if(npoints<cd_values[H5Z_SZIP_PARM_PPB]) + HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FALSE, "pixels per block greater than total number of elements in the chunk") + scanline = MIN((cd_values[H5Z_SZIP_PARM_PPB] * SZ_MAX_BLOCKS_PER_SCANLINE), npoints); + HGOTO_DONE(TRUE); } |