Remainder of vol_normalization changes (dataset, attribute, files, objects).

1 files changed, 73 insertions, 101 deletions

diff --git a/src/H5Adense.c b/src/H5Adense.c
index 3701022..5bed82d 100644
--- a/src/H5Adense.c
+++ b/src/H5Adense.c
@@ -164,11 +164,11 @@ typedef struct H5A_bt2_ud_rmbi_t {
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5A__dense_create
+ * Function:    H5A__dense_create
  *
- * Purpose:	Creates dense attribute storage structures for an object
+ * Purpose:     Creates dense attribute storage structures for an object
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
  *		koziol@hdfgroup.org
@@ -188,9 +188,7 @@ H5A__dense_create(H5F_t *f, H5O_ainfo_t *ainfo)
 
     FUNC_ENTER_PACKAGE
 
-    /*
-     * Check arguments.
-     */
+    /* Check arguments */
     HDassert(f);
     HDassert(ainfo);
 
@@ -286,11 +284,11 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5A__dense_fnd_cb
+ * Function:    H5A__dense_fnd_cb
  *
- * Purpose:	Callback when an attribute is located in an index
+ * Purpose:     Callback when an attribute is located in an index
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
  *		koziol@hdfgroup.org
@@ -305,9 +303,7 @@ H5A__dense_fnd_cb(const H5A_t *attr, hbool_t *took_ownership, void *_user_attr)
 
     FUNC_ENTER_STATIC_NOERR
 
-    /*
-     * Check arguments.
-     */
+    /* Check arguments */
     HDassert(attr);
     HDassert(user_attr);
 
@@ -320,11 +316,11 @@ H5A__dense_fnd_cb(const H5A_t *attr, hbool_t *took_ownership, void *_user_attr)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5A__dense_open
+ * Function:    H5A__dense_open
  *
- * Purpose:	Open an attribute in dense storage structures for an object
+ * Purpose:     Open an attribute in dense storage structures for an object
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
  *		koziol@hdfgroup.org
@@ -345,9 +341,7 @@ H5A__dense_open(H5F_t *f, const H5O_ainfo_t *ainfo, const char *name)
 
     FUNC_ENTER_PACKAGE
 
-    /*
-     * Check arguments.
-     */
+    /* Check arguments */
     HDassert(f);
     HDassert(ainfo);
     HDassert(name);
@@ -411,11 +405,11 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5A__dense_insert
+ * Function:    H5A__dense_insert
  *
- * Purpose:	Insert an attribute into dense storage structures for an object
+ * Purpose:     Insert an attribute into dense storage structures for an object
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
  *		koziol@hdfgroup.org
@@ -439,9 +433,7 @@ H5A__dense_insert(H5F_t *f, const H5O_ainfo_t *ainfo, H5A_t *attr)
 
     FUNC_ENTER_PACKAGE
 
-    /*
-     * Check arguments.
-     */
+    /* Check arguments */
     HDassert(f);
     HDassert(ainfo);
     HDassert(attr);
@@ -570,13 +562,12 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5A__dense_write_bt2_cb2
+ * Function:    H5A__dense_write_bt2_cb2
  *
- * Purpose:	v2 B-tree 'modify' callback to update the record for a creation
- *		order index
+ * Purpose:     v2 B-tree 'modify' callback to update the record for a creation
+ *              order index
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
  *              Tuesday, February 20, 2007
@@ -591,9 +582,7 @@ H5A__dense_write_bt2_cb2(void *_record, void *_op_data, hbool_t *changed)
 
     FUNC_ENTER_STATIC_NOERR
 
-    /*
-     * Check arguments.
-     */
+    /* Check arguments */
     HDassert(record);
     HDassert(new_heap_id);
 
@@ -608,12 +597,11 @@ H5A__dense_write_bt2_cb2(void *_record, void *_op_data, hbool_t *changed)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5A__dense_write_bt2_cb
+ * Function:    H5A__dense_write_bt2_cb
  *
- * Purpose:	v2 B-tree 'modify' callback to update the data for an attribute
+ * Purpose:     v2 B-tree 'modify' callback to update the data for an attribute
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
  *              Tuesday, December  5, 2006
@@ -632,9 +620,7 @@ H5A__dense_write_bt2_cb(void *_record, void *_op_data, hbool_t *changed)
 
     FUNC_ENTER_STATIC
 
-    /*
-     * Check arguments.
-     */
+    /* Check arguments */
     HDassert(record);
     HDassert(op_data);
 
@@ -722,11 +708,11 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5A__dense_write
+ * Function:    H5A__dense_write
  *
- * Purpose:	Modify an attribute in dense storage structures for an object
+ * Purpose:     Modify an attribute in dense storage structures for an object
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
  *		koziol@hdfgroup.org
@@ -747,9 +733,7 @@ H5A__dense_write(H5F_t *f, const H5O_ainfo_t *ainfo, H5A_t *attr)
 
     FUNC_ENTER_PACKAGE
 
-    /*
-     * Check arguments.
-     */
+    /* Check arguments */
     HDassert(f);
     HDassert(ainfo);
     HDassert(H5F_addr_defined(ainfo->fheap_addr));
@@ -820,12 +804,12 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5A__dense_copy_fh_cb
+ * Function:    H5A__dense_copy_fh_cb
  *
- * Purpose:	Callback for fractal heap operator, to make copy of attribute
+ * Purpose:     Callback for fractal heap operator, to make copy of attribute
  *              for calling routine
  *
- * Return:	SUCCEED/FAIL
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
  *		koziol@hdfgroup.org
@@ -864,11 +848,11 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5A__dense_rename
+ * Function:    H5A__dense_rename
  *
- * Purpose:	Rename an attribute in dense storage structures for an object
+ * Purpose:     Rename an attribute in dense storage structures for an object
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
  *		koziol@hdfgroup.org
@@ -892,9 +876,7 @@ H5A__dense_rename(H5F_t *f, const H5O_ainfo_t *ainfo, const char *old_name,
 
     FUNC_ENTER_PACKAGE
 
-    /*
-     * Check arguments.
-     */
+    /* Check arguments */
     HDassert(f);
     HDassert(ainfo);
     HDassert(old_name);
@@ -996,7 +978,7 @@ H5A__dense_rename(H5F_t *f, const H5O_ainfo_t *ainfo, const char *old_name,
             HGOTO_ERROR(H5E_ATTR, H5E_LINKCOUNT, FAIL, "unable to adjust attribute link count")
     } /* end if */
     else if(shared_mesg < 0)
-	HGOTO_ERROR(H5E_ATTR, H5E_WRITEERROR, FAIL, "error determining if message should be shared")
+        HGOTO_ERROR(H5E_ATTR, H5E_WRITEERROR, FAIL, "error determining if message should be shared")
 
     /* Delete old attribute from dense storage */
     if(H5A__dense_remove(f, ainfo, old_name) < 0)
@@ -1018,11 +1000,11 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5A__dense_iterate_bt2_cb
+ * Function:    H5A__dense_iterate_bt2_cb
  *
- * Purpose:	v2 B-tree callback for dense attribute storage iterator
+ * Purpose:     v2 B-tree callback for dense attribute storage iterator
  *
- * Return:	H5_ITER_ERROR/H5_ITER_CONT/H5_ITER_STOP
+ * Return:      H5_ITER_ERROR/H5_ITER_CONT/H5_ITER_STOP
  *
  * Programmer:	Quincey Koziol
  *		koziol@hdfgroup.org
@@ -1030,7 +1012,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static herr_t
+static int
 H5A__dense_iterate_bt2_cb(const void *_record, void *_bt2_udata)
 {
     const H5A_dense_bt2_name_rec_t *record = (const H5A_dense_bt2_name_rec_t *)_record; /* Record from B-tree */
@@ -1114,11 +1096,11 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5A__dense_iterate
+ * Function:    H5A__dense_iterate
  *
- * Purpose:	Iterate over attributes in dense storage structures for an object
+ * Purpose:     Iterate over attributes in dense storage structures for an object
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
  *		koziol@hdfgroup.org
@@ -1140,9 +1122,7 @@ H5A__dense_iterate(H5F_t *f, hid_t loc_id, const H5O_ainfo_t *ainfo,
 
     FUNC_ENTER_PACKAGE
 
-    /*
-     * Check arguments.
-     */
+    /* Check arguments */
     HDassert(f);
     HDassert(ainfo);
     HDassert(H5F_addr_defined(ainfo->fheap_addr));
@@ -1251,11 +1231,11 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5A__dense_remove_bt2_cb
+ * Function:    H5A__dense_remove_bt2_cb
  *
- * Purpose:	v2 B-tree callback for dense attribute storage record removal
+ * Purpose:     v2 B-tree callback for dense attribute storage record removal
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
  *		koziol@hdfgroup.org
@@ -1315,11 +1295,11 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5A__dense_remove
+ * Function:    H5A__dense_remove
  *
- * Purpose:	Remove an attribute from the dense storage of an object
+ * Purpose:     Remove an attribute from the dense storage of an object
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
  *		koziol@hdfgroup.org
@@ -1340,9 +1320,7 @@ H5A__dense_remove(H5F_t *f, const H5O_ainfo_t *ainfo, const char *name)
 
     FUNC_ENTER_PACKAGE
 
-    /*
-     * Check arguments.
-     */
+    /* Check arguments */
     HDassert(f);
     HDassert(ainfo);
     HDassert(name && *name);
@@ -1398,18 +1376,18 @@ done:
     if(bt2_name && H5B2_close(bt2_name) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for name index")
     if(attr_copy)
-        H5O__msg_free_real(H5O_MSG_ATTR, attr_copy);
+        H5O_msg_free_real(H5O_MSG_ATTR, attr_copy);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A__dense_remove() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5A__dense_remove_by_idx_bt2_cb
+ * Function:    H5A__dense_remove_by_idx_bt2_cb
  *
- * Purpose:	v2 B-tree callback for dense attribute storage record removal by index
+ * Purpose:     v2 B-tree callback for dense attribute storage record removal by index
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
  *		koziol@hdfgroup.org
@@ -1530,12 +1508,12 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5A__dense_remove_by_idx
+ * Function:    H5A__dense_remove_by_idx
  *
- * Purpose:	Remove an attribute from the dense storage of an object,
- *		according to the order within an index
+ * Purpose:     Remove an attribute from the dense storage of an object,
+ *              according to the order within an index
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
  *		koziol@hdfgroup.org
@@ -1556,9 +1534,7 @@ H5A__dense_remove_by_idx(H5F_t *f, const H5O_ainfo_t *ainfo, H5_index_t idx_type
 
     FUNC_ENTER_PACKAGE
 
-    /*
-     * Check arguments.
-     */
+    /* Check arguments */
     HDassert(f);
     HDassert(ainfo);
 
@@ -1660,12 +1636,12 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5A__dense_exists
+ * Function:    H5A__dense_exists
  *
- * Purpose:	Check if an attribute exists in dense storage structures for
+ * Purpose:     Check if an attribute exists in dense storage structures for
  *              an object
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
  *		koziol@hdfgroup.org
@@ -1685,9 +1661,7 @@ H5A__dense_exists(H5F_t *f, const H5O_ainfo_t *ainfo, const char *name)
 
     FUNC_ENTER_PACKAGE
 
-    /*
-     * Check arguments.
-     */
+    /* Check arguments */
     HDassert(f);
     HDassert(ainfo);
     HDassert(name);
@@ -1749,11 +1723,11 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5A__dense_delete_bt2_cb
+ * Function:    H5A__dense_delete_bt2_cb
  *
- * Purpose:	v2 B-tree callback for dense attribute storage deletion
+ * Purpose:     v2 B-tree callback for dense attribute storage deletion
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
  *		koziol@hdfgroup.org
@@ -1806,18 +1780,18 @@ H5A__dense_delete_bt2_cb(const void *_record, void *_bt2_udata)
 done:
     /* Release resources */
     if(attr)
-        H5O__msg_free_real(H5O_MSG_ATTR, attr);
+        H5O_msg_free_real(H5O_MSG_ATTR, attr);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A__dense_delete_bt2_cb() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5A__dense_delete
+ * Function:    H5A__dense_delete
  *
- * Purpose:	Delete all dense storage structures for attributes on an object
+ * Purpose:     Delete all dense storage structures for attributes on an object
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
  *		koziol@hdfgroup.org
@@ -1834,9 +1808,7 @@ H5A__dense_delete(H5F_t *f, H5O_ainfo_t *ainfo)
 
     FUNC_ENTER_PACKAGE
 
-    /*
-     * Check arguments.
-     */
+    /* Check arguments */
     HDassert(f);
     HDassert(ainfo);