From 789e672956c99300d6e22f602fae5bc2fe286ce6 Mon Sep 17 00:00:00 2001
From: Quincey Koziol <koziol@hdfgroup.org>
Date: Thu, 15 Apr 2010 14:47:56 -0500
Subject: [svn-r18569] Desription: 	Fix a problem in the metadata
 accumulator code and clean up a few compiler warnings.

Tested on:
	Mac OS X/32 10.6.3 (amazon) w/debug
	(h5committest not required on this branch)
---
 src/H5Dint.c   | 2 +-
 src/H5FD.c     | 1 +
 src/H5O.c      | 2 +-
 src/H5Ochunk.c | 2 +-
 src/H5RS.c     | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/H5Dint.c b/src/H5Dint.c
index 49a83a2..51e2a1f 100644
--- a/src/H5Dint.c
+++ b/src/H5Dint.c
@@ -2253,7 +2253,7 @@ H5D_vlen_get_buf_size_alloc(size_t size, void *info)
     H5D_vlen_bufsize_t *vlen_bufsize = (H5D_vlen_bufsize_t *)info;
     void *ret_value;    /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_vlen_get_buf_size_alloc)
+    FUNC_ENTER_NOAPI_NOINIT(H5D_vlen_get_buf_size_alloc)
 
     /* Get a temporary pointer to space for the VL data */
     if((vlen_bufsize->vl_tbuf = H5FL_BLK_REALLOC(vlen_vl_buf, vlen_bufsize->vl_tbuf, size)) != NULL)
diff --git a/src/H5FD.c b/src/H5FD.c
index cec4ae8..383d064 100644
--- a/src/H5FD.c
+++ b/src/H5FD.c
@@ -2302,6 +2302,7 @@ HDmemset(file->meta_accum + size, 0, (file->accum_buf_size - size));
                     HDmemcpy(file->meta_accum, buf, size);
 
                     /* Set the new size & location of the metadata accumulator */
+                    file->accum_loc = addr;
                     file->accum_size = size;
 
                     /* Mark it as written to */
diff --git a/src/H5O.c b/src/H5O.c
index 3a971a7..060ed43 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -1555,7 +1555,7 @@ done:
 H5O_t *
 H5O_protect(const H5O_loc_t *loc, hid_t dxpl_id, H5AC_protect_t prot)
 {
-    H5O_t *oh;                  /* Object header protected */
+    H5O_t *oh = NULL;           /* Object header protected */
     H5O_cache_ud_t udata;       /* User data for protecting object header */
     H5O_cont_msgs_t cont_msg_info;      /* Continuation message info */
     unsigned file_intent;       /* R/W intent on file */
diff --git a/src/H5Ochunk.c b/src/H5Ochunk.c
index da07d7a..68c8b4c 100644
--- a/src/H5Ochunk.c
+++ b/src/H5Ochunk.c
@@ -239,7 +239,7 @@ H5O_chunk_unprotect(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_chunk_proxy_t *chk_p
         } /* end else */
 
         /* Free fake chunk proxy */
-        H5FL_FREE(H5O_chunk_proxy_t, chk_proxy);
+        chk_proxy = H5FL_FREE(H5O_chunk_proxy_t, chk_proxy);
     } /* end if */
     else {
         /* Release the chunk proxy from the cache, marking it dirty */
diff --git a/src/H5RS.c b/src/H5RS.c
index 550e326..065d05f 100644
--- a/src/H5RS.c
+++ b/src/H5RS.c
@@ -63,7 +63,7 @@ H5RS_xstrdup(const char *s)
 {
     char *ret_value;   /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5RS_xstrdup)
+    FUNC_ENTER_NOAPI_NOINIT(H5RS_xstrdup)
 
     if(s) {
         ret_value = (char *)H5FL_BLK_MALLOC(str_buf, HDstrlen(s) + 1);
-- 
cgit v0.12