diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2003-01-18 13:17:33 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2003-01-18 13:17:33 (GMT) |
| commit | 04f2fe8ff8ca098a88d769deaa5b663a629ddecc (patch) | |
| tree | 2bf5d9a5734c1aa7f9bd7bd414e5e0c5411bc8fd /src/H5Shyper.c | |
| parent | 628c3cd5040ba5df24f945494ea5c9ac81bd7692 (diff) | |
| download | hdf5-04f2fe8ff8ca098a88d769deaa5b663a629ddecc.zip hdf5-04f2fe8ff8ca098a88d769deaa5b663a629ddecc.tar.gz hdf5-04f2fe8ff8ca098a88d769deaa5b663a629ddecc.tar.bz2 | |
[svn-r6301] Purpose:
Code cleanup & bug fix
Description:
Cleanup another set of warnings on Windows and also fix mis-placed assertion
that caused the daily tests to fail.
Platforms tested:
IRIX64 6.5 (modi4) w/-n32
Diffstat (limited to 'src/H5Shyper.c')
| -rw-r--r-- | src/H5Shyper.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/H5Shyper.c b/src/H5Shyper.c index 4ed0b2d..87f282e 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -5564,11 +5564,12 @@ H5S_hyper_get_seq_list_opt(const H5S_t *space,H5S_sel_iter_t *iter, size_t leftover; /* The number of elements left over from the last sequence */ /* Calculate the number of elements left in the sequence */ - H5_CHECK_OVERFLOW( tdiminfo[fast_dim].block-(iter->hyp.off[fast_dim]-tdiminfo[fast_dim].start) ,hsize_t,size_t); - if(tdiminfo[fast_dim].stride==1) - leftover=(size_t)(tdiminfo[fast_dim].block-(iter->hyp.off[fast_dim]-tdiminfo[fast_dim].start)); - else - leftover=(size_t)(tdiminfo[fast_dim].block-((iter->hyp.off[fast_dim]-tdiminfo[fast_dim].start)%tdiminfo[fast_dim].stride)); + if(tdiminfo[fast_dim].stride==1) { + H5_ASSIGN_OVERFLOW(leftover, tdiminfo[fast_dim].block-(iter->hyp.off[fast_dim]-tdiminfo[fast_dim].start) ,hsize_t,size_t); + } /* end if */ + else { + H5_ASSIGN_OVERFLOW(leftover, tdiminfo[fast_dim].block-((iter->hyp.off[fast_dim]-tdiminfo[fast_dim].start)%tdiminfo[fast_dim].stride) ,hsize_t,size_t); + } /* end else */ /* Make certain that we don't write too many */ actual_elem=MIN(leftover,io_left); |