diff options
Diffstat (limited to 'src/H5Oname.c')
| -rw-r--r-- | src/H5Oname.c | 59 |
1 files changed, 28 insertions, 31 deletions
diff --git a/src/H5Oname.c b/src/H5Oname.c index 6c4f76f..a710944 100644 --- a/src/H5Oname.c +++ b/src/H5Oname.c @@ -5,12 +5,10 @@ * * * This file is part of HDF5. The full HDF5 copyright notice, including * * terms governing use, modification, and redistribution, is contained in * - * the files COPYING and Copyright.html. COPYING can be found at the root * - * of the source code distribution tree; Copyright.html can be found at the * - * root level of an installed copy of the electronic HDF5 document set and * - * is linked from the top-level documents page. It can also be found at * - * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * - * access to either file, you may request a copy from help@hdfgroup.org. * + * the COPYING file, which can be found at the root of the source code * + * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. * + * If you do not have access to either file, you may request a copy from * + * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*------------------------------------------------------------------------- @@ -34,14 +32,14 @@ /* PRIVATE PROTOTYPES */ -static void *H5O_name_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, - unsigned mesg_flags, unsigned *ioflags, const uint8_t *p); +static void *H5O__name_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags, + unsigned *ioflags, size_t p_size, const uint8_t *p); static herr_t H5O_name_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg); static void *H5O_name_copy(const void *_mesg, void *_dest); static size_t H5O_name_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg); -static herr_t H5O_name_reset(void *_mesg); -static herr_t H5O_name_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE * stream, - int indent, int fwidth); +static herr_t H5O__name_reset(void *_mesg); +static herr_t H5O__name_debug(H5F_t *f, const void *_mesg, FILE * stream, + int indent, int fwidth); /* This message derives from H5O message class */ const H5O_msg_class_t H5O_MSG_NAME[1] = {{ @@ -49,11 +47,11 @@ const H5O_msg_class_t H5O_MSG_NAME[1] = {{ "name", /*message name for debugging */ sizeof(H5O_name_t), /*native message size */ 0, /* messages are sharable? */ - H5O_name_decode, /*decode message */ + H5O__name_decode, /*decode message */ H5O_name_encode, /*encode message */ H5O_name_copy, /*copy the native value */ H5O_name_size, /*raw message size */ - H5O_name_reset, /*free internal memory */ + H5O__name_reset, /*free internal memory */ NULL, /* free method */ NULL, /* file delete method */ NULL, /* link method */ @@ -64,12 +62,12 @@ const H5O_msg_class_t H5O_MSG_NAME[1] = {{ NULL, /* post copy native value to file */ NULL, /* get creation index */ NULL, /* set creation index */ - H5O_name_debug /*debug the message */ + H5O__name_debug /*debug the message */ }}; /*------------------------------------------------------------------------- - * Function: H5O_name_decode + * Function: H5O__name_decode * * Purpose: Decode a name message and return a pointer to a new * native message struct. @@ -85,13 +83,14 @@ const H5O_msg_class_t H5O_MSG_NAME[1] = {{ *------------------------------------------------------------------------- */ static void * -H5O_name_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh, - unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags, const uint8_t *p) +H5O__name_decode(H5F_t H5_ATTR_UNUSED *f, H5O_t H5_ATTR_UNUSED *open_oh, + unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags, + size_t H5_ATTR_UNUSED p_size, const uint8_t *p) { H5O_name_t *mesg; void *ret_value = NULL; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_STATIC /* check args */ HDassert(f); @@ -107,13 +106,12 @@ H5O_name_decode(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ ret_value = mesg; done: - if(NULL == ret_value) { + if(NULL == ret_value) if(mesg) mesg = (H5O_name_t *)H5MM_xfree(mesg); - } /* end if */ FUNC_LEAVE_NOAPI(ret_value) -} /* end H5O_name_decode() */ +} /* end H5O__name_decode() */ /*------------------------------------------------------------------------- @@ -239,7 +237,7 @@ H5O_name_size(const H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shar /*------------------------------------------------------------------------- - * Function: H5O_name_reset + * Function: H5O__name_reset * * Purpose: Frees internal pointers and resets the message to an * initial state. @@ -250,16 +248,14 @@ H5O_name_size(const H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shar * matzke@llnl.gov * Aug 12 1997 * - * Modifications: - * *------------------------------------------------------------------------- */ static herr_t -H5O_name_reset(void *_mesg) +H5O__name_reset(void *_mesg) { H5O_name_t *mesg = (H5O_name_t *) _mesg; - FUNC_ENTER_NOAPI_NOINIT_NOERR + FUNC_ENTER_STATIC_NOERR /* check args */ HDassert(mesg); @@ -268,11 +264,11 @@ H5O_name_reset(void *_mesg) mesg->s = (char *)H5MM_xfree(mesg->s); FUNC_LEAVE_NOAPI(SUCCEED) -} /* end H5O_name_reset() */ +} /* end H5O__name_reset() */ /*------------------------------------------------------------------------- - * Function: H5O_name_debug + * Function: H5O__name_debug * * Purpose: Prints debugging info for the message. * @@ -287,8 +283,8 @@ H5O_name_reset(void *_mesg) *------------------------------------------------------------------------- */ static herr_t -H5O_name_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void *_mesg, FILE *stream, - int indent, int fwidth) +H5O__name_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE *stream, + int indent, int fwidth) { const H5O_name_t *mesg = (const H5O_name_t *)_mesg; @@ -306,4 +302,5 @@ H5O_name_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const void mesg->s); FUNC_LEAVE_NOAPI(SUCCEED) -} +} /* end H5O__name_debug() */ + |