[svn-r27535] Fixed some minor warnings discovered when building with CMake.

Tested on: jam

6 files changed, 7 insertions, 11 deletions

diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index ffbf581..a90ea75 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -4630,8 +4630,6 @@ H5D__chunk_prune_by_extent(H5D_t *dset, hid_t dxpl_id, const hsize_t *old_dim)
     hsize_t                 max_mod_chunk_sc[H5O_LAYOUT_NDIMS]; /* Scaled offset of last chunk to modify in each dimension */
     hssize_t                max_fill_chunk_sc[H5O_LAYOUT_NDIMS]; /* Scaled offset of last chunk that might be filled in each dimension */
     hbool_t                 fill_dim[H5O_LAYOUT_NDIMS]; /* Whether the plane of edge chunks in this dimension needs to be filled */
-    hbool_t                 dims_outside_fill[H5O_LAYOUT_NDIMS]; /* Dimensions in chunk offset outside fill dimensions */
-    int                     ndims_outside_fill = 0; /* Number of dimensions in chunk offset outside fill dimensions */
     hsize_t                 min_partial_chunk_sc[H5O_LAYOUT_NDIMS]; /* Offset of first partial (or empty) chunk in each dimension */
     hbool_t                 new_unfilt_dim[H5O_LAYOUT_NDIMS]; /* Whether the plane of edge chunks in this dimension are newly unfiltered */
     hbool_t                 has_fill = FALSE;   /* Whether there are chunks that must be filled */
@@ -4656,7 +4654,6 @@ H5D__chunk_prune_by_extent(H5D_t *dset, hid_t dxpl_id, const hsize_t *old_dim)
     uint32_t                elmts_per_chunk;    /* Elements in chunk */
     hbool_t                 disable_edge_filters = FALSE; /* Whether to disable filters on partial edge chunks */
     hbool_t                 new_unfilt_chunk = FALSE; /* Whether the chunk is newly unfiltered */
-    hbool_t                 carry;              /* Flag to indicate that chunk increment carrys to higher dimension (sorta) */
     unsigned                u;	                /* Local index variable */
     herr_t                  ret_value = SUCCEED;       /* Return value */
 
@@ -4833,7 +4830,7 @@ H5D__chunk_prune_by_extent(H5D_t *dset, hid_t dxpl_id, const hsize_t *old_dim)
                 } /* end if */
                 else
                     dims_outside_fill[u] = FALSE;
-	} /* end if */
+	    } /* end if */
 
         carry = FALSE;
         while(!carry) {
@@ -5287,7 +5284,6 @@ H5D__chunk_copy_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
 {
     H5D_chunk_it_ud3_t      *udata = (H5D_chunk_it_ud3_t *)_udata;       /* User data for callback */
     H5D_chunk_ud_t          udata_dst;                  /* User data about new destination chunk */
-    hsize_t                 scaled[H5S_MAX_RANK];       /* Scaled coordinates of chunk */
     hbool_t                 is_vlen = FALSE;            /* Whether datatype is variable-length */
     hbool_t                 fix_ref = FALSE;            /* Whether to fix up references in the dest. file */
     hbool_t                 need_insert = FALSE;    /* Whether the chunk needs to be inserted into the index */
diff --git a/src/H5FDlog.c b/src/H5FDlog.c
index a6b643d..8e431a4 100644
--- a/src/H5FDlog.c
+++ b/src/H5FDlog.c
@@ -1609,7 +1609,7 @@ H5FD_log_lock(H5FD_t *_file, hbool_t rw)
     HDassert(file);
 
     /* Determine the type of lock */
-    int lock = rw ? LOCK_EX : LOCK_SH;
+    lock = rw ? LOCK_EX : LOCK_SH;
 
     /* Place the lock with non-blocking */
     if(HDflock(file->fd, lock | LOCK_NB) < 0)
diff --git a/src/H5G.c b/src/H5G.c
index 52d5b49..a9be5b8 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -872,7 +872,7 @@ herr_t
 H5Grefresh(hid_t group_id)
 {
     H5G_t * grp = NULL;
-    hid_t ret_value = SUCCEED; /* return value */
+    herr_t ret_value = SUCCEED; /* return value */
     
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", group_id);
diff --git a/src/H5I.c b/src/H5I.c
index d863231..5547f12 100644
--- a/src/H5I.c
+++ b/src/H5I.c
@@ -808,7 +808,7 @@ H5I_register_with_id(H5I_type_t type, const void *object, hbool_t app_ref, hid_t
 {
     H5I_id_type_t	*type_ptr;	/*ptr to the type		*/
     H5I_id_info_t	*id_ptr;	/*ptr to the new ID information */
-    hid_t		ret_value = SUCCEED; /*return value		*/
+    herr_t		ret_value = SUCCEED; /*return value		*/
 
     FUNC_ENTER_NOAPI(FAIL)
 
diff --git a/src/H5Oflush.c b/src/H5Oflush.c
index 3b6a3e6..ee2996e 100644
--- a/src/H5Oflush.c
+++ b/src/H5Oflush.c
@@ -241,7 +241,7 @@ H5O_refresh_metadata(hid_t oid, H5O_loc_t oloc, hid_t dxpl_id)
     H5G_loc_t obj_loc;
     H5O_loc_t obj_oloc;
     H5G_name_t obj_path;
-    hid_t ret_value = SUCCEED;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -285,7 +285,7 @@ H5O_refresh_metadata_close(hid_t oid, H5O_loc_t oloc, H5G_loc_t *obj_loc, hid_t
     H5O_t *oh = NULL;
     H5G_loc_t tmp_loc;
     hbool_t corked;
-    hid_t ret_value = SUCCEED;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
     
diff --git a/src/H5T.c b/src/H5T.c
index 2c2eb6d..958c2ff 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -5514,7 +5514,7 @@ herr_t
 H5Trefresh(hid_t type_id)
 {
     H5T_t * dt = NULL;
-    hid_t ret_value = SUCCEED; /* return value */
+    herr_t ret_value = SUCCEED; /* return value */
     
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", type_id);