[svn-r16483] Description:

    Clean up (i.e. remove) more internal calls to H5E_clear_stack(), along with
some other minor code cleanups.

Tested on:
    Mac OS X/32 10.5.6 (amazon)
    (too minor to require h5committest)

1 files changed, 18 insertions, 13 deletions

diff --git a/src/H5Aint.c b/src/H5Aint.c
index fac0110..c7013a2 100644
--- a/src/H5Aint.c
+++ b/src/H5Aint.c
@@ -680,8 +680,8 @@ done:
  * Purpose:     Retrieves the "attribute info" message for an object.  Also
  *              sets the number of attributes correctly, if it isn't set up yet.
  *
- * Return:	Success:	Ptr to message in native format.
- *              Failure:        NULL
+ * Return:	Success:	TRUE/FALSE whether message was found & retrieved
+ *              Failure:        FAIL if error occurred
  *
  * Programmer:  Quincey Koziol
  *              koziol@hdfgroup.org
@@ -689,35 +689,40 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-H5O_ainfo_t *
+htri_t
 H5A_get_ainfo(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_ainfo_t *ainfo)
 {
-    H5O_ainfo_t *ret_value;     /* Return value */
+    htri_t ret_value;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5A_get_ainfo, NULL)
+    FUNC_ENTER_NOAPI(H5A_get_ainfo, FAIL)
 
     /* check arguments */
     HDassert(f);
     HDassert(oh);
+    HDassert(ainfo);
+
+    /* Check if the "attribute info" message exists */
+    if((ret_value = H5O_msg_exists_oh(oh, H5O_AINFO_ID)) < 0)
+	HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "unable to check object header")
+    if(ret_value > 0) {
+        /* Retrieve the "attribute info" structure */
+        if(NULL == H5O_msg_read_oh(f, dxpl_id, oh, H5O_AINFO_ID, ainfo))
+	    HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't read AINFO message")
 
-    /* Retrieve the "attribute info" structure */
-    if((ret_value = (H5O_ainfo_t *)H5O_msg_read_oh(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) {
+        if(ainfo->nattrs == HSIZET_MAX) {
             /* Check if we are using "dense" attribute storage */
-            if(H5F_addr_defined(ret_value->fheap_addr)) {
+            if(H5F_addr_defined(ainfo->fheap_addr)) {
                 /* Retrieve # of records in "name" B-tree */
                 /* (should be same # of records in all indices) */
-                if(H5B2_get_nrec(f, dxpl_id, H5A_BT2_NAME, ret_value->name_bt2_addr, &ret_value->nattrs) < 0)
+                if(H5B2_get_nrec(f, dxpl_id, H5A_BT2_NAME, ainfo->name_bt2_addr, &ainfo->nattrs) < 0)
                     HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, NULL, "can't retrieve # of records in index")
             } /* end if */
             else
                 /* Retrieve # of attributes from object header */
-                ret_value->nattrs = oh->attr_msgs_seen;
+                ainfo->nattrs = oh->attr_msgs_seen;
         } /* end if */
     } /* end if */
-    else
-        HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, NULL, "attribute info message not present")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)