Basic alignment with async branch (#115)

* Basic alignment with async branch - trivial changes to reduce clutter in overall diff.

* Update minor error code to reflect change within library

* Update the error output to match library

1 files changed, 26 insertions, 26 deletions

diff --git a/test/cache_tagging.c b/test/cache_tagging.c
index b2975d1..9d0aa3e 100644
--- a/test/cache_tagging.c
+++ b/test/cache_tagging.c
@@ -444,7 +444,7 @@ check_file_creation_tags(hid_t fcpl_id, int type)
     hid_t fid = -1; /* File Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;   /* verbose test outout */
-#endif /* NDEBUG */        /* end debugging functions */
+#endif /* NDEBUG */
     hid_t   fapl     = -1; /* File access prop list */
     haddr_t root_tag = 0;
     haddr_t sbe_tag  = 0;
@@ -548,7 +548,7 @@ check_file_open_tags(hid_t fcpl, int type)
     hid_t fid = -1; /* File Identifier */
 #ifndef NDEBUG
     int verbose = FALSE; /* verbose file outout */
-#endif /* NDEBUG */      /* end debugging functions */
+#endif /* NDEBUG */
     hid_t   fapl = -1;   /* File access prop list */
     haddr_t root_tag;    /* Root Group Tag */
     haddr_t sbe_tag;     /* Sblock Extension Tag */
@@ -678,7 +678,7 @@ check_group_creation_tags(void)
     hid_t gid = -1; /* Group Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;            /* verbose file outout */
-#endif /* NDEBUG */                 /* end debugging functions */
+#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 */
@@ -801,7 +801,7 @@ check_multi_group_creation_tags(void)
     hid_t gid = -1; /* Group Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;   /* verbose file outout */
-#endif /* NDEBUG */        /* end debugging functions */
+#endif /* NDEBUG */
     char    gname[16];     /* group name buffer */
     int     i        = 0;  /* iterator */
     hid_t   fapl     = -1; /* File access prop list */
@@ -953,7 +953,7 @@ check_link_iteration_tags(void)
     hid_t did = -1; /* Group Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;        /* verbose file outout */
-#endif /* NDEBUG */             /* end debugging functions */
+#endif /* NDEBUG */
     int        i        = 0;    /* iterator */
     haddr_t    root_tag = 0;    /* Root Group Tag Value */
     char       dsetname[500];   /* Name of dataset */
@@ -1095,7 +1095,7 @@ check_dense_attribute_tags(void)
     hid_t dcpl = -1; /* Group Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;   /* verbose file outout */
-#endif /* NDEBUG */        /* end debugging functions */
+#endif /* NDEBUG */
     int     i        = 0;  /* iterator */
     hid_t   fapl     = -1; /* File access property list */
     haddr_t d_tag    = 0;  /* Dataset tag value */
@@ -1325,7 +1325,7 @@ check_group_open_tags(void)
     hid_t gid = -1; /* Group Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;   /* verbose file output */
-#endif /* NDEBUG */        /* end debugging functions */
+#endif /* NDEBUG */
     hid_t   fapl     = -1; /* File access prop list */
     haddr_t root_tag = HADDR_UNDEF;
     haddr_t g_tag;
@@ -1456,7 +1456,7 @@ check_attribute_creation_tags(hid_t fcpl, int type)
     hid_t sid = -1; /* Dataspace Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;     /* verbose file outout */
-#endif /* NDEBUG */          /* end debugging functions */
+#endif /* NDEBUG */
     hid_t   fapl       = -1; /* File access prop list */
     haddr_t root_tag   = 0;  /* Root group tag */
     haddr_t g_tag      = 0;
@@ -1621,7 +1621,7 @@ check_attribute_open_tags(hid_t fcpl, int type)
     hid_t sid = -1; /* Dataspace Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;     /* verbose file outout */
-#endif /* NDEBUG */          /* end debugging functions */
+#endif /* NDEBUG */
     hid_t   fapl       = -1; /* File access prop list */
     haddr_t root_tag   = 0;
     haddr_t g_tag      = 0;
@@ -1788,7 +1788,7 @@ check_attribute_rename_tags(hid_t fcpl, int type)
     hid_t sid = -1; /* Dataset Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;          /* verbose file outout */
-#endif /* NDEBUG */               /* end debugging functions */
+#endif /* NDEBUG */
     int *   data = NULL;          /* data buffer */
     int     i, j, k = 0;          /* iterators */
     hid_t   fapl            = -1; /* File access prop list */
@@ -2001,7 +2001,7 @@ check_attribute_delete_tags(hid_t fcpl, int type)
     hid_t sid = -1; /* Dataset Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;          /* verbose file outout */
-#endif /* NDEBUG */               /* end debugging functions */
+#endif /* NDEBUG */
     int *   data = NULL;          /* data buffer */
     int     i, j, k = 0;          /* iterators */
     hid_t   fapl            = -1; /* File access prop list */
@@ -2192,7 +2192,7 @@ check_dataset_creation_tags(hid_t fcpl, int type)
     hid_t sid = -1; /* Dataspace Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;         /* verbose file outout */
-#endif /* NDEBUG */              /* end debugging functions */
+#endif /* NDEBUG */
     hid_t   dcpl       = -1;     /* dataset creation pl */
     hsize_t cdims[2]   = {1, 1}; /* chunk dimensions */
     int     fillval    = 0;
@@ -2352,7 +2352,7 @@ check_dataset_creation_earlyalloc_tags(hid_t fcpl, int type)
     hid_t sid = -1; /* Dataspace Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;         /* verbose file outout */
-#endif /* NDEBUG */              /* end debugging functions */
+#endif /* NDEBUG */
     hid_t   dcpl       = -1;     /* dataset creation pl */
     hsize_t cdims[2]   = {1, 1}; /* chunk dimensions */
     int     fillval    = 0;
@@ -2518,7 +2518,7 @@ check_dataset_open_tags(void)
     hid_t sid = -1; /* Dataspace Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;         /* verbose file outout */
-#endif /* NDEBUG */              /* end debugging functions */
+#endif /* NDEBUG */
     hid_t   dcpl       = -1;     /* dataset creation pl */
     hsize_t cdims[2]   = {1, 1}; /* chunk dimensions */
     int     fillval    = 0;
@@ -2670,7 +2670,7 @@ check_dataset_write_tags(void)
     hid_t sid = -1; /* Dataspace Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;         /* verbose file outout */
-#endif /* NDEBUG */              /* end debugging functions */
+#endif /* NDEBUG */
     hid_t   dcpl       = -1;     /* dataset creation pl */
     hsize_t cdims[2]   = {1, 1}; /* chunk dimensions */
     int     fillval    = 0;
@@ -2837,7 +2837,7 @@ check_attribute_write_tags(hid_t fcpl, int type)
     hid_t sid = -1; /* Dataset Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;     /* verbose file outout */
-#endif /* NDEBUG */          /* end debugging functions */
+#endif /* NDEBUG */
     int *   data = NULL;     /* data buffer */
     int     i, j, k = 0;     /* iterators */
     hid_t   fapl       = -1; /* File access prop list */
@@ -3023,7 +3023,7 @@ check_dataset_read_tags(void)
     hid_t sid = -1; /* Dataspace Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;         /* verbose file outout */
-#endif /* NDEBUG */              /* end debugging functions */
+#endif /* NDEBUG */
     hid_t   dcpl       = -1;     /* dataset creation pl */
     hsize_t cdims[2]   = {1, 1}; /* chunk dimensions */
     int     fillval    = 0;
@@ -3185,7 +3185,7 @@ check_dataset_size_retrieval(void)
     hid_t sid = -1; /* Dataspace Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;         /* verbose file outout */
-#endif /* NDEBUG */              /* end debugging functions */
+#endif /* NDEBUG */
     hid_t   dcpl       = -1;     /* dataset creation pl */
     hsize_t cdims[2]   = {1, 1}; /* chunk dimensions */
     int     fillval    = 0;
@@ -3349,7 +3349,7 @@ check_dataset_extend_tags(void)
     hid_t sid = -1; /* Dataspace Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;         /* verbose file outout */
-#endif /* NDEBUG */              /* end debugging functions */
+#endif /* NDEBUG */
     hid_t   dcpl       = -1;     /* dataset creation pl */
     hsize_t cdims[2]   = {1, 1}; /* chunk dimensions */
     int     fillval    = 0;
@@ -3511,7 +3511,7 @@ check_object_info_tags(void)
     hid_t gid = -1; /* Group Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;             /* verbose file output */
-#endif /* NDEBUG */                  /* end debugging functions */
+#endif /* NDEBUG */
     hid_t             fapl     = -1; /* File access prop list */
     haddr_t           root_tag = HADDR_UNDEF;
     haddr_t           g_tag;
@@ -3646,7 +3646,7 @@ check_object_copy_tags(void)
     hid_t gid = -1; /* Group Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;   /* verbose file output */
-#endif /* NDEBUG */        /* end debugging functions */
+#endif /* NDEBUG */
     hid_t   fapl     = -1; /* File access prop list */
     haddr_t root_tag = HADDR_UNDEF;
     haddr_t g_tag;
@@ -3796,7 +3796,7 @@ check_link_removal_tags(hid_t fcpl, int type)
     hid_t gid = -1; /* Dataspace Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;         /* verbose file outout */
-#endif /* NDEBUG */              /* end debugging functions */
+#endif /* NDEBUG */
     hid_t   dcpl       = -1;     /* dataset creation pl */
     hsize_t cdims[2]   = {1, 1}; /* chunk dimensions */
     int     fillval    = 0;
@@ -3985,7 +3985,7 @@ check_link_getname_tags(void)
     hid_t gid = -1; /* Dataspace Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;         /* verbose file outout */
-#endif /* NDEBUG */              /* end debugging functions */
+#endif /* NDEBUG */
     hid_t   dcpl       = -1;     /* dataset creation pl */
     hsize_t cdims[2]   = {1, 1}; /* chunk dimensions */
     int     fillval    = 0;
@@ -4162,7 +4162,7 @@ check_external_link_creation_tags(void)
     hid_t gid  = -1; /* Dataspace Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;   /* verbose file outout */
-#endif /* NDEBUG */        /* end debugging functions */
+#endif /* NDEBUG */
     hid_t   fapl     = -1; /* File access prop list */
     haddr_t root_tag = 0;
 
@@ -4289,7 +4289,7 @@ check_external_link_open_tags(void)
     hid_t   xid      = -1; /* Dataspace Identifier */
 #ifndef NDEBUG
     int verbose = FALSE;              /* verbose file outout */
-#endif /* NDEBUG */                   /* end debugging functions */
+#endif /* NDEBUG */
     H5O_native_info_t ninfo;          /* Native object info struct */
     hid_t             fapl      = -1; /* File access prop list */
     haddr_t           root_tag  = 0;
@@ -4462,7 +4462,7 @@ check_invalid_tag_application(void)
     H5HL_t *lheap          = NULL;
     hid_t   fapl           = -1;    /* File access prop list */
     hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */
-#endif                              /* H5C_DO_TAGGING_SANITY_CHECKS */
+#endif /* H5C_DO_TAGGING_SANITY_CHECKS */
 
     /* Testing Macro */
     TESTING("failure on invalid tag application");