[svn-r30017] Description:

    Bring warning cleanusp in r29990, 29993, 29997, 29999, 30004 from
revise_chunks branch to trunk.

Tested on:
    MacOSX/64 10.11.5 (amazon) w/serial, parallel & production.
    (h5committest forthcoming)

1 files changed, 10 insertions, 6 deletions

diff --git a/src/H5SL.c b/src/H5SL.c
index 1cd64ec..f9d7654 100644
--- a/src/H5SL.c
+++ b/src/H5SL.c
@@ -1286,12 +1286,12 @@ done:
 void *
 H5SL_remove_first(H5SL_t *slist)
 {
-    void *ret_value = NULL;                     /* Return value */
-    H5SL_node_t *head = slist->header;          /* Skip list header */
-    H5SL_node_t *tmp = slist->header->forward[0]; /* Temporary node pointer */
-    H5SL_node_t *next;                          /* Next node to search for */
-    size_t      level = slist->curr_level;      /* Skip list level */
-    size_t      i;                              /* Index */
+    void        *ret_value = NULL;                  /* Return value             */
+    H5SL_node_t *head = slist->header;              /* Skip list header         */
+    H5SL_node_t *tmp = slist->header->forward[0];   /* Temporary node pointer   */
+    H5SL_node_t *next;                              /* Next node to search for  */
+    size_t      level;                              /* Skip list level          */
+    size_t      i;                                  /* Index                    */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1301,6 +1301,10 @@ H5SL_remove_first(H5SL_t *slist)
     /* Not currently supported */
     HDassert(!slist->safe_iterating);
 
+    /* Assign level */
+    H5_CHECK_OVERFLOW(slist->curr_level, int, size_t);
+    level = (size_t)slist->curr_level;
+
     /* Check internal consistency */
     /* (Pre-condition) */