Consistent initialization of hid_t in the tests (#3521)

1 files changed, 204 insertions, 204 deletions

diff --git a/test/cache_tagging.c b/test/cache_tagging.c
index 6d4a6de..33cac8c 100644
--- a/test/cache_tagging.c
+++ b/test/cache_tagging.c
@@ -416,11 +416,11 @@ static unsigned
 check_file_creation_tags(hid_t fcpl_id, int type)
 {
     /* Variable Declarations */
-    hid_t fid = -1; /* File Identifier */
+    hid_t fid = H5I_INVALID_HID; /* File Identifier */
 #ifndef NDEBUG
-    int verbose = false;   /* verbose test output */
-#endif                     /* NDEBUG */
-    hid_t   fapl     = -1; /* File access prop list */
+    int verbose = false;                /* verbose test output */
+#endif                                  /* NDEBUG */
+    hid_t   fapl     = H5I_INVALID_HID; /* File access prop list */
     haddr_t root_tag = 0;
     haddr_t sbe_tag  = 0;
 
@@ -517,13 +517,13 @@ static unsigned
 check_file_open_tags(hid_t fcpl, int type)
 {
     /* Variable Declarations */
-    hid_t fid = -1; /* File Identifier */
+    hid_t fid = H5I_INVALID_HID; /* File Identifier */
 #ifndef NDEBUG
-    int verbose = false;           /* verbose file output */
-#endif                             /* NDEBUG */
-    hid_t   fapl = -1;             /* File access prop list */
-    haddr_t root_tag;              /* Root Group Tag */
-    haddr_t sbe_tag = HADDR_UNDEF; /* Sblock Extension Tag */
+    int verbose = false;            /* verbose file output */
+#endif                              /* NDEBUG */
+    hid_t   fapl = H5I_INVALID_HID; /* File access prop list */
+    haddr_t root_tag;               /* Root Group Tag */
+    haddr_t sbe_tag = HADDR_UNDEF;  /* Sblock Extension Tag */
 
     /* Testing Macro */
     TESTING("tag application during file open");
@@ -643,14 +643,14 @@ static unsigned
 check_group_creation_tags(void)
 {
     /* Variable Declarations */
-    hid_t fid = -1; /* File Identifier */
-    hid_t gid = -1; /* Group Identifier */
+    hid_t fid = H5I_INVALID_HID; /* File Identifier */
+    hid_t gid = H5I_INVALID_HID; /* Group Identifier */
 #ifndef NDEBUG
-    int verbose = false;            /* verbose file output */
-#endif                              /* NDEBUG */
-    hid_t   fapl     = -1;          /* File access prop list */
-    haddr_t root_tag = HADDR_UNDEF; /* Root Group Tag */
-    haddr_t g_tag;                  /* Group Tag */
+    int verbose = false;                /* verbose file output */
+#endif                                  /* NDEBUG */
+    hid_t   fapl     = H5I_INVALID_HID; /* File access prop list */
+    haddr_t root_tag = HADDR_UNDEF;     /* Root Group Tag */
+    haddr_t g_tag;                      /* Group Tag */
 
     /* Testing Macro */
     TESTING("tag application during group creation");
@@ -763,16 +763,16 @@ static unsigned
 check_multi_group_creation_tags(void)
 {
     /* Variable Declarations */
-    hid_t fid = -1; /* File Identifier */
-    hid_t gid = -1; /* Group Identifier */
+    hid_t fid = H5I_INVALID_HID; /* File Identifier */
+    hid_t gid = H5I_INVALID_HID; /* Group Identifier */
 #ifndef NDEBUG
-    int verbose = false;   /* verbose file output */
-#endif                     /* NDEBUG */
-    char    gname[16];     /* group name buffer */
-    int     i        = 0;  /* iterator */
-    hid_t   fapl     = -1; /* File access prop list */
-    haddr_t g_tag    = 0;  /* Group tag value */
-    haddr_t root_tag = 0;  /* Root group tag value */
+    int verbose = false;                /* verbose file output */
+#endif                                  /* NDEBUG */
+    char    gname[16];                  /* group name buffer */
+    int     i        = 0;               /* iterator */
+    hid_t   fapl     = H5I_INVALID_HID; /* File access prop list */
+    haddr_t g_tag    = 0;               /* Group tag value */
+    haddr_t root_tag = 0;               /* Root group tag value */
 
     /* Testing Macro */
     TESTING("tag application during multiple group creation");
@@ -911,18 +911,18 @@ static unsigned
 check_link_iteration_tags(void)
 {
     /* Variable Declarations */
-    hid_t fid = -1; /* File Identifier */
-    hid_t sid = -1; /* Group Identifier */
-    hid_t did = -1; /* Group Identifier */
+    hid_t fid = H5I_INVALID_HID; /* File Identifier */
+    hid_t sid = H5I_INVALID_HID; /* Group Identifier */
+    hid_t did = H5I_INVALID_HID; /* Group Identifier */
 #ifndef NDEBUG
-    int verbose = false;        /* verbose file output */
-#endif                          /* NDEBUG */
-    int        i        = 0;    /* iterator */
-    haddr_t    root_tag = 0;    /* Root Group Tag Value */
-    char       dsetname[500];   /* Name of dataset */
-    H5G_info_t ginfo;           /* Group Info Struct */
-    hid_t      fapl       = -1; /* File access prop list */
-    hid_t      root_group = -1; /* Root Group Identifier */
+    int verbose = false;                     /* verbose file output */
+#endif                                       /* NDEBUG */
+    int        i        = 0;                 /* iterator */
+    haddr_t    root_tag = 0;                 /* Root Group Tag Value */
+    char       dsetname[500];                /* Name of dataset */
+    H5G_info_t ginfo;                        /* Group Info Struct */
+    hid_t      fapl       = H5I_INVALID_HID; /* File access prop list */
+    hid_t      root_group = H5I_INVALID_HID; /* Root Group Identifier */
 
     /* Testing Macro */
     TESTING("tag application during iteration over links in a group");
@@ -1048,19 +1048,19 @@ static unsigned
 check_dense_attribute_tags(void)
 {
     /* Variable Declarations */
-    hid_t fid  = -1; /* File Identifier */
-    hid_t aid  = -1; /* File Identifier */
-    hid_t sid  = -1; /* Group Identifier */
-    hid_t did  = -1; /* Group Identifier */
-    hid_t dcpl = -1; /* Group Identifier */
+    hid_t fid  = H5I_INVALID_HID; /* File Identifier */
+    hid_t aid  = H5I_INVALID_HID; /* File Identifier */
+    hid_t sid  = H5I_INVALID_HID; /* Group Identifier */
+    hid_t did  = H5I_INVALID_HID; /* Group Identifier */
+    hid_t dcpl = H5I_INVALID_HID; /* Group Identifier */
 #ifndef NDEBUG
-    int verbose = false;   /* verbose file output */
-#endif                     /* NDEBUG */
-    int     i        = 0;  /* iterator */
-    hid_t   fapl     = -1; /* File access property list */
-    haddr_t d_tag    = 0;  /* Dataset tag value */
-    haddr_t root_tag = 0;  /* Root group tag value */
-    char    attrname[500]; /* Name of attribute */
+    int verbose = false;                /* verbose file output */
+#endif                                  /* NDEBUG */
+    int     i        = 0;               /* iterator */
+    hid_t   fapl     = H5I_INVALID_HID; /* File access property list */
+    haddr_t d_tag    = 0;               /* Dataset tag value */
+    haddr_t root_tag = 0;               /* Root group tag value */
+    char    attrname[500];              /* Name of attribute */
 
     /* Testing Macro */
     TESTING("tag application during dense attribute manipulation");
@@ -1278,12 +1278,12 @@ static unsigned
 check_group_open_tags(void)
 {
     /* Variable Declarations */
-    hid_t fid = -1; /* File Identifier */
-    hid_t gid = -1; /* Group Identifier */
+    hid_t fid = H5I_INVALID_HID; /* File Identifier */
+    hid_t gid = H5I_INVALID_HID; /* Group Identifier */
 #ifndef NDEBUG
-    int verbose = false;   /* verbose file output */
-#endif                     /* NDEBUG */
-    hid_t   fapl     = -1; /* File access prop list */
+    int verbose = false;                /* verbose file output */
+#endif                                  /* NDEBUG */
+    hid_t   fapl     = H5I_INVALID_HID; /* File access prop list */
     haddr_t root_tag = HADDR_UNDEF;
     haddr_t g_tag;
 
@@ -1404,15 +1404,15 @@ static unsigned
 check_attribute_creation_tags(hid_t fcpl, int type)
 {
     /* Variable Declarations */
-    hid_t fid = -1; /* File Identifier */
-    hid_t aid = -1; /* Attribute Identifier */
-    hid_t gid = -1; /* Group Identifier */
-    hid_t sid = -1; /* Dataspace Identifier */
+    hid_t fid = H5I_INVALID_HID; /* File Identifier */
+    hid_t aid = H5I_INVALID_HID; /* Attribute Identifier */
+    hid_t gid = H5I_INVALID_HID; /* Group Identifier */
+    hid_t sid = H5I_INVALID_HID; /* Dataspace Identifier */
 #ifndef NDEBUG
-    int verbose = false;     /* verbose file output */
-#endif                       /* NDEBUG */
-    hid_t   fapl       = -1; /* File access prop list */
-    haddr_t root_tag   = 0;  /* Root group tag */
+    int verbose = false;                  /* verbose file output */
+#endif                                    /* NDEBUG */
+    hid_t   fapl       = H5I_INVALID_HID; /* File access prop list */
+    haddr_t root_tag   = 0;               /* Root group tag */
     haddr_t g_tag      = 0;
     hsize_t dims1[2]   = {DIMS, DIMS};                   /* dimensions */
     hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dimensions */
@@ -1566,14 +1566,14 @@ static unsigned
 check_attribute_open_tags(hid_t fcpl, int type)
 {
     /* Variable Declarations */
-    hid_t fid = -1; /* File Identifier */
-    hid_t aid = -1; /* Attribute Identifier */
-    hid_t gid = -1; /* Group Identifier */
-    hid_t sid = -1; /* Dataspace Identifier */
+    hid_t fid = H5I_INVALID_HID; /* File Identifier */
+    hid_t aid = H5I_INVALID_HID; /* Attribute Identifier */
+    hid_t gid = H5I_INVALID_HID; /* Group Identifier */
+    hid_t sid = H5I_INVALID_HID; /* Dataspace Identifier */
 #ifndef NDEBUG
-    int verbose = false;     /* verbose file output */
-#endif                       /* NDEBUG */
-    hid_t   fapl       = -1; /* File access prop list */
+    int verbose = false;                  /* verbose file output */
+#endif                                    /* NDEBUG */
+    hid_t   fapl       = H5I_INVALID_HID; /* File access prop list */
     haddr_t root_tag   = 0;
     haddr_t g_tag      = 0;
     hsize_t dims1[2]   = {DIMS, DIMS};                   /* dimensions */
@@ -1730,16 +1730,16 @@ static unsigned
 check_attribute_rename_tags(hid_t fcpl, int type)
 {
     /* Variable declarations */
-    hid_t fid = -1; /* File Identifier */
-    hid_t gid = -1; /* Group Identifier */
-    hid_t aid = -1; /* Attribute Identifier */
-    hid_t sid = -1; /* Dataset Identifier */
+    hid_t fid = H5I_INVALID_HID; /* File Identifier */
+    hid_t gid = H5I_INVALID_HID; /* Group Identifier */
+    hid_t aid = H5I_INVALID_HID; /* Attribute Identifier */
+    hid_t sid = H5I_INVALID_HID; /* Dataset Identifier */
 #ifndef NDEBUG
-    int verbose = false;          /* verbose file output */
-#endif                            /* NDEBUG */
-    int    *data = NULL;          /* data buffer */
-    int     i, j, k = 0;          /* iterators */
-    hid_t   fapl            = -1; /* File access prop list */
+    int verbose = false;                       /* verbose file output */
+#endif                                         /* NDEBUG */
+    int    *data = NULL;                       /* data buffer */
+    int     i, j, k = 0;                       /* iterators */
+    hid_t   fapl            = H5I_INVALID_HID; /* File access prop list */
     haddr_t root_tag        = 0;
     haddr_t g_tag           = 0;
     hsize_t dims1[2]        = {DIMS, DIMS};                   /* dimensions */
@@ -1940,16 +1940,16 @@ static unsigned
 check_attribute_delete_tags(hid_t fcpl, int type)
 {
     /* Variable Declarations */
-    hid_t fid = -1; /* File Identifier */
-    hid_t gid = -1; /* Group Identifier */
-    hid_t aid = -1; /* Attribute Identifier */
-    hid_t sid = -1; /* Dataset Identifier */
+    hid_t fid = H5I_INVALID_HID; /* File Identifier */
+    hid_t gid = H5I_INVALID_HID; /* Group Identifier */
+    hid_t aid = H5I_INVALID_HID; /* Attribute Identifier */
+    hid_t sid = H5I_INVALID_HID; /* Dataset Identifier */
 #ifndef NDEBUG
-    int verbose = false;          /* verbose file output */
-#endif                            /* NDEBUG */
-    int    *data = NULL;          /* data buffer */
-    int     i, j, k = 0;          /* iterators */
-    hid_t   fapl            = -1; /* File access prop list */
+    int verbose = false;                       /* verbose file output */
+#endif                                         /* NDEBUG */
+    int    *data = NULL;                       /* data buffer */
+    int     i, j, k = 0;                       /* iterators */
+    hid_t   fapl            = H5I_INVALID_HID; /* File access prop list */
     haddr_t root_tag        = 0;
     haddr_t g_tag           = 0;
     hsize_t dims1[2]        = {DIMS, DIMS};                   /* dimensions */
@@ -2129,16 +2129,16 @@ static unsigned
 check_dataset_creation_tags(hid_t fcpl, int type)
 {
     /* Variable Declarations */
-    hid_t fid = -1; /* File Identifier */
-    hid_t did = -1; /* Dataset Identifier */
-    hid_t sid = -1; /* Dataspace Identifier */
+    hid_t fid = H5I_INVALID_HID; /* File Identifier */
+    hid_t did = H5I_INVALID_HID; /* Dataset Identifier */
+    hid_t sid = H5I_INVALID_HID; /* Dataspace Identifier */
 #ifndef NDEBUG
-    int verbose = false;         /* verbose file output */
-#endif                           /* NDEBUG */
-    hid_t   dcpl       = -1;     /* dataset creation pl */
-    hsize_t cdims[2]   = {1, 1}; /* chunk dimensions */
+    int verbose = false;                  /* verbose file output */
+#endif                                    /* NDEBUG */
+    hid_t   dcpl       = H5I_INVALID_HID; /* dataset creation pl */
+    hsize_t cdims[2]   = {1, 1};          /* chunk dimensions */
     int     fillval    = 0;
-    hid_t   fapl       = -1; /* File access prop list */
+    hid_t   fapl       = H5I_INVALID_HID; /* File access prop list */
     haddr_t root_tag   = 0;
     haddr_t d_tag      = 0;
     hsize_t dims1[2]   = {DIMS, DIMS};                   /* dimensions */
@@ -2286,16 +2286,16 @@ static unsigned
 check_dataset_creation_earlyalloc_tags(hid_t fcpl, int type)
 {
     /* Variable Declarations */
-    hid_t fid = -1; /* File Identifier */
-    hid_t did = -1; /* Dataset Identifier */
-    hid_t sid = -1; /* Dataspace Identifier */
+    hid_t fid = H5I_INVALID_HID; /* File Identifier */
+    hid_t did = H5I_INVALID_HID; /* Dataset Identifier */
+    hid_t sid = H5I_INVALID_HID; /* Dataspace Identifier */
 #ifndef NDEBUG
-    int verbose = false;         /* verbose file output */
-#endif                           /* NDEBUG */
-    hid_t   dcpl       = -1;     /* dataset creation pl */
-    hsize_t cdims[2]   = {1, 1}; /* chunk dimensions */
+    int verbose = false;                  /* verbose file output */
+#endif                                    /* NDEBUG */
+    hid_t   dcpl       = H5I_INVALID_HID; /* dataset creation pl */
+    hsize_t cdims[2]   = {1, 1};          /* chunk dimensions */
     int     fillval    = 0;
-    hid_t   fapl       = -1; /* File access prop list */
+    hid_t   fapl       = H5I_INVALID_HID; /* File access prop list */
     haddr_t root_tag   = 0;
     haddr_t d_tag      = 0;
     hsize_t dims1[2]   = {DIMS, DIMS};                   /* dimensions */
@@ -2449,16 +2449,16 @@ static unsigned
 check_dataset_open_tags(void)
 {
     /* Variable Declarations */
-    hid_t fid = -1; /* File Identifier */
-    hid_t did = -1; /* Dataset Identifier */
-    hid_t sid = -1; /* Dataspace Identifier */
+    hid_t fid = H5I_INVALID_HID; /* File Identifier */
+    hid_t did = H5I_INVALID_HID; /* Dataset Identifier */
+    hid_t sid = H5I_INVALID_HID; /* Dataspace Identifier */
 #ifndef NDEBUG
-    int verbose = false;         /* verbose file output */
-#endif                           /* NDEBUG */
-    hid_t   dcpl       = -1;     /* dataset creation pl */
-    hsize_t cdims[2]   = {1, 1}; /* chunk dimensions */
+    int verbose = false;                  /* verbose file output */
+#endif                                    /* NDEBUG */
+    hid_t   dcpl       = H5I_INVALID_HID; /* dataset creation pl */
+    hsize_t cdims[2]   = {1, 1};          /* chunk dimensions */
     int     fillval    = 0;
-    hid_t   fapl       = -1; /* File access prop list */
+    hid_t   fapl       = H5I_INVALID_HID; /* File access prop list */
     haddr_t root_tag   = 0;
     haddr_t d_tag      = 0;
     hsize_t dims1[2]   = {DIMS, DIMS};                   /* dimensions */
@@ -2598,16 +2598,16 @@ static unsigned
 check_dataset_write_tags(void)
 {
     /* Variable Declarations */
-    hid_t fid = -1; /* File Identifier */
-    hid_t did = -1; /* Dataset Identifier */
-    hid_t sid = -1; /* Dataspace Identifier */
+    hid_t fid = H5I_INVALID_HID; /* File Identifier */
+    hid_t did = H5I_INVALID_HID; /* Dataset Identifier */
+    hid_t sid = H5I_INVALID_HID; /* Dataspace Identifier */
 #ifndef NDEBUG
-    int verbose = false;         /* verbose file output */
-#endif                           /* NDEBUG */
-    hid_t   dcpl       = -1;     /* dataset creation pl */
-    hsize_t cdims[2]   = {1, 1}; /* chunk dimensions */
+    int verbose = false;                  /* verbose file output */
+#endif                                    /* NDEBUG */
+    hid_t   dcpl       = H5I_INVALID_HID; /* dataset creation pl */
+    hsize_t cdims[2]   = {1, 1};          /* chunk dimensions */
     int     fillval    = 0;
-    hid_t   fapl       = -1; /* File access prop list */
+    hid_t   fapl       = H5I_INVALID_HID; /* File access prop list */
     haddr_t root_tag   = 0;
     haddr_t d_tag      = 0;
     hsize_t dims1[2]   = {DIMS, DIMS};                   /* dimensions */
@@ -2761,16 +2761,16 @@ static unsigned
 check_attribute_write_tags(hid_t fcpl, int type)
 {
     /* Variable Declarations */
-    hid_t fid = -1; /* File Identifier */
-    hid_t gid = -1; /* Group Identifier */
-    hid_t aid = -1; /* Attribute Identifier */
-    hid_t sid = -1; /* Dataset Identifier */
+    hid_t fid = H5I_INVALID_HID; /* File Identifier */
+    hid_t gid = H5I_INVALID_HID; /* Group Identifier */
+    hid_t aid = H5I_INVALID_HID; /* Attribute Identifier */
+    hid_t sid = H5I_INVALID_HID; /* Dataset Identifier */
 #ifndef NDEBUG
-    int verbose = false;     /* verbose file output */
-#endif                       /* NDEBUG */
-    int    *data = NULL;     /* data buffer */
-    int     i, j, k = 0;     /* iterators */
-    hid_t   fapl       = -1; /* File access prop list */
+    int verbose = false;                  /* verbose file output */
+#endif                                    /* NDEBUG */
+    int    *data = NULL;                  /* data buffer */
+    int     i, j, k = 0;                  /* iterators */
+    hid_t   fapl       = H5I_INVALID_HID; /* File access prop list */
     haddr_t root_tag   = 0;
     haddr_t g_tag      = 0;
     hsize_t dims1[2]   = {DIMS, DIMS};                   /* dimensions */
@@ -2945,16 +2945,16 @@ static unsigned
 check_dataset_read_tags(void)
 {
     /* Variable Declarations */
-    hid_t fid = -1; /* File Identifier */
-    hid_t did = -1; /* Dataset Identifier */
-    hid_t sid = -1; /* Dataspace Identifier */
+    hid_t fid = H5I_INVALID_HID; /* File Identifier */
+    hid_t did = H5I_INVALID_HID; /* Dataset Identifier */
+    hid_t sid = H5I_INVALID_HID; /* Dataspace Identifier */
 #ifndef NDEBUG
-    int verbose = false;         /* verbose file output */
-#endif                           /* NDEBUG */
-    hid_t   dcpl       = -1;     /* dataset creation pl */
-    hsize_t cdims[2]   = {1, 1}; /* chunk dimensions */
+    int verbose = false;                  /* verbose file output */
+#endif                                    /* NDEBUG */
+    hid_t   dcpl       = H5I_INVALID_HID; /* dataset creation pl */
+    hsize_t cdims[2]   = {1, 1};          /* chunk dimensions */
     int     fillval    = 0;
-    hid_t   fapl       = -1; /* File access prop list */
+    hid_t   fapl       = H5I_INVALID_HID; /* File access prop list */
     haddr_t root_tag   = 0;
     haddr_t d_tag      = 0;
     hsize_t dims1[2]   = {DIMS, DIMS};                   /* dimensions */
@@ -3104,16 +3104,16 @@ static unsigned
 check_dataset_size_retrieval(void)
 {
     /* Variable Declarations */
-    hid_t fid = -1; /* File Identifier */
-    hid_t did = -1; /* Dataset Identifier */
-    hid_t sid = -1; /* Dataspace Identifier */
+    hid_t fid = H5I_INVALID_HID; /* File Identifier */
+    hid_t did = H5I_INVALID_HID; /* Dataset Identifier */
+    hid_t sid = H5I_INVALID_HID; /* Dataspace Identifier */
 #ifndef NDEBUG
-    int verbose = false;         /* verbose file output */
-#endif                           /* NDEBUG */
-    hid_t   dcpl       = -1;     /* dataset creation pl */
-    hsize_t cdims[2]   = {1, 1}; /* chunk dimensions */
+    int verbose = false;                  /* verbose file output */
+#endif                                    /* NDEBUG */
+    hid_t   dcpl       = H5I_INVALID_HID; /* dataset creation pl */
+    hsize_t cdims[2]   = {1, 1};          /* chunk dimensions */
     int     fillval    = 0;
-    hid_t   fapl       = -1; /* File access prop list */
+    hid_t   fapl       = H5I_INVALID_HID; /* File access prop list */
     haddr_t root_tag   = 0;
     haddr_t d_tag      = 0;
     hsize_t dims1[2]   = {DIMS, DIMS};                   /* dimensions */
@@ -3265,16 +3265,16 @@ check_dataset_extend_tags(void)
 {
 
     /* Variable Declarations */
-    hid_t fid = -1; /* File Identifier */
-    hid_t did = -1; /* Dataset Identifier */
-    hid_t sid = -1; /* Dataspace Identifier */
+    hid_t fid = H5I_INVALID_HID; /* File Identifier */
+    hid_t did = H5I_INVALID_HID; /* Dataset Identifier */
+    hid_t sid = H5I_INVALID_HID; /* Dataspace Identifier */
 #ifndef NDEBUG
-    int verbose = false;         /* verbose file output */
-#endif                           /* NDEBUG */
-    hid_t   dcpl       = -1;     /* dataset creation pl */
-    hsize_t cdims[2]   = {1, 1}; /* chunk dimensions */
+    int verbose = false;                  /* verbose file output */
+#endif                                    /* NDEBUG */
+    hid_t   dcpl       = H5I_INVALID_HID; /* dataset creation pl */
+    hsize_t cdims[2]   = {1, 1};          /* chunk dimensions */
     int     fillval    = 0;
-    hid_t   fapl       = -1; /* File access prop list */
+    hid_t   fapl       = H5I_INVALID_HID; /* File access prop list */
     haddr_t root_tag   = 0;
     haddr_t d_tag      = 0;
     hsize_t dims1[2]   = {DIMS, DIMS};                   /* dimensions */
@@ -3425,12 +3425,12 @@ static unsigned
 check_object_info_tags(void)
 {
     /* Variable Declarations */
-    hid_t fid = -1; /* File Identifier */
-    hid_t gid = -1; /* Group Identifier */
+    hid_t fid = H5I_INVALID_HID; /* File Identifier */
+    hid_t gid = H5I_INVALID_HID; /* Group Identifier */
 #ifndef NDEBUG
-    int verbose = false;             /* verbose file output */
-#endif                               /* NDEBUG */
-    hid_t             fapl     = -1; /* File access prop list */
+    int verbose = false;                          /* verbose file output */
+#endif                                            /* NDEBUG */
+    hid_t             fapl     = H5I_INVALID_HID; /* File access prop list */
     haddr_t           root_tag = HADDR_UNDEF;
     haddr_t           g_tag;
     H5O_native_info_t ninfo; /* Native object info struct */
@@ -3557,12 +3557,12 @@ static unsigned
 check_object_copy_tags(void)
 {
     /* Variable Declarations */
-    hid_t fid = -1; /* File Identifier */
-    hid_t gid = -1; /* Group Identifier */
+    hid_t fid = H5I_INVALID_HID; /* File Identifier */
+    hid_t gid = H5I_INVALID_HID; /* Group Identifier */
 #ifndef NDEBUG
-    int verbose = false;   /* verbose file output */
-#endif                     /* NDEBUG */
-    hid_t   fapl     = -1; /* File access prop list */
+    int verbose = false;                /* verbose file output */
+#endif                                  /* NDEBUG */
+    hid_t   fapl     = H5I_INVALID_HID; /* File access prop list */
     haddr_t root_tag = HADDR_UNDEF;
     haddr_t g_tag;
     haddr_t copy_tag;
@@ -3702,17 +3702,17 @@ static unsigned
 check_link_removal_tags(hid_t fcpl, int type)
 {
     /* Variable Declarations */
-    hid_t fid = -1; /* File Identifier */
-    hid_t did = -1; /* Dataset Identifier */
-    hid_t sid = -1; /* Dataspace Identifier */
-    hid_t gid = -1; /* Dataspace Identifier */
+    hid_t fid = H5I_INVALID_HID; /* File Identifier */
+    hid_t did = H5I_INVALID_HID; /* Dataset Identifier */
+    hid_t sid = H5I_INVALID_HID; /* Dataspace Identifier */
+    hid_t gid = H5I_INVALID_HID; /* Dataspace Identifier */
 #ifndef NDEBUG
-    int verbose = false;         /* verbose file output */
-#endif                           /* NDEBUG */
-    hid_t   dcpl       = -1;     /* dataset creation pl */
-    hsize_t cdims[2]   = {1, 1}; /* chunk dimensions */
+    int verbose = false;                  /* verbose file output */
+#endif                                    /* NDEBUG */
+    hid_t   dcpl       = H5I_INVALID_HID; /* dataset creation pl */
+    hsize_t cdims[2]   = {1, 1};          /* chunk dimensions */
     int     fillval    = 0;
-    hid_t   fapl       = -1; /* File access prop list */
+    hid_t   fapl       = H5I_INVALID_HID; /* File access prop list */
     haddr_t root_tag   = 0;
     haddr_t d_tag      = 0;
     haddr_t g_tag      = 0;
@@ -3888,17 +3888,17 @@ check_link_getname_tags(void)
 {
     /* Variable Declarations */
     char  name[500];
-    hid_t fid = -1; /* File Identifier */
-    hid_t did = -1; /* Dataset Identifier */
-    hid_t sid = -1; /* Dataspace Identifier */
-    hid_t gid = -1; /* Dataspace Identifier */
+    hid_t fid = H5I_INVALID_HID; /* File Identifier */
+    hid_t did = H5I_INVALID_HID; /* Dataset Identifier */
+    hid_t sid = H5I_INVALID_HID; /* Dataspace Identifier */
+    hid_t gid = H5I_INVALID_HID; /* Dataspace Identifier */
 #ifndef NDEBUG
-    int verbose = false;         /* verbose file output */
-#endif                           /* NDEBUG */
-    hid_t   dcpl       = -1;     /* dataset creation pl */
-    hsize_t cdims[2]   = {1, 1}; /* chunk dimensions */
+    int verbose = false;                  /* verbose file output */
+#endif                                    /* NDEBUG */
+    hid_t   dcpl       = H5I_INVALID_HID; /* dataset creation pl */
+    hsize_t cdims[2]   = {1, 1};          /* chunk dimensions */
     int     fillval    = 0;
-    hid_t   fapl       = -1; /* File access prop list */
+    hid_t   fapl       = H5I_INVALID_HID; /* File access prop list */
     haddr_t root_tag   = 0;
     haddr_t d_tag      = 0;
     haddr_t g_tag      = 0;
@@ -4063,13 +4063,13 @@ static unsigned
 check_external_link_creation_tags(void)
 {
     /* Variable Declarations */
-    hid_t fid  = -1; /* File Identifier */
-    hid_t fid2 = -1; /* File Identifier */
-    hid_t gid  = -1; /* Dataspace Identifier */
+    hid_t fid  = H5I_INVALID_HID; /* File Identifier */
+    hid_t fid2 = H5I_INVALID_HID; /* File Identifier */
+    hid_t gid  = H5I_INVALID_HID; /* Dataspace Identifier */
 #ifndef NDEBUG
-    int verbose = false;   /* verbose file output */
-#endif                     /* NDEBUG */
-    hid_t   fapl     = -1; /* File access prop list */
+    int verbose = false;                /* verbose file output */
+#endif                                  /* NDEBUG */
+    hid_t   fapl     = H5I_INVALID_HID; /* File access prop list */
     haddr_t root_tag = 0;
 
     /* Testing Macro */
@@ -4185,16 +4185,16 @@ static unsigned
 check_external_link_open_tags(void)
 {
     /* Variable Declarations */
-    haddr_t link_tag = 0;  /* link tag */
-    hid_t   fid      = -1; /* File Identifier */
-    hid_t   fid2     = -1; /* File Identifier */
-    hid_t   gid      = -1; /* Dataspace Identifier */
-    hid_t   xid      = -1; /* Dataspace Identifier */
+    haddr_t link_tag = 0;               /* link tag */
+    hid_t   fid      = H5I_INVALID_HID; /* File Identifier */
+    hid_t   fid2     = H5I_INVALID_HID; /* File Identifier */
+    hid_t   gid      = H5I_INVALID_HID; /* Dataspace Identifier */
+    hid_t   xid      = H5I_INVALID_HID; /* Dataspace Identifier */
 #ifndef NDEBUG
-    int verbose = false;              /* verbose file output */
-#endif                                /* NDEBUG */
-    H5O_native_info_t ninfo;          /* Native object info struct */
-    hid_t             fapl      = -1; /* File access prop list */
+    int verbose = false;                           /* verbose file output */
+#endif                                             /* NDEBUG */
+    H5O_native_info_t ninfo;                       /* Native object info struct */
+    hid_t             fapl      = H5I_INVALID_HID; /* File access prop list */
     haddr_t           root_tag  = 0;
     haddr_t           root2_tag = 0;
 
@@ -4357,12 +4357,12 @@ check_invalid_tag_application(void)
 #ifdef H5C_DO_TAGGING_SANITY_CHECKS
     /* Variables */
     H5F_t  *f   = NULL;
-    hid_t   fid = -1;
+    hid_t   fid = H5I_INVALID_HID;
     haddr_t addr;
     H5HL_t *lheap          = NULL;
-    hid_t   fapl           = -1;    /* File access prop list */
-    bool    api_ctx_pushed = false; /* Whether API context pushed */
-#endif                              /* H5C_DO_TAGGING_SANITY_CHECKS */
+    hid_t   fapl           = H5I_INVALID_HID; /* File access prop list */
+    bool    api_ctx_pushed = false;           /* Whether API context pushed */
+#endif                                        /* H5C_DO_TAGGING_SANITY_CHECKS */
 
     /* Testing Macro */
     TESTING("failure on invalid tag application");
@@ -4460,11 +4460,11 @@ int
 main(void)
 {
     /* Variable Declarations */
-    hid_t    fcpl_default    = -1; /* file creation prop list */
-    hid_t    fcpl_shmesg_all = -1; /* file creation prop list */
-    hid_t    fcpl            = -1; /* file creation prop list */
-    unsigned nerrs           = 0;  /* Error Encountered */
-    int      test_type       = 0;  /* test type iterator */
+    hid_t    fcpl_default    = H5I_INVALID_HID; /* file creation prop list */
+    hid_t    fcpl_shmesg_all = H5I_INVALID_HID; /* file creation prop list */
+    hid_t    fcpl            = H5I_INVALID_HID; /* file creation prop list */
+    unsigned nerrs           = 0;               /* Error Encountered */
+    int      test_type       = 0;               /* test type iterator */
 
     /* Open the HDF5 Library */
     H5open();