diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-08-02 21:54:34 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-08-02 21:54:34 (GMT) |
| commit | 60d3b3091764c2ec9bede45aeacb6b2da1fa22d8 (patch) | |
| tree | 31cc6c48f0f4976d10e4a7b9d726bb4222f2c0f3 /src/H5Ocopy.c | |
| parent | bbaf4fb19b452e093bde1616df351dfa34f30840 (diff) | |
| parent | cc7ae0a7fe9451062a1fb370ae2a36c0789a60e3 (diff) | |
| download | hdf5-60d3b3091764c2ec9bede45aeacb6b2da1fa22d8.zip hdf5-60d3b3091764c2ec9bede45aeacb6b2da1fa22d8.tar.gz hdf5-60d3b3091764c2ec9bede45aeacb6b2da1fa22d8.tar.bz2 | |
[svn-r22623] merge from tunk
Diffstat (limited to 'src/H5Ocopy.c')
| -rw-r--r-- | src/H5Ocopy.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c index aeaad1a..98d8d95 100644 --- a/src/H5Ocopy.c +++ b/src/H5Ocopy.c @@ -382,7 +382,7 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/, void *cpy_udata = NULL; /* User data for passing to message callbacks */ uint64_t dst_oh_size; /* Total size of the destination OH */ size_t dst_oh_null; /* Size of the null message to add to destination OH */ - unsigned dst_oh_gap; /* Size of the gap in chunk #0 of destination OH */ + size_t dst_oh_gap; /* Size of the gap in chunk #0 of destination OH */ uint8_t *current_pos; /* Current position in destination image */ size_t msghdr_size; herr_t ret_value = SUCCEED; @@ -669,14 +669,14 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/, /* Compute space for messages. */ dst_oh_size = 0; for(mesgno = 0; mesgno < oh_dst->nmesgs; mesgno++) { - dst_oh_size += H5O_SIZEOF_MSGHDR_OH(oh_dst); + dst_oh_size += (uint64_t)H5O_SIZEOF_MSGHDR_OH(oh_dst); dst_oh_size += oh_dst->mesg[mesgno].raw_size; } /* end for */ /* Check if we need to determine correct value for chunk #0 size bits */ if(oh_dst->version > H5O_VERSION_1) { /* Reset destination object header's "chunk 0 size" flags */ - oh_dst->flags &= ~H5O_HDR_CHUNK0_SIZE; + oh_dst->flags = (uint8_t)(oh_dst->flags & ~H5O_HDR_CHUNK0_SIZE); /* Determine correct value for chunk #0 size bits */ if(dst_oh_size > 4294967295) @@ -785,7 +785,7 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/, /* Check if we need to add a NULL message to this header */ if(dst_oh_null > 0) { - unsigned null_idx; /* Index of new NULL message */ + size_t null_idx; /* Index of new NULL message */ /* Make sure we have enough space for new NULL message */ if(oh_dst->nmesgs + 1 > oh_dst->alloc_nmesgs) @@ -902,7 +902,7 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/, /* Insert destination object header in cache */ if(H5AC_insert_entry(oloc_dst->file, dxpl_id, H5AC_OHDR, oloc_dst->addr, oh_dst, H5AC__NO_FLAGS_SET) < 0) - HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "unable to cache object header") + HGOTO_ERROR_TAG(H5E_OHDR, H5E_CANTINSERT, FAIL, "unable to cache object header") oh_dst = NULL; inserted = TRUE; @@ -1453,7 +1453,7 @@ H5O_copy_free_comm_dt_cb(void *item, void *_key, void UNUSED *op_data) haddr_t *addr = (haddr_t *)item; H5O_copy_search_comm_dt_key_t *key = (H5O_copy_search_comm_dt_key_t *)_key; - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_NOAPI_NOINIT_NOERR HDassert(addr); HDassert(key); @@ -1489,7 +1489,7 @@ H5O_copy_comm_dt_cmp(const void *_key1, const void *_key2) const H5O_copy_search_comm_dt_key_t *key2 = (const H5O_copy_search_comm_dt_key_t *)_key2; int ret_value = 0; - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_NOAPI_NOINIT_NOERR /* Check fileno. It is unlikely to be different so check if they are equal * first so only one comparison needs to be made. */ |