diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-12-14 18:25:50 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-12-14 18:25:50 (GMT) |
| commit | ff548450c36063c1d9244db46ed872051365c68d (patch) | |
| tree | 0ab2b097f301eaa1718611ceddef450049333a65 | |
| parent | 0a54d7e9d0e71327ac624532fd57eba2bcaf28da (diff) | |
| download | hdf5-ff548450c36063c1d9244db46ed872051365c68d.zip hdf5-ff548450c36063c1d9244db46ed872051365c68d.tar.gz hdf5-ff548450c36063c1d9244db46ed872051365c68d.tar.bz2 | |
[svn-r28641] Description:
Minor code cleanups during review/review/merge of branch
Tested on:
MacOSX/64 10.11.2 (amazon) w/serial & parallel
(h5committest not required on this branch)
| -rw-r--r-- | src/H5Dchunk.c | 15 | ||||
| -rw-r--r-- | src/H5Dint.c | 6 | ||||
| -rw-r--r-- | src/H5Olayout.c | 2 |
3 files changed, 7 insertions, 16 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index 194048b..990a257 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -4026,10 +4026,8 @@ H5D__chunk_allocate(const H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite, && edge_chunk_scaled[i] == max_unalloc[i] && scaled[i] < edge_chunk_scaled[i]) { nunfilt_edge_chunk_dims--; - if(should_fill && nunfilt_edge_chunk_dims == 0 - && !fb_info.has_vlen_fill_type) { - HDassert(!H5D__chunk_is_partial_edge_chunk(scaled, space_ndims, - space_dim, chunk_dim)); + if(should_fill && nunfilt_edge_chunk_dims == 0 && !fb_info.has_vlen_fill_type) { + HDassert(!H5D__chunk_is_partial_edge_chunk(scaled, space_ndims, space_dim, chunk_dim)); fill_buf = &fb_info.fill_buf; chunk_size = orig_chunk_size; } /* end if */ @@ -4037,14 +4035,11 @@ H5D__chunk_allocate(const H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite, } /* end if */ else { /* Check if we just entered the edge in this dimension */ - if(unfilt_edge_chunk_dim[i] && scaled[i] - == edge_chunk_scaled[i]) { + if(unfilt_edge_chunk_dim[i] && scaled[i] == edge_chunk_scaled[i]) { HDassert(edge_chunk_scaled[i] == max_unalloc[i]); nunfilt_edge_chunk_dims++; - if(should_fill && nunfilt_edge_chunk_dims == 1 - && !fb_info.has_vlen_fill_type) { - HDassert(H5D__chunk_is_partial_edge_chunk(scaled, space_ndims, - space_dim, chunk_dim)); + if(should_fill && nunfilt_edge_chunk_dims == 1 && !fb_info.has_vlen_fill_type) { + HDassert(H5D__chunk_is_partial_edge_chunk(scaled, space_ndims, space_dim, chunk_dim)); fill_buf = &unfilt_fill_buf; chunk_size = layout->u.chunk.size; } /* end if */ diff --git a/src/H5Dint.c b/src/H5Dint.c index de3e26a..29ba0a3 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -2900,13 +2900,9 @@ H5D__format_convert(H5D_t *dataset, hid_t dxpl_id) HGOTO_ERROR(H5E_DATASET, H5E_CANTPIN, FAIL, "unable to pin dataset object header") /* Append the new layout message to the object header */ - if(H5O_msg_append_oh(dataset->oloc.file, dxpl_id, oh, H5O_LAYOUT_ID, 0, 0, &newlayout) < 0) + if(H5O_msg_append_oh(dataset->oloc.file, dxpl_id, oh, H5O_LAYOUT_ID, 0, H5O_UPDATE_TIME, &newlayout) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to update old fill value header message") - /* Update the layout on disk, if it's been changed */ - if(H5D__layout_oh_write(dataset, dxpl_id, oh, H5O_UPDATE_TIME) < 0) - HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to update layout/pline/efl info") - done: /* Release pointer to object header */ if(oh != NULL) diff --git a/src/H5Olayout.c b/src/H5Olayout.c index 3a94df3..a73a4d9 100644 --- a/src/H5Olayout.c +++ b/src/H5Olayout.c @@ -641,7 +641,7 @@ H5O__layout_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, if(mesg->u.chunk.flags & H5O_LAYOUT_CHUNK_SINGLE_INDEX_WITH_FILTER) { H5F_ENCODE_LENGTH(f, p, mesg->storage.u.chunk.u.single.nbytes); UINT32ENCODE(p, mesg->storage.u.chunk.u.single.filter_mask); - } + } /* end if */ break; case H5D_CHUNK_IDX_FARRAY: |