Merge branch 'develop' into feature/coding_standardsfeature/coding_standards

1 files changed, 75 insertions, 89 deletions

diff --git a/src/H5Obogus.c b/src/H5Obogus.c
index f3cca0f..e311cd5 100644
--- a/src/H5Obogus.c
+++ b/src/H5Obogus.c
@@ -6,7 +6,7 @@
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
  * 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.  *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -15,7 +15,7 @@
  *
  * Created:             H5Obogus.c
  *                      Jan 21 2003
- *                      Quincey Koziol <koziol@ncsa.uiuc.edu>
+ *                      Quincey Koziol
  *
  * Purpose:             "bogus" message.  This message is guaranteed to never
  *                      be found in a valid HDF5 file and is only used to
@@ -26,73 +26,70 @@
  *-------------------------------------------------------------------------
  */
 
-#include "H5Omodule.h"          /* This source code file is part of the H5O module */
+#include "H5Omodule.h" /* This source code file is part of the H5O module */
 
-
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Opkg.h"             /* Object headers			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Opkg.h"      /* Object headers			*/
 
 #ifdef H5O_ENABLE_BOGUS
 
 /* PRIVATE PROTOTYPES */
-static void *H5O__bogus_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_bogus_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
-static size_t H5O_bogus_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg);
-static herr_t H5O__bogus_debug(H5F_t *f, const void *_mesg, FILE *stream,
-    int indent, int fwidth);
+static void * H5O__bogus_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__bogus_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
+static size_t H5O__bogus_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg);
+static herr_t H5O__bogus_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_BOGUS_VALID[1] = {{
-    H5O_BOGUS_VALID_ID,		/*message id number             */
-    "bogus valid",             	/*message name for debugging    */
-    0,     	                /*native message size           */
-    H5O_SHARE_IS_SHARABLE,      /* messages are sharable?       */
-    H5O__bogus_decode,        	/*decode message                */
-    H5O_bogus_encode,        	/*encode message                */
-    NULL,          	        /*copy the native value         */
-    H5O_bogus_size,          	/*raw message size              */
-    NULL,         	        /*free internal memory          */
-    NULL,		        /*free method			*/
-    NULL,		        /* file delete method		*/
-    NULL,			/* link method			*/
-    NULL,			/*set share method		*/
-    NULL,		    	/*can share method		*/
-    NULL,			/* pre copy native value to file */
-    NULL,			/* copy native value to file    */
-    NULL,			/* post copy native value to file    */
-    NULL,			/* get creation index		*/
-    NULL,			/* set creation index		*/
-    H5O__bogus_debug         	/*debug the message             */
+    H5O_BOGUS_VALID_ID,    /*message id number             */
+    "bogus valid",         /*message name for debugging    */
+    0,                     /*native message size           */
+    H5O_SHARE_IS_SHARABLE, /* messages are shareable?       */
+    H5O__bogus_decode,     /*decode message                */
+    H5O__bogus_encode,     /*encode message                */
+    NULL,                  /*copy the native value         */
+    H5O__bogus_size,       /*raw message size              */
+    NULL,                  /*free internal memory          */
+    NULL,                  /*free method			*/
+    NULL,                  /* file delete method		*/
+    NULL,                  /* link method			*/
+    NULL,                  /*set share method		*/
+    NULL,                  /*can share method		*/
+    NULL,                  /* pre copy native value to file */
+    NULL,                  /* copy native value to file    */
+    NULL,                  /* post copy native value to file    */
+    NULL,                  /* get creation index		*/
+    NULL,                  /* set creation index		*/
+    H5O__bogus_debug       /*debug the message             */
 }};
 
 /* This message derives from H5O message class */
 const H5O_msg_class_t H5O_MSG_BOGUS_INVALID[1] = {{
-    H5O_BOGUS_INVALID_ID, 	/*message id number             */
-    "bogus invalid",          	/*message name for debugging    */
-    0,                          /*native message size           */
-    H5O_SHARE_IS_SHARABLE,      /* messages are sharable?       */
-    H5O__bogus_decode,          /*decode message                */
-    H5O_bogus_encode,           /*encode message                */
-    NULL,                       /*copy the native value         */
-    H5O_bogus_size,             /*raw message size              */
-    NULL,                       /*free internal memory          */
-    NULL,                       /*free method                   */
-    NULL,                       /* file delete method           */
-    NULL,                       /* link method                  */
-    NULL,                       /*set share method              */
-    NULL,                       /*can share method              */
-    NULL,                       /* pre copy native value to file */
-    NULL,                       /* copy native value to file    */
-    NULL,                       /* post copy native value to file    */
-    NULL,                       /* get creation index           */
-    NULL,                       /* set creation index           */
-    H5O__bogus_debug            /*debug the message             */
+    H5O_BOGUS_INVALID_ID,  /*message id number             */
+    "bogus invalid",       /*message name for debugging    */
+    0,                     /*native message size           */
+    H5O_SHARE_IS_SHARABLE, /* messages are shareable?       */
+    H5O__bogus_decode,     /*decode message                */
+    H5O__bogus_encode,     /*encode message                */
+    NULL,                  /*copy the native value         */
+    H5O__bogus_size,       /*raw message size              */
+    NULL,                  /*free internal memory          */
+    NULL,                  /*free method                   */
+    NULL,                  /* file delete method           */
+    NULL,                  /* link method                  */
+    NULL,                  /*set share method              */
+    NULL,                  /*can share method              */
+    NULL,                  /* pre copy native value to file */
+    NULL,                  /* copy native value to file    */
+    NULL,                  /* post copy native value to file    */
+    NULL,                  /* get creation index           */
+    NULL,                  /* set creation index           */
+    H5O__bogus_debug       /*debug the message             */
 }};
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O__bogus_decode
  *
@@ -104,64 +101,61 @@ const H5O_msg_class_t H5O_MSG_BOGUS_INVALID[1] = {{
  *              Failure:        NULL
  *
  * Programmer:  Quincey Koziol
- *              koziol@ncsa.uiuc.edu
  *              Jan 21 2003
  *
  *-------------------------------------------------------------------------
  */
 static void *
-H5O__bogus_decode(H5F_t *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__bogus_decode(H5F_t *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_bogus_t *mesg = NULL;
-    void *ret_value;            /* Return value */
+    void *       ret_value; /* Return value */
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
     /* check args */
     HDassert(f);
     HDassert(p);
 
     /* Allocate the bogus message */
-    if(NULL == (mesg = (H5O_bogus_t *)H5MM_calloc(sizeof(H5O_bogus_t))))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    if (NULL == (mesg = (H5O_bogus_t *)H5MM_calloc(sizeof(H5O_bogus_t))))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* decode */
     UINT32DECODE(p, mesg->u);
 
     /* Validate the bogus info */
-    if(mesg->u != H5O_BOGUS_VALUE)
-	HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, NULL, "invalid bogus value :-)")
+    if (mesg->u != H5O_BOGUS_VALUE)
+        HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, NULL, "invalid bogus value :-)")
 
     /* Set return value */
     ret_value = mesg;
 
 done:
-    if(ret_value == NULL && mesg != NULL)
+    if (ret_value == NULL && mesg != NULL)
         H5MM_xfree(mesg);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__bogus_decode() */
 
-
 /*-------------------------------------------------------------------------
- * Function:    H5O_bogus_encode
+ * Function:    H5O__bogus_encode
  *
  * Purpose:     Encodes a "bogus" message.
  *
  * Return:      Non-negative on success/Negative on failure
  *
  * Programmer:  Quincey Koziol
- *              koziol@ncsa.uiuc.edu
  *              Jan 21 2003
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_bogus_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, const void H5_ATTR_UNUSED *mesg)
+H5O__bogus_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p,
+                  const void H5_ATTR_UNUSED *mesg)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_PACKAGE_NOERR
 
     /* check args */
     HDassert(f);
@@ -172,11 +166,10 @@ H5O_bogus_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared,
     UINT32ENCODE(p, H5O_BOGUS_VALUE);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5O_bogus_encode() */
+} /* end H5O__bogus_encode() */
 
-
 /*-------------------------------------------------------------------------
- * Function:    H5O_bogus_size
+ * Function:    H5O__bogus_size
  *
  * Purpose:     Returns the size of the raw message in bytes not
  *              counting the message typ or size fields, but only the data
@@ -188,20 +181,19 @@ H5O_bogus_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared,
  *              Failure:        Negative
  *
  * Programmer:  Quincey Koziol
- *              koziol@ncsa.uiuc.edu
  *              Jan 21 2003
  *
  *-------------------------------------------------------------------------
  */
 static size_t
-H5O_bogus_size(const H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, const void H5_ATTR_UNUSED *mesg)
+H5O__bogus_size(const H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared,
+                const void H5_ATTR_UNUSED *mesg)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_PACKAGE_NOERR
 
     FUNC_LEAVE_NOAPI(4)
-} /* end H5O_bogus_size() */
+} /* end H5O__bogus_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O__bogus_debug
  *
@@ -210,20 +202,16 @@ H5O_bogus_size(const H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_sha
  * Return:      Non-negative on success/Negative on failure
  *
  * Programmer:  Quincey Koziol
- *              koziol@ncsa.uiuc.edu
  *              Jan 21 2003
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O__bogus_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE *stream,
-   int indent, int fwidth)
+H5O__bogus_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE *stream, int indent, int fwidth)
 {
-    const H5O_bogus_t	*mesg = (const H5O_bogus_t *)_mesg;
+    const H5O_bogus_t *mesg = (const H5O_bogus_t *)_mesg;
 
-    FUNC_ENTER_STATIC_NOERR
+    FUNC_ENTER_PACKAGE_NOERR
 
     /* check args */
     HDassert(f);
@@ -232,10 +220,8 @@ H5O__bogus_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE *stream,
     HDassert(indent >= 0);
     HDassert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s `%u'\n", indent, "", fwidth,
-            "Bogus Value:", mesg->u);
+    HDfprintf(stream, "%*s%-*s `%u'\n", indent, "", fwidth, "Bogus Value:", mesg->u);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O__bogus_debug() */
 #endif /* H5O_ENABLE_BOGUS */
-