[svn-r10705] Purpose:

    Code cleanup

Description:
    Clean up a few compiler warnings of various sorts...

Platforms tested:
    FreeBSD 4.11 (sleipnir)
    Too minor to require h5committest

4 files changed, 4 insertions, 11 deletions

diff --git a/src/H5B2.c b/src/H5B2.c
index 0692b90..b33e760 100644
--- a/src/H5B2.c
+++ b/src/H5B2.c
@@ -2232,7 +2232,6 @@ H5B2_swap_leaf(H5F_t *f, hid_t dxpl_id, unsigned depth,
     const H5AC_class_t *child_class;    /* Pointer to child node's class info */
     haddr_t child_addr;                 /* Address of child node */
     void *child;                        /* Pointer to child node */
-    unsigned *child_nrec;               /* Pointer to child # of records */
     uint8_t *child_native;              /* Pointer to child's native records */
     H5B2_shared_t *shared;              /* B-tree's shared info */
     herr_t ret_value=SUCCEED;           /* Return value */
@@ -2261,7 +2260,6 @@ H5B2_swap_leaf(H5F_t *f, hid_t dxpl_id, unsigned depth,
 
         /* More setup for accessing child node information */
         child = child_internal;
-        child_nrec = &(child_internal->nrec);
         child_native = child_internal->int_native;
 
         /* Mark child node as dirty now */
@@ -2280,7 +2278,6 @@ H5B2_swap_leaf(H5F_t *f, hid_t dxpl_id, unsigned depth,
 
         /* More setup for accessing child node information */
         child = child_leaf;
-        child_nrec = &(child_leaf->nrec);
         child_native = child_leaf->leaf_native;
 
         /* Mark child node as dirty now */
@@ -3297,7 +3294,6 @@ H5B2_remove_leaf(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
     haddr_t     leaf_addr=HADDR_UNDEF;  /* Leaf address on disk */
     unsigned    leaf_unprotect_flags=H5AC__NO_FLAGS_SET; /* Flags for unprotecting leaf node */
     H5B2_shared_t *shared;              /* Pointer to B-tree's shared information */
-    int         cmp;                    /* Comparison value of records */
     unsigned    idx;                    /* Location of record which matches key */
     herr_t	ret_value = SUCCEED;
 
@@ -3323,7 +3319,7 @@ H5B2_remove_leaf(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
     HDassert(leaf->nrec == curr_node_ptr->node_nrec);
 
     /* Find correct location to remove this record */
-    if((cmp = H5B2_locate_record(shared->type,leaf->nrec,shared->nat_off,leaf->leaf_native,udata,&idx)) != 0)
+    if(H5B2_locate_record(shared->type,leaf->nrec,shared->nat_off,leaf->leaf_native,udata,&idx) != 0)
         HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "record is not in B-tree")
 
     /* Make callback to retrieve record in native form */
diff --git a/src/H5C.c b/src/H5C.c
index 4038e48..0e1064a 100644
--- a/src/H5C.c
+++ b/src/H5C.c
@@ -3375,13 +3375,8 @@ H5C_protect(H5F_t *	       f,
              */
             if ( cache_ptr->index_size > cache_ptr->max_cache_size ) {
 
-                size_t space_needed;
-
                 cache_ptr->cache_full = TRUE;
 
-                space_needed = cache_ptr->index_size - 
-                               cache_ptr->max_cache_size + 1;
-
                 result = H5C_make_space_in_cache(f, primary_dxpl_id, 
                                                  secondary_dxpl_id, cache_ptr, 
                                                  (size_t)0, write_permitted,
diff --git a/src/H5Dio.c b/src/H5Dio.c
index bf0d09d..b5259a3 100644
--- a/src/H5Dio.c
+++ b/src/H5Dio.c
@@ -120,7 +120,7 @@ H5D_ioinfo_init(H5D_t *dset, const H5D_dxpl_cache_t *dxpl_cache, hid_t dxpl_id,
 static herr_t H5D_create_chunk_map(const H5D_t *dataset, const H5T_t *mem_type,
         const H5S_t *file_space, const H5S_t *mem_space, fm_map *fm);
 static herr_t H5D_destroy_chunk_map(const fm_map *fm);
-static herr_t H5D_free_chunk_info(void *item, void UNUSED *key, void UNUSED *opdata);
+static herr_t H5D_free_chunk_info(void *item, void *key, void *opdata);
 static herr_t H5D_create_chunk_file_map_hyper(const fm_map *fm);
 static herr_t H5D_create_chunk_mem_map_hyper(const fm_map *fm);
 static herr_t H5D_chunk_file_cb(void *elem, hid_t type_id, unsigned ndims,
diff --git a/src/H5E.c b/src/H5E.c
index 20d3604..74c67fa 100644
--- a/src/H5E.c
+++ b/src/H5E.c
@@ -1482,8 +1482,10 @@ H5Epush_stack(hid_t err_stack, const char *file, const char *func, unsigned line
     va_list     ap;             /* Varargs info */
     H5E_t       *estack;        /* Pointer to error stack to modify */
     H5E_msg_t   *maj_ptr, *min_ptr;     /* Pointer to major and minor error info */
+#ifndef H5_HAVE_VASPRINTF
     int         tmp_len;        /* Current size of description buffer */
     int         desc_len;       /* Actual length of description when formatted */
+#endif /* H5_HAVE_VASPRINTF */
     char        *tmp=NULL;      /* Buffer to place formatted description in */
     herr_t	ret_value=SUCCEED;      /* Return value */