Merge pull request #538 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:may_dev_warnings to develop

* commit '57f0a296c0b727e3d86cea312ba46efc98d76227':
  Minor warning fix.
  More minor warning fixes.
  Minor warning fixes in the tools.
  Minor type fixes to h5watch.
  A few more warnings fixed.
  Fixed additional minor warnings.
  Fixed many minor warnings.

7 files changed, 131 insertions, 128 deletions

diff --git a/src/H5Dint.c b/src/H5Dint.c
index 1813ca6..08b3eb8 100644
--- a/src/H5Dint.c
+++ b/src/H5Dint.c
@@ -3004,10 +3004,10 @@ H5D__format_convert(H5D_t *dataset, hid_t dxpl_id)
 {
     H5D_chk_idx_info_t new_idx_info;    	/* Index info for the new layout */
     H5D_chk_idx_info_t idx_info;        	/* Index info for the current layout */
-    H5O_layout_t newlayout;			/* The new layout */
-    hbool_t init_new_index = FALSE;		/* Indicate that the new chunk index is initialized */
+    H5O_layout_t *newlayout = NULL;         /* The new layout */
+    hbool_t init_new_index = FALSE;         /* Indicate that the new chunk index is initialized */
     hbool_t delete_old_layout = FALSE;		/* Indicate that the old layout message is deleted */
-    hbool_t add_new_layout = FALSE;		/* Indicate that the new layout message is added */
+    hbool_t add_new_layout = FALSE;         /* Indicate that the new layout message is added */
     herr_t ret_value = SUCCEED;         	/* Return value */
 
     FUNC_ENTER_PACKAGE_TAG(dxpl_id, dataset->oloc.addr, FAIL)
@@ -3017,121 +3017,127 @@ H5D__format_convert(H5D_t *dataset, hid_t dxpl_id)
 
     switch(dataset->shared->layout.type) {
         case H5D_CHUNKED:
-	    HDassert(dataset->shared->layout.u.chunk.idx_type != H5D_CHUNK_IDX_BTREE);
-
-	    /* Set up the current index info */
-	    idx_info.f = dataset->oloc.file;
-	    idx_info.dxpl_id = dxpl_id;
-	    idx_info.pline = &dataset->shared->dcpl_cache.pline;
-	    idx_info.layout = &dataset->shared->layout.u.chunk;
-	    idx_info.storage = &dataset->shared->layout.storage.u.chunk;
-
-	    /* Copy the current layout info to the new layout */
-	    HDmemcpy(&newlayout, &dataset->shared->layout, sizeof(H5O_layout_t));
-
-	    /* Set up info for version 1 B-tree in the new layout */
-	    newlayout.version = H5O_LAYOUT_VERSION_3;
-	    newlayout.storage.u.chunk.idx_type = H5D_CHUNK_IDX_BTREE;
-	    newlayout.storage.u.chunk.idx_addr = HADDR_UNDEF;
-	    newlayout.storage.u.chunk.ops = H5D_COPS_BTREE;
-	    newlayout.storage.u.chunk.u.btree.shared = NULL;
-
-	    /* Set up the index info to version 1 B-tree */
-	    new_idx_info.f = dataset->oloc.file;
-	    new_idx_info.dxpl_id = dxpl_id;
-	    new_idx_info.pline = &dataset->shared->dcpl_cache.pline;
-	    new_idx_info.layout = &newlayout.u.chunk;
-	    new_idx_info.storage = &newlayout.storage.u.chunk;
-
-	    /* Initialize version 1 B-tree */
-	    if(new_idx_info.storage->ops->init && 
-              (new_idx_info.storage->ops->init)(&new_idx_info, dataset->shared->space, dataset->oloc.addr) < 0)
-		HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't initialize indexing information")
-	    init_new_index = TRUE;
-
-	    /* If the current chunk index exists */
-	    if(H5F_addr_defined(idx_info.storage->idx_addr)) {
-
-		/* Create v1 B-tree chunk index */
-		if((new_idx_info.storage->ops->create)(&new_idx_info) < 0)
-		    HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't create chunk index")
-
-		/* Iterate over the chunks in the current index and insert the chunk addresses 
-		 * into the version 1 B-tree chunk index */
-		if(H5D__chunk_format_convert(dataset, &idx_info, &new_idx_info) < 0)
-		    HGOTO_ERROR(H5E_DATASET, H5E_BADITER, FAIL, "unable to iterate/convert chunk index")
-	    } /* end if */
+            HDassert(dataset->shared->layout.u.chunk.idx_type != H5D_CHUNK_IDX_BTREE);
+
+            if(NULL == (newlayout = (H5O_layout_t *)H5MM_calloc(sizeof(H5O_layout_t))))
+                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate buffer")
+
+            /* Set up the current index info */
+            idx_info.f = dataset->oloc.file;
+            idx_info.dxpl_id = dxpl_id;
+            idx_info.pline = &dataset->shared->dcpl_cache.pline;
+            idx_info.layout = &dataset->shared->layout.u.chunk;
+            idx_info.storage = &dataset->shared->layout.storage.u.chunk;
+
+            /* Copy the current layout info to the new layout */
+            HDmemcpy(newlayout, &dataset->shared->layout, sizeof(H5O_layout_t));
+
+            /* Set up info for version 1 B-tree in the new layout */
+            newlayout->version = H5O_LAYOUT_VERSION_3;
+            newlayout->storage.u.chunk.idx_type = H5D_CHUNK_IDX_BTREE;
+            newlayout->storage.u.chunk.idx_addr = HADDR_UNDEF;
+            newlayout->storage.u.chunk.ops = H5D_COPS_BTREE;
+            newlayout->storage.u.chunk.u.btree.shared = NULL;
+
+            /* Set up the index info to version 1 B-tree */
+            new_idx_info.f = dataset->oloc.file;
+            new_idx_info.dxpl_id = dxpl_id;
+            new_idx_info.pline = &dataset->shared->dcpl_cache.pline;
+            new_idx_info.layout = &(newlayout->u).chunk;
+            new_idx_info.storage = &(newlayout->storage).u.chunk;
+
+            /* Initialize version 1 B-tree */
+            if(new_idx_info.storage->ops->init && (new_idx_info.storage->ops->init)(&new_idx_info, dataset->shared->space, dataset->oloc.addr) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't initialize indexing information")
+            init_new_index = TRUE;
+
+            /* If the current chunk index exists */
+            if(H5F_addr_defined(idx_info.storage->idx_addr)) {
+
+                /* Create v1 B-tree chunk index */
+                if((new_idx_info.storage->ops->create)(&new_idx_info) < 0)
+                    HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't create chunk index")
+
+                /* Iterate over the chunks in the current index and insert the chunk addresses 
+                 * into the version 1 B-tree chunk index
+                 */
+                if(H5D__chunk_format_convert(dataset, &idx_info, &new_idx_info) < 0)
+                    HGOTO_ERROR(H5E_DATASET, H5E_BADITER, FAIL, "unable to iterate/convert chunk index")
+            } /* end if */
 
-	    /* Delete the old "current" layout message */
-	    if(H5O_msg_remove(&dataset->oloc, H5O_LAYOUT_ID, H5O_ALL, FALSE, dxpl_id) < 0)
-		HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to delete layout message")
+            /* Delete the old "current" layout message */
+            if(H5O_msg_remove(&dataset->oloc, H5O_LAYOUT_ID, H5O_ALL, FALSE, dxpl_id) < 0)
+                HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to delete layout message")
 
-	    delete_old_layout = TRUE;
+            delete_old_layout = TRUE;
 
-	    /* Append the new layout message to the object header */
-	    if(H5O_msg_create(&dataset->oloc, H5O_LAYOUT_ID, 0, H5O_UPDATE_TIME, &newlayout, dxpl_id) < 0)
-		HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to update layout header message")
+            /* Append the new layout message to the object header */
+            if(H5O_msg_create(&dataset->oloc, H5O_LAYOUT_ID, 0, H5O_UPDATE_TIME, newlayout, dxpl_id) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to update layout header message")
 
-	    add_new_layout = TRUE;
+            add_new_layout = TRUE;
 
-	    /* Release the old (current) chunk index */
-	    if(idx_info.storage->ops->dest && (idx_info.storage->ops->dest)(&idx_info) < 0)
-		HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "unable to release chunk index info")
+            /* Release the old (current) chunk index */
+            if(idx_info.storage->ops->dest && (idx_info.storage->ops->dest)(&idx_info) < 0)
+                HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "unable to release chunk index info")
 
-	    /* Copy the new layout to the dataset's layout */
-	    HDmemcpy(&dataset->shared->layout, &newlayout, sizeof(H5O_layout_t));
+            /* Copy the new layout to the dataset's layout */
+            HDmemcpy(&dataset->shared->layout, newlayout, sizeof(H5O_layout_t));
 
-	    break;
+            break;
 
-	case H5D_CONTIGUOUS:
+        case H5D_CONTIGUOUS:
         case H5D_COMPACT:
-	    HDassert(dataset->shared->layout.version > H5O_LAYOUT_VERSION_DEFAULT);
-	    dataset->shared->layout.version = H5O_LAYOUT_VERSION_DEFAULT;
-	    if(H5O_msg_write(&(dataset->oloc), H5O_LAYOUT_ID, 0, H5O_UPDATE_TIME, &(dataset->shared->layout), dxpl_id) < 0)
-		HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to update layout message")
-	    break;
+            HDassert(dataset->shared->layout.version > H5O_LAYOUT_VERSION_DEFAULT);
+            dataset->shared->layout.version = H5O_LAYOUT_VERSION_DEFAULT;
+            if(H5O_msg_write(&(dataset->oloc), H5O_LAYOUT_ID, 0, H5O_UPDATE_TIME, &(dataset->shared->layout), dxpl_id) < 0)
+                HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to update layout message")
+            break;
 
-	case H5D_VIRTUAL:
-	    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "virtual dataset layout not supported")
+        case H5D_VIRTUAL:
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "virtual dataset layout not supported")
 
         case H5D_LAYOUT_ERROR:
         case H5D_NLAYOUTS:
-	    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid dataset layout type")
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid dataset layout type")
 
-	default: 
-	    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "unknown dataset layout type")
+        default: 
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "unknown dataset layout type")
     } /* end switch */
 
 done:
     if(ret_value < 0 && dataset->shared->layout.type == H5D_CHUNKED) {
-	/* Remove new layout message */
-	if(add_new_layout)
-	    if(H5O_msg_remove(&dataset->oloc, H5O_LAYOUT_ID, H5O_ALL, FALSE, dxpl_id) < 0)
-		HDONE_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to delete layout message")
-
-	/* Add back old layout message */
-	if(delete_old_layout)
-	    if(H5O_msg_create(&dataset->oloc, H5O_LAYOUT_ID, 0, H5O_UPDATE_TIME, &dataset->shared->layout, dxpl_id) < 0)
-		HDONE_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to add layout header message")
-
-	/* Clean up v1 b-tree chunk index */
-	if(init_new_index) {
-	    if(H5F_addr_defined(new_idx_info.storage->idx_addr)) {
-		/* Check for valid address i.e. tag */
-		if(!H5F_addr_defined(dataset->oloc.addr))
-		    HDONE_ERROR(H5E_DATASET, H5E_BADVALUE, FAIL, "address undefined")
-
-		/* Expunge from cache all v1 B-tree type entries associated with tag */
-		if(H5AC_expunge_tag_type_metadata(dataset->oloc.file, dxpl_id, dataset->oloc.addr, H5AC_BT_ID, H5AC__NO_FLAGS_SET))
-		    HDONE_ERROR(H5E_DATASET, H5E_CANTEXPUNGE, FAIL, "unable to expunge index metadata")
-	    } /* end if */
+        /* Remove new layout message */
+        if(add_new_layout)
+            if(H5O_msg_remove(&dataset->oloc, H5O_LAYOUT_ID, H5O_ALL, FALSE, dxpl_id) < 0)
+                HDONE_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to delete layout message")
+
+        /* Add back old layout message */
+        if(delete_old_layout)
+            if(H5O_msg_create(&dataset->oloc, H5O_LAYOUT_ID, 0, H5O_UPDATE_TIME, &dataset->shared->layout, dxpl_id) < 0)
+                HDONE_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to add layout header message")
+
+        /* Clean up v1 b-tree chunk index */
+        if(init_new_index) {
+            if(H5F_addr_defined(new_idx_info.storage->idx_addr)) {
+                /* Check for valid address i.e. tag */
+                if(!H5F_addr_defined(dataset->oloc.addr))
+                    HDONE_ERROR(H5E_DATASET, H5E_BADVALUE, FAIL, "address undefined")
+
+                /* Expunge from cache all v1 B-tree type entries associated with tag */
+                if(H5AC_expunge_tag_type_metadata(dataset->oloc.file, dxpl_id, dataset->oloc.addr, H5AC_BT_ID, H5AC__NO_FLAGS_SET))
+                    HDONE_ERROR(H5E_DATASET, H5E_CANTEXPUNGE, FAIL, "unable to expunge index metadata")
+            } /* end if */
 
-	    /* Delete v1 B-tree chunk index */
-	    if(new_idx_info.storage->ops->dest && (new_idx_info.storage->ops->dest)(&new_idx_info) < 0)
-		HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "unable to release chunk index info")
-	} /* end if */
+            /* Delete v1 B-tree chunk index */
+            if(new_idx_info.storage->ops->dest && (new_idx_info.storage->ops->dest)(&new_idx_info) < 0)
+                HDONE_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "unable to release chunk index info")
+        } /* end if */
     } /* end if */
 
+    if(newlayout != NULL)
+        newlayout = (H5O_layout_t *)H5MM_xfree(newlayout);
+
     FUNC_LEAVE_NOAPI_TAG(ret_value, FAIL)
 } /* end H5D__format_convert() */
 
diff --git a/src/H5Dio.c b/src/H5Dio.c
index 572e6cf..1766422 100644
--- a/src/H5Dio.c
+++ b/src/H5Dio.c
@@ -181,7 +181,6 @@ H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
 
     if(direct_read) {
         unsigned u;
-        hsize_t  dims[H5O_LAYOUT_NDIMS];
         hsize_t  internal_offset[H5O_LAYOUT_NDIMS];
 
         if(H5D_CHUNKED != dset->shared->layout.type)
diff --git a/src/H5FDspace.c b/src/H5FDspace.c
index e451d6b..0af755f 100644
--- a/src/H5FDspace.c
+++ b/src/H5FDspace.c
@@ -99,9 +99,7 @@ H5FL_DEFINE(H5FD_free_t);
 static haddr_t
 H5FD_extend(H5FD_t *file, H5FD_mem_t type, hsize_t size)
 {
-    hsize_t orig_size = size;   /* Original allocation size */
     haddr_t eoa;                /* Address of end-of-allocated space */
-    hsize_t extra;        	/* Extra space to allocate, to align request */
     haddr_t ret_value = HADDR_UNDEF;    /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
diff --git a/src/H5MFdbg.c b/src/H5MFdbg.c
index 49cfbfc..1ae902f 100644
--- a/src/H5MFdbg.c
+++ b/src/H5MFdbg.c
@@ -156,7 +156,7 @@ herr_t
 H5MF_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t fs_addr, FILE *stream, int indent, int fwidth)
 {
     herr_t      ret_value = SUCCEED;    /* Return value */
-    H5FD_mem_t 	type;                    /* Memory type for iteration */
+    H5F_mem_page_t type;                /* Memory type for iteration */
 
     FUNC_ENTER_NOAPI_TAG(dxpl_id, H5AC__FREESPACE_TAG, FAIL)
 
@@ -168,31 +168,31 @@ H5MF_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t fs_addr, FILE *stream, int ind
     HDassert(indent >= 0);
     HDassert(fwidth >= 0);
 
-    for(type = H5FD_MEM_DEFAULT; type < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, type))
-	if(H5F_addr_eq(f->shared->fs_addr[type], fs_addr)) {
-	    if(!f->shared->fs_man[type])
+    for(type = H5F_MEM_PAGE_DEFAULT; type < H5F_MEM_PAGE_NTYPES; H5_INC_ENUM(H5F_mem_page_t, type))
+        if(H5F_addr_eq(f->shared->fs_addr[type], fs_addr)) {
+            if(!f->shared->fs_man[type])
                 if(H5MF_open_fstype(f, dxpl_id, type) < 0)
-		    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't initialize file free space")
-
-	    if(f->shared->fs_man[type]) {
-		H5MF_debug_iter_ud_t udata;        /* User data for callbacks */
-
-		/* Prepare user data for section iteration callback */
-		udata.fspace = f->shared->fs_man[type];
-		udata.stream = stream;
-		udata.indent = indent;
-		udata.fwidth = fwidth;
-
-		/* Iterate over all the free space sections */
-		if(H5FS_sect_iterate(f, dxpl_id, f->shared->fs_man[type], H5MF_sects_debug_cb, &udata) < 0)
-		    HGOTO_ERROR(H5E_HEAP, H5E_BADITER, FAIL, "can't iterate over heap's free space")
-
-		/* Close the free space information */
-		if(H5FS_close(f, dxpl_id, f->shared->fs_man[type]) < 0)
-		    HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't release free space info")
-	    } /* end if */
-	    break;
-	} /* end if */
+                    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't initialize file free space")
+
+            if(f->shared->fs_man[type]) {
+                H5MF_debug_iter_ud_t udata;        /* User data for callbacks */
+
+                /* Prepare user data for section iteration callback */
+                udata.fspace = f->shared->fs_man[type];
+                udata.stream = stream;
+                udata.indent = indent;
+                udata.fwidth = fwidth;
+
+                /* Iterate over all the free space sections */
+                if(H5FS_sect_iterate(f, dxpl_id, f->shared->fs_man[type], H5MF_sects_debug_cb, &udata) < 0)
+                    HGOTO_ERROR(H5E_HEAP, H5E_BADITER, FAIL, "can't iterate over heap's free space")
+
+                /* Close the free space information */
+                if(H5FS_close(f, dxpl_id, f->shared->fs_man[type]) < 0)
+                    HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't release free space info")
+            } /* end if */
+            break;
+        } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI_TAG(ret_value, FAIL)
diff --git a/src/H5MFsection.c b/src/H5MFsection.c
index 0dd26b3..02fc2d9 100644
--- a/src/H5MFsection.c
+++ b/src/H5MFsection.c
@@ -360,7 +360,7 @@ H5MF_sect_valid(const H5FS_section_class_t H5_ATTR_UNUSED *cls,
 static H5FS_section_info_t *
 H5MF_sect_split(H5FS_section_info_t *sect, hsize_t frag_size)
 {
-    H5MF_free_section_t *ret_value;     /* Return value */
+    H5MF_free_section_t *ret_value = NULL;      /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
diff --git a/src/H5Ocache_image.c b/src/H5Ocache_image.c
index 29b2503..a427b49 100644
--- a/src/H5Ocache_image.c
+++ b/src/H5Ocache_image.c
@@ -323,7 +323,7 @@ H5O__mdci_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg)
          * time constraints, I don't want to go there now.
          */
         if(H5F_FIRST_ALLOC_DEALLOC(f)) {
-            HDassert(HADDR_UNDEF !=H5F_EOA_PRE_FSM_FSALLOC(f));
+            HDassert(HADDR_UNDEF != H5F_EOA_PRE_FSM_FSALLOC(f));
             HDassert(H5F_addr_ge(mesg->addr, H5F_EOA_PRE_FSM_FSALLOC(f)));
             if(H5MF_tidy_self_referential_fsm_hack(f, dxpl_id) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "tidy of self referential fsm hack failed")
diff --git a/src/H5Ofsinfo.c b/src/H5Ofsinfo.c
index 89dc8ee..4d62f49 100644
--- a/src/H5Ofsinfo.c
+++ b/src/H5Ofsinfo.c
@@ -85,7 +85,7 @@ H5FL_DEFINE_STATIC(H5O_fsinfo_t);
  *-------------------------------------------------------------------------
  */
 static void *
-H5O_fsinfo_decode(H5F_t *f, hid_t dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh,
+H5O_fsinfo_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh,
     unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags, const uint8_t *p)
 {
     H5O_fsinfo_t    *fsinfo = NULL;     /* File space info message */