summaryrefslogtreecommitdiffstats
path: root/src/H5Oalloc.c
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2021-03-10 21:51:21 (GMT)
committerGitHub <noreply@github.com>2021-03-10 21:51:21 (GMT)
commitbf4399bd25eef9886dab5dcb115e2e439e3a2ac9 (patch)
treeb54cb4ef5e607a222a5589400976c0a4e06e4821 /src/H5Oalloc.c
parente5a2d01cd9e3b5fd34d265fe281f638316894f7a (diff)
downloadhdf5-bf4399bd25eef9886dab5dcb115e2e439e3a2ac9.zip
hdf5-bf4399bd25eef9886dab5dcb115e2e439e3a2ac9.tar.gz
hdf5-bf4399bd25eef9886dab5dcb115e2e439e3a2ac9.tar.bz2
Hdf5 merge issue 435 v110 (#462)
* close #195. (#196) * Update HDF5PluginMacros.cmake * Update HDF5PluginMacros.cmake * Modify temporary rpath for testing in java example scripts. (#230) * Fix undefined left shifting of negative numbers (#338) Undefined Bahavior Sanitizer errored here about left shifting negative numbers. * Update license url (#332) * Modify temporary rpath for testing in java example scripts. * Update URL in source file Copyright headers for web copy of COPYING file - src and test directories. * Fixed clang-tidy readability-misleading-indentation warnings (#427) * Fixed clang-tidy readability-misleading-indentation warnings * Reformatted src/H5Zscaleoffset.c with clang v10.0.1. Co-authored-by: Larry Knox <lrknox@hdfgroup.org> * Fixed clang-tidy readability-redundant-control-flow warnings (#428) * Fixed clang-tidy readability-redundant-control-flow warnings Just removed useless trailing return statements. * Removed blank lines from h5diffgentest.c with clang-format v10.0.1. Co-authored-by: Larry Knox <lrknox@hdfgroup.org> * Removed bad function pointer casts (#434) * Removed bad function pointer casts In one case fixed the actual function signature to be correct. * Reformat source with clang v10.0.1. Co-authored-by: Larry Knox <lrknox@hdfgroup.org> * fix block coordinate printing example (#437) Co-authored-by: H. Joe Lee <hyoklee@hdfgroup.org> Co-authored-by: Sean McBride <sean@rogue-research.com> Co-authored-by: Mike Smith <grimbough@gmail.com>
Diffstat (limited to 'src/H5Oalloc.c')
-rw-r--r--src/H5Oalloc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Oalloc.c b/src/H5Oalloc.c
index f7da32a..ca3070b 100644
--- a/src/H5Oalloc.c
+++ b/src/H5Oalloc.c
@@ -1234,10 +1234,10 @@ H5O__alloc_find_best_null(const H5O_t *oh, size_t size, size_t *mesg_idx)
/* Keep first one found */
if (found_null < 0)
found_null = (ssize_t)idx;
- else
- /* Check for better fit */
- if (oh->mesg[idx].raw_size < oh->mesg[found_null].raw_size)
+ /* Check for better fit */
+ else if (oh->mesg[idx].raw_size < oh->mesg[found_null].raw_size) {
found_null = (ssize_t)idx;
+ }
else {
/* If they are the same size, choose the one in the earliest chunk */
if (oh->mesg[idx].raw_size == oh->mesg[found_null].raw_size) {