Even more normalization with develop

1 files changed, 50 insertions, 0 deletions

diff --git a/test/cache_tagging.c b/test/cache_tagging.c
index 57b5d5c..aaf7d9a 100644
--- a/test/cache_tagging.c
+++ b/test/cache_tagging.c
@@ -439,7 +439,9 @@ check_file_creation_tags(hid_t fcpl_id, int type)
 {
     /* Variable Declarations */
     hid_t fid = -1;             /* File Identifier */
+#ifndef NDEBUG
     int verbose = FALSE;        /* verbose test outout */
+#endif /* NDEBUG */ /* end debugging functions */
     haddr_t root_tag = 0;
     haddr_t sbe_tag = 0;
 
@@ -520,7 +522,9 @@ check_file_open_tags(hid_t fcpl, int type)
 {
     /* Variable Declarations */
     hid_t fid = -1;          /* File Identifier */
+#ifndef NDEBUG
     int verbose = FALSE;     /* verbose file outout */
+#endif /* NDEBUG */ /* end debugging functions */
     haddr_t root_tag;       /* Root Group Tag */
     haddr_t sbe_tag;        /* Sblock Extension Tag */
 
@@ -627,7 +631,9 @@ check_group_creation_tags(void)
     /* Variable Declarations */
     hid_t fid = -1;          /* File Identifier */
     hid_t gid = -1;          /* Group Identifier */
+#ifndef NDEBUG
     int verbose = FALSE;     /* verbose file outout */
+#endif /* NDEBUG */ /* end debugging functions */
     haddr_t root_tag = HADDR_UNDEF;   /* Root Group Tag */
     haddr_t g_tag;          /* Group Tag */
 
@@ -722,7 +728,9 @@ check_multi_group_creation_tags(void)
     /* Variable Declarations */
     hid_t fid = -1;          /* File Identifier */
     hid_t gid = -1;          /* Group Identifier */
+#ifndef NDEBUG
     int verbose = FALSE;     /* verbose file outout */
+#endif /* NDEBUG */ /* end debugging functions */
     char gname[16];          /* group name buffer */
     int i = 0;               /* iterator */
     hid_t fapl = -1;         /* File access prop list */
@@ -850,7 +858,9 @@ check_link_iteration_tags(void)
     hid_t fid = -1;          /* File Identifier */
     hid_t sid = -1;          /* Group Identifier */
     hid_t did = -1;          /* Group Identifier */
+#ifndef NDEBUG
     int verbose = FALSE;     /* verbose file outout */
+#endif /* NDEBUG */ /* end debugging functions */
     int i = 0;               /* iterator */
     haddr_t root_tag = 0;   /* Root Group Tag Value */
     char dsetname[500];      /* Name of dataset */
@@ -964,7 +974,9 @@ check_dense_attribute_tags(void)
     hid_t sid = -1;          /* Group Identifier */
     hid_t did = -1;          /* Group Identifier */
     hid_t dcpl = -1;         /* Group Identifier */
+#ifndef NDEBUG
     int verbose = FALSE;     /* verbose file outout */
+#endif /* NDEBUG */ /* end debugging functions */
     int i = 0;               /* iterator */
     hid_t fapl = -1;         /* File access property list */
     haddr_t d_tag = 0;       /* Dataset tag value */
@@ -1144,7 +1156,9 @@ check_group_open_tags(void)
     /* Variable Declarations */
     hid_t fid = -1;          /* File Identifier */
     hid_t gid = -1;          /* Group Identifier */
+#ifndef NDEBUG
     int verbose = FALSE;     /* verbose file output */
+#endif /* NDEBUG */ /* end debugging functions */
     haddr_t root_tag = HADDR_UNDEF;
     haddr_t g_tag;
 
@@ -1247,7 +1261,9 @@ check_attribute_creation_tags(hid_t fcpl, int type)
     hid_t aid = -1;          /* Attribute Identifier */
     hid_t gid = -1;          /* Group Identifier */
     hid_t sid = -1;          /* Dataspace Identifier */
+#ifndef NDEBUG
     int verbose = FALSE;     /* verbose file outout */
+#endif /* NDEBUG */ /* end debugging functions */
     haddr_t root_tag = 0;   /* Root group tag */
     haddr_t g_tag = 0;
     hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */
@@ -1376,7 +1392,9 @@ check_attribute_open_tags(hid_t fcpl, int type)
     hid_t aid = -1;          /* Attribute Identifier */
     hid_t gid = -1;          /* Group Identifier */
     hid_t sid = -1;          /* Dataspace Identifier */
+#ifndef NDEBUG
     int verbose = FALSE;     /* verbose file outout */
+#endif /* NDEBUG */ /* end debugging functions */
     haddr_t root_tag = 0;
     haddr_t g_tag = 0;
     hsize_t dims1[2] = {DIMS, DIMS}; /* dimensions */
@@ -1507,7 +1525,9 @@ check_attribute_rename_tags(hid_t fcpl, int type)
     hid_t gid = -1;                         /* Group Identifier */
     hid_t aid = -1;                         /* Attribute Identifier */
     hid_t sid = -1;                         /* Dataset Identifier */
+#ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
+#endif /* NDEBUG */ /* end debugging functions */
     int *data = NULL;                       /* data buffer */
     int i,j,k = 0;                          /* iterators */
     haddr_t root_tag = 0;
@@ -1686,7 +1706,9 @@ check_attribute_delete_tags(hid_t fcpl, int type)
     hid_t gid = -1;                         /* Group Identifier */
     hid_t aid = -1;                         /* Attribute Identifier */
     hid_t sid = -1;                         /* Dataset Identifier */
+#ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
+#endif /* NDEBUG */ /* end debugging functions */
     int *data = NULL;                       /* data buffer */
     int i,j,k = 0;                          /* iterators */
     haddr_t root_tag = 0;
@@ -1843,7 +1865,9 @@ check_dataset_creation_tags(hid_t fcpl, int type)
     hid_t fid = -1;                         /* File Identifier */
     hid_t did = -1;                         /* Dataset Identifier */
     hid_t sid = -1;                         /* Dataspace Identifier */
+#ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
+#endif /* NDEBUG */ /* end debugging functions */
     hid_t dcpl = -1;                        /* dataset creation pl */
     hsize_t cdims[2] = {1,1};               /* chunk dimensions */
     int fillval = 0;
@@ -1970,7 +1994,9 @@ check_dataset_creation_earlyalloc_tags(hid_t fcpl, int type)
     hid_t fid = -1;                         /* File Identifier */
     hid_t did = -1;                         /* Dataset Identifier */
     hid_t sid = -1;                         /* Dataspace Identifier */
+#ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
+#endif /* NDEBUG */ /* end debugging functions */
     hid_t dcpl = -1;                        /* dataset creation pl */
     hsize_t cdims[2] = {1,1};               /* chunk dimensions */
     int fillval = 0;
@@ -2101,7 +2127,9 @@ check_dataset_open_tags(void)
     hid_t fid = -1;                         /* File Identifier */
     hid_t did = -1;                         /* Dataset Identifier */
     hid_t sid = -1;                         /* Dataspace Identifier */
+#ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
+#endif /* NDEBUG */ /* end debugging functions */
     hid_t dcpl = -1;                        /* dataset creation pl */
     hsize_t cdims[2] = {1,1};               /* chunk dimensions */
     int fillval = 0;
@@ -2221,7 +2249,9 @@ check_dataset_write_tags(void)
     hid_t fid = -1;                         /* File Identifier */
     hid_t did = -1;                         /* Dataset Identifier */
     hid_t sid = -1;                         /* Dataspace Identifier */
+#ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
+#endif /* NDEBUG */ /* end debugging functions */
     hid_t dcpl = -1;                        /* dataset creation pl */
     hsize_t cdims[2] = {1,1};               /* chunk dimensions */
     int fillval = 0;
@@ -2357,7 +2387,9 @@ check_attribute_write_tags(hid_t fcpl, int type)
     hid_t gid = -1;                         /* Group Identifier */
     hid_t aid = -1;                         /* Attribute Identifier */
     hid_t sid = -1;                         /* Dataset Identifier */
+#ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
+#endif /* NDEBUG */ /* end debugging functions */
     int *data = NULL;                       /* data buffer */
     int i,j,k = 0;                          /* iterators */
     haddr_t root_tag = 0;
@@ -2504,7 +2536,9 @@ check_dataset_read_tags(void)
     hid_t fid = -1;                         /* File Identifier */
     hid_t did = -1;                         /* Dataset Identifier */
     hid_t sid = -1;                         /* Dataspace Identifier */
+#ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
+#endif /* NDEBUG */ /* end debugging functions */
     hid_t dcpl = -1;                        /* dataset creation pl */
     hsize_t cdims[2] = {1,1};               /* chunk dimensions */
     int fillval = 0;
@@ -2635,7 +2669,9 @@ check_dataset_size_retrieval(void)
     hid_t fid = -1;                         /* File Identifier */
     hid_t did = -1;                         /* Dataset Identifier */
     hid_t sid = -1;                         /* Dataspace Identifier */
+#ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
+#endif /* NDEBUG */ /* end debugging functions */
     hid_t dcpl = -1;                        /* dataset creation pl */
     hsize_t cdims[2] = {1,1};               /* chunk dimensions */
     int fillval = 0;
@@ -2768,7 +2804,9 @@ check_dataset_extend_tags(void)
     hid_t fid = -1;                         /* File Identifier */
     hid_t did = -1;                         /* Dataset Identifier */
     hid_t sid = -1;                         /* Dataspace Identifier */
+#ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
+#endif /* NDEBUG */ /* end debugging functions */
     hid_t dcpl = -1;                        /* dataset creation pl */
     hsize_t cdims[2] = {1,1};               /* chunk dimensions */
     int fillval = 0;
@@ -2899,7 +2937,9 @@ check_object_info_tags(void)
     /* Variable Declarations */
     hid_t fid = -1;          /* File Identifier */
     hid_t gid = -1;          /* Group Identifier */
+#ifndef NDEBUG
     int verbose = FALSE;     /* verbose file output */
+#endif /* NDEBUG */ /* end debugging functions */
     haddr_t root_tag = HADDR_UNDEF;
     haddr_t g_tag;
     H5O_info_t oinfo;                       /* Object info struct */
@@ -3002,7 +3042,9 @@ check_object_copy_tags(void)
     /* Variable Declarations */
     hid_t fid = -1;                         /* File Identifier */
     hid_t gid = -1;                         /* Group Identifier */
+#ifndef NDEBUG
     int verbose = FALSE;     /* verbose file output */
+#endif /* NDEBUG */ /* end debugging functions */
     haddr_t root_tag = HADDR_UNDEF;
     haddr_t g_tag;
     haddr_t copy_tag;
@@ -3117,7 +3159,9 @@ check_link_removal_tags(hid_t fcpl, int type)
     hid_t did = -1;                         /* Dataset Identifier */
     hid_t sid = -1;                         /* Dataspace Identifier */
     hid_t gid = -1;                         /* Dataspace Identifier */
+#ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
+#endif /* NDEBUG */ /* end debugging functions */
     hid_t dcpl = -1;                        /* dataset creation pl */
     hsize_t cdims[2] = {1,1};               /* chunk dimensions */
     int fillval = 0;
@@ -3270,7 +3314,9 @@ check_link_getname_tags(void)
     hid_t did = -1;                         /* Dataset Identifier */
     hid_t sid = -1;                         /* Dataspace Identifier */
     hid_t gid = -1;                         /* Dataspace Identifier */
+#ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
+#endif /* NDEBUG */ /* end debugging functions */
     hid_t dcpl = -1;                        /* dataset creation pl */
     hsize_t cdims[2] = {1,1};               /* chunk dimensions */
     int fillval = 0;
@@ -3413,7 +3459,9 @@ check_external_link_creation_tags(void)
     hid_t fid = -1;                         /* File Identifier */
     hid_t fid2 = -1;                         /* File Identifier */
     hid_t gid = -1;                         /* Dataspace Identifier */
+#ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
+#endif /* NDEBUG */ /* end debugging functions */
     haddr_t root_tag = 0;
 
     /* Testing Macro */
@@ -3513,7 +3561,9 @@ check_external_link_open_tags(void)
     hid_t fid2 = -1;                        /* File Identifier */
     hid_t gid = -1;                         /* Dataspace Identifier */
     hid_t xid = -1;                         /* Dataspace Identifier */
+#ifndef NDEBUG
     int verbose = FALSE;                    /* verbose file outout */
+#endif /* NDEBUG */ /* end debugging functions */
     haddr_t root_tag = 0;
     haddr_t root2_tag = 0;