Clang warning fixes from develop. (#1583)

9 files changed, 20 insertions, 11 deletions

diff --git a/src/H5C.c b/src/H5C.c
index 317a35d..0fc4416 100644
--- a/src/H5C.c
+++ b/src/H5C.c
@@ -1477,7 +1477,7 @@ H5C_insert_entry(H5F_t *f, const H5C_class_t *type, haddr_t addr, void *thing, u
          * Finally, we usually don't check to see if the cache is
          * oversized at the end of an unprotect.  As a result, it is
          * possible to have a vastly oversized cache with no protected
-         * entries as long as all the protects preceed the unprotects.
+         * entries as long as all the protects precede the unprotects.
          *
          * Since items 1 and 2 are not changing any time soon, I see
          * no point in worrying about the third.
@@ -2449,7 +2449,7 @@ H5C_protect(H5F_t *f, const H5C_class_t *type, haddr_t addr, void *udata, unsign
              * Finally, we usually don't check to see if the cache is
              * oversized at the end of an unprotect.  As a result, it is
              * possible to have a vastly oversized cache with no protected
-             * entries as long as all the protects preceed the unprotects.
+             * entries as long as all the protects precede the unprotects.
              *
              * Since items 1, 2, and 3 are not changing any time soon, I
              * see no point in worrying about the fourth.
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index 6d4887e..8884cb2 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -5298,7 +5298,7 @@ H5D__chunk_prune_fill(H5D_chunk_it_ud1_t *udata, hbool_t new_unfilt_chunk)
 
     /* The number of bytes accessed in the chunk */
     /* (i.e. the bytes replaced with fill values) */
-    H5_CHECK_OVERFLOW(sel_nelmts, hssize_t, uint32_t);
+    H5_CHECK_OVERFLOW(sel_nelmts, hsize_t, uint32_t);
     bytes_accessed = (uint32_t)sel_nelmts * layout->u.chunk.dim[rank];
 
     /* Release lock on chunk */
diff --git a/src/H5Dio.c b/src/H5Dio.c
index 4010854..9f220c6 100644
--- a/src/H5Dio.c
+++ b/src/H5Dio.c
@@ -448,7 +448,7 @@ H5D__read(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space, const H5S_t
      * difficulties with the notion.
      *
      * To solve this, we check to see if H5S_select_shape_same() returns true,
-     * and if the ranks of the mem and file spaces are different.  If the are,
+     * and if the ranks of the mem and file spaces are different.  If they are,
      * construct a new mem space that is equivalent to the old mem space, and
      * use that instead.
      *
diff --git a/src/H5FDdirect.c b/src/H5FDdirect.c
index 35da1f1..367a613 100644
--- a/src/H5FDdirect.c
+++ b/src/H5FDdirect.c
@@ -233,8 +233,11 @@ H5FD_direct_init(void)
 
     FUNC_ENTER_NOAPI(H5I_INVALID_HID)
 
-    if (H5I_VFL != H5I_get_type(H5FD_DIRECT_g))
+    if (H5I_VFL != H5I_get_type(H5FD_DIRECT_g)) {
         H5FD_DIRECT_g = H5FD_register(&H5FD_direct_g, sizeof(H5FD_class_t), FALSE);
+        if (H5I_INVALID_HID == H5FD_DIRECT_g)
+            HGOTO_ERROR(H5E_ID, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to register direct");
+    }
 
     /* Set return value */
     ret_value = H5FD_DIRECT_g;
diff --git a/src/H5FDmirror.c b/src/H5FDmirror.c
index f604eaf..f36b9c3 100644
--- a/src/H5FDmirror.c
+++ b/src/H5FDmirror.c
@@ -246,9 +246,11 @@ H5FD_mirror_init(void)
 
     LOG_OP_CALL(FUNC);
 
-    if (H5I_VFL != H5I_get_type(H5FD_MIRROR_g))
+    if (H5I_VFL != H5I_get_type(H5FD_MIRROR_g)) {
         H5FD_MIRROR_g = H5FD_register(&H5FD_mirror_g, sizeof(H5FD_class_t), FALSE);
-
+        if (H5I_INVALID_HID == H5FD_MIRROR_g)
+            HGOTO_ERROR(H5E_ID, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to register mirror");
+    }
     ret_value = H5FD_MIRROR_g;
 
 done:
diff --git a/src/H5FDmirror_priv.h b/src/H5FDmirror_priv.h
index b387f72..f647c21 100644
--- a/src/H5FDmirror_priv.h
+++ b/src/H5FDmirror_priv.h
@@ -31,7 +31,7 @@ extern "C" {
 /* Define the maximum allowed size for a receiving buffer when accepting bytes to
  * write. Writes larger than this size are performed by multiple accept-write
  * steps by the Writer. */
-#define H5FD_MIRROR_DATA_BUFFER_MAX H5_GB /* 1 Gigabyte */
+#define H5FD_MIRROR_DATA_BUFFER_MAX (1024 * 1024 * 1024) /* 1 Gigabyte */
 
 #define H5FD_MIRROR_XMIT_CURR_VERSION 1
 #define H5FD_MIRROR_XMIT_MAGIC        0x87F8005B
diff --git a/src/H5FDros3.c b/src/H5FDros3.c
index 2470c8b..decc341 100644
--- a/src/H5FDros3.c
+++ b/src/H5FDros3.c
@@ -326,8 +326,12 @@ H5FD_ros3_init(void)
     HDfprintf(stdout, "H5FD_ros3_init() called.\n");
 #endif
 
-    if (H5I_VFL != H5I_get_type(H5FD_ROS3_g))
+    if (H5I_VFL != H5I_get_type(H5FD_ROS3_g)) {
         H5FD_ROS3_g = H5FD_register(&H5FD_ros3_g, sizeof(H5FD_class_t), FALSE);
+        if (H5I_INVALID_HID == H5FD_ROS3_g) {
+            HGOTO_ERROR(H5E_ID, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to register ros3");
+        }
+    }
 
 #if ROS3_STATS
     /* pre-compute statsbin boundaries
diff --git a/src/H5HFcache.c b/src/H5HFcache.c
index fde5a4f..7b5078e 100644
--- a/src/H5HFcache.c
+++ b/src/H5HFcache.c
@@ -895,7 +895,7 @@ H5HF__cache_iblock_get_initial_load_size(void *_udata, size_t *image_len)
  * Function:    H5HF__cache_iblock_verify_chksum
  *
  * Purpose:     Verify the computed checksum of the data structure is the
- *              same as the stored chksum.
+ *              same as the stored checksum.
  *
  * Return:      Success:        TRUE/FALSE
  *              Failure:        Negative
diff --git a/src/H5Zscaleoffset.c b/src/H5Zscaleoffset.c
index a1edf68..c7be014 100644
--- a/src/H5Zscaleoffset.c
+++ b/src/H5Zscaleoffset.c
@@ -1205,7 +1205,7 @@ H5Z__filter_scaleoffset(unsigned flags, size_t cd_nelmts, const unsigned cd_valu
 
     /* prepare parameters to pass to compress/decompress functions */
     p.size      = cd_values[H5Z_SCALEOFFSET_PARM_SIZE];
-    p.mem_order = H5T_native_order_g;
+    p.mem_order = (unsigned)H5T_native_order_g;
 
     /* input; decompress */
     if (flags & H5Z_FLAG_REVERSE) {