Revert "using a different MACRO"

This reverts commit fc61b7a9f3a38331809ebcb6247482943947cdb8.

23 files changed, 70 insertions, 72 deletions

diff --git a/src/H5Aint.c b/src/H5Aint.c
index 54c17ee..ecbbd48 100644
--- a/src/H5Aint.c
+++ b/src/H5Aint.c
@@ -2026,7 +2026,7 @@ H5A__set_version(const H5F_t *f, H5A_t *attr)
         version = H5O_ATTR_VERSION_1;   /* Write out basic version */
 
     /* Upgrade to the version indicated by the file's low bound if higher */
-    H5_CHECKED_ASSIGN(version, uint8_t, MAX(version, (uint8_t)H5O_attr_ver_bounds[H5F_LOW_BOUND(f)]), int);
+    ASSIGN_TO_SMALLER_SIZE(version, uint8_t, MAX(version, (uint8_t)H5O_attr_ver_bounds[H5F_LOW_BOUND(f)]), int);
 
     /* Version bounds check */
     if(version > H5O_attr_ver_bounds[H5F_HIGH_BOUND(f)])
diff --git a/src/H5B2cache.c b/src/H5B2cache.c
index 7d163bf..fe4827d 100644
--- a/src/H5B2cache.c
+++ b/src/H5B2cache.c
@@ -398,7 +398,7 @@ H5B2__cache_hdr_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED le
     *image++ = H5B2_HDR_VERSION;
 
     /* B-tree type */
-    H5_CHECKED_ASSIGN(*image++, uint8_t, hdr->cls->id, int);
+    ASSIGN_TO_SMALLER_SIZE(*image++, uint8_t, hdr->cls->id, int);
 
     /* Node size (in bytes) */
     UINT32ENCODE(image, hdr->node_size);
@@ -818,7 +818,7 @@ H5B2__cache_int_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED le
     *image++ = H5B2_INT_VERSION;
 
     /* B-tree type */
-    H5_CHECKED_ASSIGN(*image++, uint8_t, internal->hdr->cls->id, int);
+    ASSIGN_TO_SMALLER_SIZE(*image++, uint8_t, internal->hdr->cls->id, int);
     HDassert((size_t)(image - (uint8_t *)_image) == (H5B2_INT_PREFIX_SIZE - H5B2_SIZEOF_CHKSUM));
 
     /* Serialize records for internal node */
@@ -1219,7 +1219,7 @@ H5B2__cache_leaf_serialize(const H5F_t H5_ATTR_UNUSED *f, void *_image, size_t H
     *image++ = H5B2_LEAF_VERSION;
 
     /* B-tree type */
-    H5_CHECKED_ASSIGN(*image++, uint8_t, leaf->hdr->cls->id, int);
+    ASSIGN_TO_SMALLER_SIZE(*image++, uint8_t, leaf->hdr->cls->id, int);
     HDassert((size_t)(image - (uint8_t *)_image) == (H5B2_LEAF_PREFIX_SIZE - H5B2_SIZEOF_CHKSUM));
 
     /* Serialize records for leaf node */
diff --git a/src/H5B2int.c b/src/H5B2int.c
index 932f5f3..ff835eb 100644
--- a/src/H5B2int.c
+++ b/src/H5B2int.c
@@ -239,7 +239,7 @@ H5B2__split1(H5B2_hdr_t *hdr, uint16_t depth, H5B2_node_ptr_t *curr_node_ptr,
     old_node_nrec = internal->node_ptrs[idx].node_nrec;
 
     /* Determine "middle" record to promote to internal node */
-    H5_CHECKED_ASSIGN(mid_record, uint16_t, old_node_nrec / 2, int);
+    ASSIGN_TO_SMALLER_SIZE(mid_record, uint16_t, old_node_nrec / 2, int);
 
     /* Copy "upper half" of records to new child */
     H5MM_memcpy(H5B2_NAT_NREC(right_native, hdr, 0),
diff --git a/src/H5EAcache.c b/src/H5EAcache.c
index 9a76f4a..b51d29e 100644
--- a/src/H5EAcache.c
+++ b/src/H5EAcache.c
@@ -487,7 +487,7 @@ H5EA__cache_hdr_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED le
     *image++ = H5EA_HDR_VERSION;
 
     /* Extensible array type */
-    H5_CHECKED_ASSIGN(*image++, uint8_t, hdr->cparam.cls->id, int);
+    ASSIGN_TO_SMALLER_SIZE(*image++, uint8_t, hdr->cparam.cls->id, int);
 
     /* General array creation/configuration information */
     *image++ = hdr->cparam.raw_elmt_size;          /* Element size in file (in bytes) */
diff --git a/src/H5FAcache.c b/src/H5FAcache.c
index 30d19e8..2b5187d 100644
--- a/src/H5FAcache.c
+++ b/src/H5FAcache.c
@@ -418,7 +418,7 @@ H5FA__cache_hdr_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED le
 
     /* Fixed array type */
     *image++ = (uint8_t)hdr->cparam.cls->id;
-    H5_CHECKED_ASSIGN(*image++, uint8_t, hdr->cparam.cls->id, int);
+    ASSIGN_TO_SMALLER_SIZE(*image++, uint8_t, hdr->cparam.cls->id, int);
 
     /* General array creation/configuration information */
     *image++ = hdr->cparam.raw_elmt_size;          /* Element size in file (in bytes) */
diff --git a/src/H5FScache.c b/src/H5FScache.c
index 28c35e4..d4f77f4 100644
--- a/src/H5FScache.c
+++ b/src/H5FScache.c
@@ -735,7 +735,7 @@ H5FS__cache_hdr_serialize(const H5F_t *f, void *_image, size_t len,
     *image++ = H5FS_HDR_VERSION;
 
     /* Client ID */
-    H5_CHECKED_ASSIGN(*image++, uint8_t, fspace->client, int);
+    ASSIGN_TO_SMALLER_SIZE(*image++, uint8_t, fspace->client, int);
 
     /* Total space tracked */
     H5F_ENCODE_LENGTH(f, image, fspace->tot_space);
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index d6410a7..0fe1867 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -29,8 +29,7 @@ typedef struct H5F_t H5F_t;
 #include "H5VLpublic.h"         /* Virtual Object Layer        */
 
 /* Private headers needed by this file */
-#include "H5private.h"          /* Generic Functions           */
-#include "H5MMprivate.h"	    /* Memory management	       */
+#include "H5MMprivate.h"	/* Memory management	       */
 #ifdef H5_HAVE_PARALLEL
 #include "H5Pprivate.h"         /* Property lists              */
 #endif /* H5_HAVE_PARALLEL */
diff --git a/src/H5HFtest.c b/src/H5HFtest.c
index 585a1bf..b0291b8 100644
--- a/src/H5HFtest.c
+++ b/src/H5HFtest.c
@@ -481,7 +481,7 @@ H5HF_get_id_type_test(const void *_id, unsigned char *obj_type)
     HDassert(obj_type);
 
     /* Get the type for a heap ID */
-    H5_CHECKED_ASSIGN(*obj_type, unsigned char, *id & H5HF_ID_TYPE_MASK, int);
+    ASSIGN_TO_SMALLER_SIZE(*obj_type, unsigned char, *id & H5HF_ID_TYPE_MASK, int);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_get_id_type_test() */
diff --git a/src/H5Oainfo.c b/src/H5Oainfo.c
index a0730e8..d923a9f 100644
--- a/src/H5Oainfo.c
+++ b/src/H5Oainfo.c
@@ -194,7 +194,7 @@ H5O_ainfo_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, co
     *p++ = H5O_AINFO_VERSION;
 
     /* The flags for the attribute indices */
-    H5_CHECKED_ASSIGN(flags, unsigned char, ainfo->track_corder ? H5O_AINFO_TRACK_CORDER : 0, int);
+    ASSIGN_TO_SMALLER_SIZE(flags, unsigned char, ainfo->track_corder ? H5O_AINFO_TRACK_CORDER : 0, int);
     flags = (unsigned char)(flags | (ainfo->index_corder ? H5O_AINFO_INDEX_CORDER : 0));
     *p++ = flags;
 
diff --git a/src/H5Oattr.c b/src/H5Oattr.c
index 634069c..2697959 100644
--- a/src/H5Oattr.c
+++ b/src/H5Oattr.c
@@ -16,12 +16,12 @@
 #define H5S_FRIEND	        /*suppress error about including H5Spkg	  */
 
 
-#include "H5private.h"	    /* Generic Functions		*/
-#include "H5Apkg.h"		    /* Attributes				*/
-#include "H5Eprivate.h"	    /* Error handling		    */
-#include "H5MMprivate.h"	/* Memory management		*/
-#include "H5Opkg.h"         /* Object headers			*/
-#include "H5Spkg.h"		    /* Dataspaces				*/
+#include "H5private.h"		/* Generic Functions			*/
+#include "H5Apkg.h"		/* Attributes				*/
+#include "H5Eprivate.h"		/* Error handling		  	*/
+#include "H5MMprivate.h"	/* Memory management			*/
+#include "H5Opkg.h"             /* Object headers			*/
+#include "H5Spkg.h"		/* Dataspaces				*/
 
 /* PRIVATE PROTOTYPES */
 static herr_t H5O_attr_encode(H5F_t *f, uint8_t *p, const void *mesg);
@@ -329,7 +329,7 @@ H5O_attr_encode(H5F_t *f, uint8_t *p, const void *mesg)
 
     /* The character encoding for the attribute's name, in later versions */
     if(attr->shared->version >= H5O_ATTR_VERSION_3) {
-        H5_CHECKED_ASSIGN(*p++, uint8_t, attr->shared->encoding, int);
+        ASSIGN_TO_SMALLER_SIZE(*p++, uint8_t, attr->shared->encoding, int);
     }
 
     /* Write the name including null terminator */
diff --git a/src/H5Ofill.c b/src/H5Ofill.c
index 93f2a65..14b12db 100644
--- a/src/H5Ofill.c
+++ b/src/H5Ofill.c
@@ -408,10 +408,10 @@ H5O_fill_new_encode(H5F_t H5_ATTR_UNUSED *f, uint8_t *p, const void *_fill)
 
     if(fill->version < H5O_FILL_VERSION_3) {
         /* Space allocation time */
-        H5_CHECKED_ASSIGN(*p++, uint8_t, fill->alloc_time, int);
+        ASSIGN_TO_SMALLER_SIZE(*p++, uint8_t, fill->alloc_time, int);
 
         /* Fill value writing time */
-        H5_CHECKED_ASSIGN(*p++, uint8_t, fill->fill_time, int);
+        ASSIGN_TO_SMALLER_SIZE(*p++, uint8_t, fill->fill_time, int);
 
         /* Whether fill value is defined */
         *p++ = (uint8_t)fill->fill_defined;
diff --git a/src/H5Ofsinfo.c b/src/H5Ofsinfo.c
index 4bd8fff..82afa96 100644
--- a/src/H5Ofsinfo.c
+++ b/src/H5Ofsinfo.c
@@ -25,11 +25,11 @@
 #include "H5Omodule.h"          /* This source code file is part of the H5O module */
 
 
-#include "H5private.h"          /* Generic Functions    */
-#include "H5Eprivate.h"         /* Error handling       */
+#include "H5private.h"        /* Generic Functions    */
+#include "H5Eprivate.h"        /* Error handling    */
 #include "H5Fpkg.h"             /* File access          */
-#include "H5FLprivate.h"        /* Free lists           */
-#include "H5Opkg.h"             /* Object headers       */
+#include "H5FLprivate.h"    /* Free lists              */
+#include "H5Opkg.h"             /* Object headers    */
 
 /* PRIVATE PROTOTYPES */
 static void *H5O_fsinfo_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags,
@@ -225,7 +225,7 @@ H5O_fsinfo_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, c
 
     *p++ = (uint8_t)fsinfo->version;    /* message version */
     *p++ = (uint8_t)fsinfo->strategy;        /* File space strategy */
-    H5_CHECKED_ASSIGN(*p++, uint8_t, fsinfo->strategy, unsigned);
+    ASSIGN_TO_SMALLER_SIZE(*p++, uint8_t, fsinfo->strategy, unsigned);
     *p++ = (unsigned char)fsinfo->persist;    /* Free-space persist or not */
     H5F_ENCODE_LENGTH(f, p, fsinfo->threshold); /* Free-space section size threshold */
 
diff --git a/src/H5Oginfo.c b/src/H5Oginfo.c
index f4dfa6d..027f33c 100644
--- a/src/H5Oginfo.c
+++ b/src/H5Oginfo.c
@@ -22,13 +22,13 @@
  *-------------------------------------------------------------------------
  */
 
-#include "H5Omodule.h"      /* This source code file is part of the H5O module */
+#include "H5Omodule.h"          /* This source code file is part of the H5O module */
 
 
-#include "H5private.h"		/* Generic Functions		*/
+#include "H5private.h"		/* Generic Functions			*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5FLprivate.h"	/* Free lists               */
-#include "H5Opkg.h"         /* Object headers			*/
+#include "H5FLprivate.h"	/* Free lists                           */
+#include "H5Opkg.h"             /* Object headers			*/
 
 
 /* PRIVATE PROTOTYPES */
@@ -183,7 +183,7 @@ H5O_ginfo_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared,
     *p++ = H5O_GINFO_VERSION;
 
     /* The flags for the group info */
-    H5_CHECKED_ASSIGN(flags, unsigned char, ginfo->store_link_phase_change ?  H5O_GINFO_STORE_PHASE_CHANGE : 0, int);
+    ASSIGN_TO_SMALLER_SIZE(flags, unsigned char, ginfo->store_link_phase_change ?  H5O_GINFO_STORE_PHASE_CHANGE : 0, int);
     flags = (unsigned char)(flags | (ginfo->store_est_entry_info ?  H5O_GINFO_STORE_EST_ENTRY_INFO : 0));
     *p++ = flags;
 
diff --git a/src/H5Oint.c b/src/H5Oint.c
index 0e69bfa..b923605 100644
--- a/src/H5Oint.c
+++ b/src/H5Oint.c
@@ -239,7 +239,7 @@ H5O_set_version(H5F_t *f, H5O_t *oh, uint8_t oh_flags, hbool_t store_msg_crt_idx
         version = H5O_VERSION_1;
 
     /* Upgrade to the version indicated by the file's low bound if higher */
-    H5_CHECKED_ASSIGN(version, uint8_t, MAX(version, (uint8_t)H5O_obj_ver_bounds[H5F_LOW_BOUND(f)]), int);
+    ASSIGN_TO_SMALLER_SIZE(version, uint8_t, MAX(version, (uint8_t)H5O_obj_ver_bounds[H5F_LOW_BOUND(f)]), int);
 
     /* Version bounds check */
     if(version > H5O_obj_ver_bounds[H5F_HIGH_BOUND(f)])
diff --git a/src/H5Olayout.c b/src/H5Olayout.c
index 069ee7c..143f49e 100644
--- a/src/H5Olayout.c
+++ b/src/H5Olayout.c
@@ -570,7 +570,7 @@ H5O__layout_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p,
              H5O_LAYOUT_VERSION_3 : mesg->version);
 
     /* Layout class */
-    H5_CHECKED_ASSIGN(*p++, uint8_t, mesg->type, int);
+    ASSIGN_TO_SMALLER_SIZE(*p++, uint8_t, mesg->type, int);
 
     /* Write out layout class specific information */
     switch(mesg->type) {
diff --git a/src/H5Olinfo.c b/src/H5Olinfo.c
index 9e57185..f605e8e 100644
--- a/src/H5Olinfo.c
+++ b/src/H5Olinfo.c
@@ -203,7 +203,7 @@ H5O_linfo_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, co
     *p++ = H5O_LINFO_VERSION;
 
     /* The flags for the link indices */
-    H5_CHECKED_ASSIGN(index_flags, uint8_t, linfo->track_corder ? H5O_LINFO_TRACK_CORDER : 0, int);
+    ASSIGN_TO_SMALLER_SIZE(index_flags, uint8_t, linfo->track_corder ? H5O_LINFO_TRACK_CORDER : 0, int);
     index_flags = (uint8_t)(index_flags | (linfo->index_corder ? H5O_LINFO_INDEX_CORDER : 0));
     *p++ = index_flags;
 
diff --git a/src/H5Olink.c b/src/H5Olink.c
index 6076556..3453565 100644
--- a/src/H5Olink.c
+++ b/src/H5Olink.c
@@ -24,17 +24,17 @@
 
 #define H5G_FRIEND		/*suppress error about including H5Gpkg   */
 #define H5L_FRIEND		/*suppress error about including H5Lpkg	  */
-#include "H5Omodule.h"      /* This source code file is part of the H5O module */
+#include "H5Omodule.h"          /* This source code file is part of the H5O module */
 
 
-#include "H5private.h"		/* Generic Functions                    */
-#include "H5Eprivate.h"		/* Error handling                       */
+#include "H5private.h"		/* Generic Functions			*/
+#include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5FLprivate.h"	/* Free lists                           */
-#include "H5Gpkg.h"		    /* Groups		  	                    */
-#include "H5Iprivate.h"     /* IDs                                  */
-#include "H5Lpkg.h"         /* Links                                */
-#include "H5MMprivate.h"	/* Memory management	                */
-#include "H5Opkg.h"         /* Object headers		                */
+#include "H5Gpkg.h"		/* Groups		  		*/
+#include "H5Iprivate.h"         /* IDs                                  */
+#include "H5Lpkg.h"             /* Links                                */
+#include "H5MMprivate.h"	/* Memory management			*/
+#include "H5Opkg.h"             /* Object headers			*/
 
 
 /* PRIVATE PROTOTYPES */
@@ -316,7 +316,7 @@ H5O_link_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, con
 
     /* Store the type of a non-default link */
     if(link_flags & H5O_LINK_STORE_LINK_TYPE)
-        H5_CHECKED_ASSIGN(*p++, uint8_t, lnk->type, int);
+        ASSIGN_TO_SMALLER_SIZE(*p++, uint8_t, lnk->type, int);
 
     /* Store the link creation order in the file, if its valid */
     if(lnk->corder_valid)
diff --git a/src/H5Osdspace.c b/src/H5Osdspace.c
index b7a95f5..7b6c444 100644
--- a/src/H5Osdspace.c
+++ b/src/H5Osdspace.c
@@ -15,13 +15,13 @@
 #define H5S_FRIEND		/*prevent warning from including H5Spkg.h */
 
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5Dprivate.h"		/* Datasets	                    */
-#include "H5Eprivate.h"		/* Error handling		  	    */
-#include "H5FLprivate.h"	/* Free lists                   */
-#include "H5Gprivate.h"		/* Groups			  	        */
+#include "H5Dprivate.h"		/* Datasets				*/
+#include "H5Eprivate.h"		/* Error handling		  	*/
+#include "H5FLprivate.h"	/* Free lists                           */
+#include "H5Gprivate.h"		/* Groups			  	*/
 #include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Opkg.h"	        /* Object headers		  	    */
-#include "H5Spkg.h"	        /* Dataspaces 				    */
+#include "H5Opkg.h"		/* Object headers		  	*/
+#include "H5Spkg.h"		/* Dataspaces 				*/
 
 
 /* PRIVATE PROTOTYPES */
@@ -257,7 +257,7 @@ H5O_sdspace_encode(H5F_t *f, uint8_t *p, const void *_mesg)
 
     /* Dataspace type */
     if(sdim->version > H5O_SDSPACE_VERSION_1) {
-        H5_CHECKED_ASSIGN(*p++, uint8_t, sdim->type, int);
+        ASSIGN_TO_SMALLER_SIZE(*p++, uint8_t, sdim->type, int);
     }
     else {
         *p++ = 0; /*reserved*/
diff --git a/src/H5Rint.c b/src/H5Rint.c
index 96f33ef..a318ddc 100644
--- a/src/H5Rint.c
+++ b/src/H5Rint.c
@@ -993,7 +993,7 @@ H5R__decode(const unsigned char *buf, size_t *nbytes, H5R_ref_priv_t *ref)
         HGOTO_ERROR(H5E_REFERENCE, H5E_CANTDECODE, FAIL, "Buffer size is too small")
 
     /* Set new reference */
-    H5_CHECKED_ASSIGN(ref->type, int8_t, (H5R_type_t)*p++, int);
+    ASSIGN_TO_SMALLER_SIZE(ref->type, int8_t, (H5R_type_t)*p++, int);
     if(ref->type <= H5R_BADTYPE || ref->type >= H5R_MAXTYPE)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference type")
 
diff --git a/src/H5SMcache.c b/src/H5SMcache.c
index 448e128..40692cd 100644
--- a/src/H5SMcache.c
+++ b/src/H5SMcache.c
@@ -32,14 +32,13 @@
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"      /* Generic Functions             */
-#include "H5Eprivate.h"		/* Error handling		  	     */
-#include "H5Fprivate.h"		/* File access                   */
-#include "H5FLprivate.h"	/* Free Lists                    */
-#include "H5MFprivate.h"    /* File memory management        */
-#include "H5MMprivate.h"	/* Memory management		     */
-#include "H5SMpkg.h"        /* Shared object header messages */
-#include "H5WBprivate.h"    /* Wrapped Buffers               */
+#include "H5Eprivate.h"		/* Error handling		  	*/
+#include "H5Fprivate.h"		/* File access                          */
+#include "H5FLprivate.h"	/* Free Lists                           */
+#include "H5MFprivate.h"        /* File memory management		*/
+#include "H5MMprivate.h"	/* Memory management			*/
+#include "H5SMpkg.h"            /* Shared object header messages        */
+#include "H5WBprivate.h"        /* Wrapped Buffers                      */
 
 
 /****************/
@@ -398,7 +397,7 @@ H5SM__cache_table_serialize(const H5F_t *f, void *_image, size_t len,
         *image++ = H5SM_LIST_VERSION;
 
         /* Is message index a list or a B-tree? */
-        H5_CHECKED_ASSIGN(*image++, uint8_t, table->indexes[u].index_type, int);
+        ASSIGN_TO_SMALLER_SIZE(*image++, uint8_t, table->indexes[u].index_type, int);
 
         /* Type of messages in the index */
         UINT16ENCODE(image, table->indexes[u].mesg_types);
diff --git a/src/H5SMmessage.c b/src/H5SMmessage.c
index 9e1eee2..2a04423 100644
--- a/src/H5SMmessage.c
+++ b/src/H5SMmessage.c
@@ -22,9 +22,9 @@
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"          /* Generic Functions                    */
-#include "H5Eprivate.h"         /* Error handling		                */
-#include "H5MMprivate.h"        /* Memory management                    */
+#include "H5private.h"		/* Generic Functions			*/
+#include "H5Eprivate.h"		/* Error handling		  	*/
+#include "H5MMprivate.h"	/* Memory management			*/
 #include "H5Opkg.h"             /* Object Headers                       */
 #include "H5SMpkg.h"            /* Shared object header messages        */
 
@@ -298,7 +298,7 @@ H5SM__message_encode(uint8_t *raw, const void *_nrecord, void *_ctx)
     /* Sanity check */
     HDassert(ctx);
 
-    H5_CHECKED_ASSIGN(*raw++, uint8_t, message->location, int);
+    ASSIGN_TO_SMALLER_SIZE(*raw++, uint8_t, message->location, int);
     UINT32ENCODE(raw, message->hash);
 
     if(message->location == H5SM_IN_HEAP) {
diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index f3f9b9f..0f73e7b 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -30,8 +30,8 @@
 /***********/
 #include "H5private.h"          /* Generic Functions                        */
 #include "H5CXprivate.h"        /* API Contexts                             */
-#include "H5Eprivate.h"         /* Error handling                           */
-#include "H5FLprivate.h"        /* Free Lists                               */
+#include "H5Eprivate.h"        /* Error handling                */
+#include "H5FLprivate.h"    /* Free Lists                    */
 #include "H5Iprivate.h"         /* ID Functions                             */
 #include "H5MMprivate.h"        /* Memory management                        */
 #include "H5Spkg.h"             /* Dataspace functions                      */
@@ -3674,7 +3674,7 @@ H5S__hyper_get_version_enc_size(const H5S_t *space, hsize_t block_count, uint32_
                 /* Determine the encoding size */
                 enc2 = H5S__hyper_get_enc_size_real(max2);
 
-                H5_CHECKED_ASSIGN(*enc_size, uint8_t, MAX(enc1, enc2), int);
+                ASSIGN_TO_SMALLER_SIZE(*enc_size, uint8_t, MAX(enc1, enc2), int);
             } /* end if */
             else {
                 hsize_t max_size = block_count;
diff --git a/src/H5Tbit.c b/src/H5Tbit.c
index d2f5657..1a7ea9b 100644
--- a/src/H5Tbit.c
+++ b/src/H5Tbit.c
@@ -21,9 +21,9 @@
 
 #include "H5private.h"		/*generic functions			  */
 #include "H5Eprivate.h"		/*error handling			  */
-#include "H5MMprivate.h"	/* Memory management		  */
-#include "H5Tpkg.h"		    /*data-type functions	      */
-#include "H5WBprivate.h"    /* Wrapped Buffers            */
+#include "H5MMprivate.h"	/* Memory management			*/
+#include "H5Tpkg.h"		/*data-type functions			  */
+#include "H5WBprivate.h"        /* Wrapped Buffers                      */
 
 
 
@@ -363,7 +363,7 @@ H5T__bit_set(uint8_t *buf, size_t offset, size_t size, hbool_t value)
 
     /* The middle bytes */
     while (size >= 8) {
-        H5_CHECKED_ASSIGN(buf[idx++], uint8_t, value ? 0xff : 0x00, int);
+        ASSIGN_TO_SMALLER_SIZE(buf[idx++], uint8_t, value ? 0xff : 0x00, int);
         size -= 8;
     }
 
@@ -532,7 +532,7 @@ H5T__bit_inc(uint8_t *buf, size_t start, size_t size)
         acc = buf[idx];
         acc++;
         carry = acc & 0x100;
-        H5_CHECKED_ASSIGN(buf[idx], uint8_t, acc & 0xff, unsigned);
+        ASSIGN_TO_SMALLER_SIZE(buf[idx], uint8_t, acc & 0xff, unsigned);
         idx++;
         size -= 8;
     }