diff options
author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-01-20 17:17:05 (GMT) |
---|---|---|
committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-01-20 17:17:05 (GMT) |
commit | aac2bb6182878e3591de390173e769bb761c83e2 (patch) | |
tree | 9e8d1da6fbb8016a4e01c2997673447fe8ca4157 /src/H5Obogus.c | |
parent | 1949c40bfddf4bea44345e0cd00baae94597f23a (diff) | |
download | hdf5-aac2bb6182878e3591de390173e769bb761c83e2.zip hdf5-aac2bb6182878e3591de390173e769bb761c83e2.tar.gz hdf5-aac2bb6182878e3591de390173e769bb761c83e2.tar.bz2 |
[svn-r25984] change the message flag H5O_MSG_FLAG_FAIL_IF_UNKNOWN to
H5O_MSG_FLAG_FAIL_IF_UNKNOWN_AND_OPEN_FOR_WRITE. Will add a new
H5O_MSG_FLAG_FAIL_IF_UNKNOWN_ALWAYS with the new avoid_truncate patch
coming later.
tested h5committest
Diffstat (limited to 'src/H5Obogus.c')
-rw-r--r-- | src/H5Obogus.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/H5Obogus.c b/src/H5Obogus.c index cee3199..d930683 100644 --- a/src/H5Obogus.c +++ b/src/H5Obogus.c @@ -87,20 +87,20 @@ const H5O_msg_class_t H5O_MSG_BOGUS[1] = {{ *------------------------------------------------------------------------- */ static void * -H5O_bogus_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh, +H5O_bogus_decode(H5F_t *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh, unsigned UNUSED mesg_flags, unsigned UNUSED *ioflags, const uint8_t *p) { H5O_bogus_t *mesg = NULL; void *ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_bogus_decode) + FUNC_ENTER_NOAPI_NOINIT /* check args */ HDassert(f); HDassert(p); /* Allocate the bogus message */ - if(NULL == (mesg = H5MM_calloc(sizeof(H5O_bogus_t)))) + if(NULL == (mesg = (H5O_bogus_t *)H5MM_calloc(sizeof(H5O_bogus_t)))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") /* decode */ @@ -137,7 +137,7 @@ done: static herr_t H5O_bogus_encode(H5F_t UNUSED *f, hbool_t UNUSED disable_shared, uint8_t *p, const void UNUSED *mesg) { - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_bogus_encode) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* check args */ HDassert(f); @@ -172,7 +172,7 @@ H5O_bogus_encode(H5F_t UNUSED *f, hbool_t UNUSED disable_shared, uint8_t *p, con static size_t H5O_bogus_size(const H5F_t UNUSED *f, hbool_t UNUSED disable_shared, const void UNUSED *mesg) { - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_bogus_size) + FUNC_ENTER_NOAPI_NOINIT_NOERR FUNC_LEAVE_NOAPI(4) } /* end H5O_bogus_size() */ @@ -199,7 +199,7 @@ H5O_bogus_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE * { const H5O_bogus_t *mesg = (const H5O_bogus_t *)_mesg; - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_bogus_debug) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* check args */ HDassert(f); |