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

* commit '02039e0a91cf1baae46d52a77c521fc6357b7c90':
  Minor warning cleanup while working on VOL issues.

2 files changed, 3 insertions, 3 deletions

diff --git a/src/H5B2dbg.c b/src/H5B2dbg.c
index dc079f1..c4f56e5 100644
--- a/src/H5B2dbg.c
+++ b/src/H5B2dbg.c
@@ -218,7 +218,7 @@ H5B2__int_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth,
      */
     H5_CHECK_OVERFLOW(depth, unsigned, uint16_t);
     node_ptr.addr = addr;
-    H5_CHECKED_ASSIGN(node_ptr.node_nrec, unsigned, nrec, uint16_t)
+    H5_CHECKED_ASSIGN(node_ptr.node_nrec, uint16_t, nrec, unsigned)
     if(NULL == (internal = H5B2__protect_internal(hdr, NULL, &node_ptr, (uint16_t)depth, FALSE, H5AC__READ_ONLY_FLAG)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree internal node")
 
@@ -330,7 +330,7 @@ H5B2__leaf_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth,
      */
     H5_CHECK_OVERFLOW(nrec, unsigned, uint16_t);
     node_ptr.addr = addr;
-    H5_CHECKED_ASSIGN(node_ptr.node_nrec, unsigned, nrec, uint16_t)
+    H5_CHECKED_ASSIGN(node_ptr.node_nrec, uint16_t, nrec, unsigned)
     if(NULL == (leaf = H5B2__protect_leaf(hdr, NULL, &node_ptr, FALSE, H5AC__READ_ONLY_FLAG)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
 
diff --git a/src/H5F.c b/src/H5F.c
index 8023a04..6d62c08 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -1344,7 +1344,7 @@ H5Fstart_swmr_write(hid_t file_id)
 
     /* Call the internal routine */
     if(H5F__start_swmr_write(file) < 0)
-	HGOTO_ERROR(H5E_FILE, H5E_CANTCONVERT, FAIL, "unable to convert file format")
+        HGOTO_ERROR(H5E_FILE, H5E_CANTCONVERT, FAIL, "unable to convert file format")
 
 done:
     FUNC_LEAVE_API(ret_value)