diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-30 19:05:39 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-30 19:05:39 (GMT) |
commit | c7cb8e6adc4c980d7e3e83fa06d0ea95a23fb00b (patch) | |
tree | a1e316063fb77793ab94ad890f33eb99d0740fc9 /src/H5Aint.c | |
parent | 9e9f96879d760850794a191988a205fbf1a3957d (diff) | |
download | hdf5-c7cb8e6adc4c980d7e3e83fa06d0ea95a23fb00b.zip hdf5-c7cb8e6adc4c980d7e3e83fa06d0ea95a23fb00b.tar.gz hdf5-c7cb8e6adc4c980d7e3e83fa06d0ea95a23fb00b.tar.bz2 |
[svn-r15300] Description:
Bring revisions 15210:15289 from the trunk into the metadata journaling branch.
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5Aint.c')
-rw-r--r-- | src/H5Aint.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/H5Aint.c b/src/H5Aint.c index c08c6cf..71b6689 100644 --- a/src/H5Aint.c +++ b/src/H5Aint.c @@ -197,8 +197,8 @@ H5A_compact_build_table(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_index_t idx_type, udata.dxpl_id = dxpl_id; udata.atable = atable; udata.curr_attr = 0; - udata.bogus_crt_idx = (oh->version == H5O_VERSION_1 || - !(oh->flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED)) ? TRUE : FALSE; + udata.bogus_crt_idx = (hbool_t)((oh->version == H5O_VERSION_1 || + !(oh->flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED)) ? TRUE : FALSE); /* Iterate over existing attributes, checking for attribute with same name */ op.op_type = H5O_MESG_OP_LIB; @@ -564,6 +564,13 @@ H5A_attr_iterate_table(const H5A_attr_table_t *atable, hsize_t skip, case H5A_ATTR_OP_LIB: /* Call the library's callback */ ret_value = (attr_op->u.lib_op)(&(atable->attrs[u]), op_data); + break; + + default: + HDassert("unknown attribute op type" && 0); +#ifdef NDEBUG + HGOTO_ERROR(H5E_ATTR, H5E_UNSUPPORTED, FAIL, "unsupported attribute op type") +#endif /* NDEBUG */ } /* end switch */ /* Increment the number of entries passed through */ @@ -649,7 +656,7 @@ H5A_get_ainfo(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_ainfo_t *ainfo) HDassert(oh); /* Retrieve the "attribute info" structure */ - if((ret_value = H5O_msg_read_real(f, dxpl_id, oh, H5O_AINFO_ID, ainfo))) { + if((ret_value = (H5O_ainfo_t *)H5O_msg_read_real(f, dxpl_id, oh, H5O_AINFO_ID, ainfo))) { /* Check if we don't know how many attributes there are */ if(ret_value->nattrs == HSIZET_MAX) { /* Check if we are using "dense" attribute storage */ |