Merge branch 'develop' into dset_ohdr_minimize

1 files changed, 90 insertions, 101 deletions

diff --git a/src/H5trace.c b/src/H5trace.c
index a628da3..6bb6f02 100644
--- a/src/H5trace.c
+++ b/src/H5trace.c
@@ -135,7 +135,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
 
     if(!out)
         return 0.0F;	/*tracing is off*/
-    va_start(ap, type);
+    HDva_start(ap, type);
 
     if(H5_debug_g.ttop) {
         if(returning) {
@@ -227,7 +227,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
          * name is the null pointer then don't print the argument or the
          * following `='.  This is used for return values.
          */
-        argname = va_arg(ap, char *);
+        argname = HDva_arg(ap, char *);
         if(argname) {
             unsigned n = (unsigned)MAX (0, (int)HDstrlen(argname) - 3);
 
@@ -243,7 +243,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
 
         /* The value */
         if(ptr)
-            vp = va_arg(ap, void *);
+            vp = HDva_arg(ap, void *);
         switch(type[0]) {
             case 'a':
                 if(ptr) {
@@ -253,7 +253,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    haddr_t addr = va_arg(ap, haddr_t);
+                    haddr_t addr = HDva_arg(ap, haddr_t);
 
                     HDfprintf(out, "%a", addr);
                 } /* end else */
@@ -267,8 +267,8 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         HDfprintf(out, "NULL");
                     } /* end if */
                 else {
-                    /* Can't pass hbool_t to va_arg() */
-                    hbool_t bool_var = (hbool_t)va_arg(ap, int);
+                    /* Can't pass hbool_t to HDva_arg() */
+                    hbool_t bool_var = (hbool_t)HDva_arg(ap, int);
                     if(TRUE == bool_var)
                         HDfprintf(out, "TRUE");
                     else if(!bool_var)
@@ -286,7 +286,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    double dbl = va_arg(ap, double);
+                    double dbl = HDva_arg(ap, double);
 
                     HDfprintf(out, "%g", dbl);
                 } /* end else */
@@ -302,7 +302,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5D_alloc_time_t alloc_time = (H5D_alloc_time_t)va_arg(ap, int);
+                            H5D_alloc_time_t alloc_time = (H5D_alloc_time_t)HDva_arg(ap, int);
 
                             switch(alloc_time) {
                                 case H5D_ALLOC_TIME_ERROR:
@@ -340,7 +340,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5FD_mpio_collective_opt_t opt = (H5FD_mpio_collective_opt_t)va_arg(ap, int);
+                            H5FD_mpio_collective_opt_t opt = (H5FD_mpio_collective_opt_t)HDva_arg(ap, int);
 
                             switch(opt) {
                                 case H5FD_MPIO_COLLECTIVE_IO:
@@ -366,7 +366,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5D_fill_time_t fill_time = (H5D_fill_time_t)va_arg(ap, int);
+                            H5D_fill_time_t fill_time = (H5D_fill_time_t)HDva_arg(ap, int);
 
                             switch(fill_time) {
                                 case H5D_FILL_TIME_ERROR:
@@ -400,7 +400,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5D_fill_value_t fill_value = (H5D_fill_value_t)va_arg(ap, int);
+                            H5D_fill_value_t fill_value = (H5D_fill_value_t)HDva_arg(ap, int);
 
                             switch(fill_value) {
                                 case H5D_FILL_VALUE_ERROR:
@@ -434,7 +434,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5FD_mpio_chunk_opt_t opt = (H5FD_mpio_chunk_opt_t)va_arg(ap, int);
+                            H5FD_mpio_chunk_opt_t opt = (H5FD_mpio_chunk_opt_t)HDva_arg(ap, int);
 
                             switch(opt) {
                                 case H5FD_MPIO_CHUNK_DEFAULT:
@@ -464,7 +464,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5D_mpio_actual_io_mode_t actual_io_mode = (H5D_mpio_actual_io_mode_t)va_arg(ap, int);
+                            H5D_mpio_actual_io_mode_t actual_io_mode = (H5D_mpio_actual_io_mode_t)HDva_arg(ap, int);
 
                             switch(actual_io_mode) {
                                 case H5D_MPIO_NO_COLLECTIVE:
@@ -502,7 +502,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5D_chunk_index_t idx = (H5D_chunk_index_t)va_arg(ap, int);
+                            H5D_chunk_index_t idx = (H5D_chunk_index_t)HDva_arg(ap, int);
 
                             switch(idx) {
                                 case H5D_CHUNK_IDX_BTREE:
@@ -548,7 +548,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5D_layout_t layout = (H5D_layout_t)va_arg(ap, int);
+                            H5D_layout_t layout = (H5D_layout_t)HDva_arg(ap, int);
 
                             switch(layout) {
                                 case H5D_LAYOUT_ERROR:
@@ -590,7 +590,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5D_mpio_no_collective_cause_t nocol_cause_mode = (H5D_mpio_no_collective_cause_t)va_arg(ap, int);
+                            H5D_mpio_no_collective_cause_t nocol_cause_mode = (H5D_mpio_no_collective_cause_t)HDva_arg(ap, int);
                             hbool_t flag_already_displayed = FALSE;
 
                             /* Check for all bit-flags which might be set */
@@ -637,7 +637,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5D_mpio_actual_chunk_opt_mode_t chunk_opt_mode = (H5D_mpio_actual_chunk_opt_mode_t)va_arg(ap, int);
+                            H5D_mpio_actual_chunk_opt_mode_t chunk_opt_mode = (H5D_mpio_actual_chunk_opt_mode_t)HDva_arg(ap, int);
 
                             switch(chunk_opt_mode) {
                                 case H5D_MPIO_NO_CHUNK_OPTIMIZATION:
@@ -667,7 +667,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5D_space_status_t space_status = (H5D_space_status_t)va_arg(ap, int);
+                            H5D_space_status_t space_status = (H5D_space_status_t)HDva_arg(ap, int);
 
                             switch(space_status) {
                                 case H5D_SPACE_STATUS_NOT_ALLOCATED:
@@ -701,7 +701,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5FD_mpio_xfer_t transfer = (H5FD_mpio_xfer_t)va_arg(ap, int);
+                            H5FD_mpio_xfer_t transfer = (H5FD_mpio_xfer_t)HDva_arg(ap, int);
 
                             switch(transfer) {
                                 case H5FD_MPIO_INDEPENDENT:
@@ -727,7 +727,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5D_vds_view_t view = (H5D_vds_view_t)va_arg(ap, int);
+                            H5D_vds_view_t view = (H5D_vds_view_t)HDva_arg(ap, int);
 
                             switch(view) {
                                 case H5D_VDS_ERROR:
@@ -763,7 +763,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                        HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    herr_t status = va_arg(ap, herr_t);
+                    herr_t status = HDva_arg(ap, herr_t);
 
                     if(status >= 0)
                        HDfprintf(out, "SUCCEED");
@@ -782,7 +782,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5E_direction_t direction = (H5E_direction_t)va_arg(ap, int);
+                            H5E_direction_t direction = (H5E_direction_t)HDva_arg(ap, int);
 
                             switch(direction) {
                                 case H5E_WALK_UPWARD:
@@ -808,7 +808,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5E_error2_t *error = va_arg(ap, H5E_error2_t *);
+                            H5E_error2_t *error = HDva_arg(ap, H5E_error2_t *);
 
                            HDfprintf(out, "0x%lx", (unsigned long)error);
                         } /* end else */
@@ -822,7 +822,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5ES_status_t status = (H5ES_status_t)va_arg(ap, int);
+                            H5ES_status_t status = (H5ES_status_t)HDva_arg(ap, int);
 
                             switch(status) {
                                 case H5ES_STATUS_IN_PROGRESS:
@@ -853,7 +853,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5E_type_t etype = (H5E_type_t)va_arg(ap, int);
+                            H5E_type_t etype = (H5E_type_t)HDva_arg(ap, int);
 
                             switch(etype) {
                                 case H5E_MAJOR:
@@ -887,7 +887,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5F_close_degree_t degree = (H5F_close_degree_t)va_arg(ap, int);
+                            H5F_close_degree_t degree = (H5F_close_degree_t)HDva_arg(ap, int);
 
                             switch(degree) {
                                 case H5F_CLOSE_DEFAULT:
@@ -921,7 +921,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5F_fspace_strategy_t fs_strategy = (H5F_fspace_strategy_t)va_arg(ap, int);
+                            H5F_fspace_strategy_t fs_strategy = (H5F_fspace_strategy_t)HDva_arg(ap, int);
 
                             switch(fs_strategy) {
                                 case H5F_FSPACE_STRATEGY_FSM_AGGR:
@@ -956,7 +956,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5F_mem_t mem_type = (H5F_mem_t)va_arg(ap, int);
+                            H5F_mem_t mem_type = (H5F_mem_t)HDva_arg(ap, int);
 
                             switch(mem_type) {
                                 case H5FD_MEM_NOLIST:
@@ -1007,7 +1007,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5F_scope_t scope = (H5F_scope_t)va_arg(ap, int);
+                            H5F_scope_t scope = (H5F_scope_t)HDva_arg(ap, int);
 
                             switch(scope) {
                                 case H5F_SCOPE_LOCAL:
@@ -1042,7 +1042,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5F_libver_t libver_vers = (H5F_libver_t)va_arg(ap, int);
+                            H5F_libver_t libver_vers = (H5F_libver_t)HDva_arg(ap, int);
 
                             switch(libver_vers) {
                                 case H5F_LIBVER_EARLIEST:
@@ -1084,7 +1084,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5G_obj_t obj_type = (H5G_obj_t)va_arg(ap, int);
+                            H5G_obj_t obj_type = (H5G_obj_t)HDva_arg(ap, int);
 
                             switch(obj_type) {
                                 case H5G_UNKNOWN:
@@ -1132,7 +1132,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5G_stat_t *statbuf = va_arg(ap, H5G_stat_t*);
+                            H5G_stat_t *statbuf = HDva_arg(ap, H5G_stat_t*);
 
                             HDfprintf(out, "0x%lx", (unsigned long)statbuf);
                         }
@@ -1166,7 +1166,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    hsize_t hsize = va_arg(ap, hsize_t);
+                    hsize_t hsize = HDva_arg(ap, hsize_t);
 
                     if(H5S_UNLIMITED == hsize)
                         HDfprintf(out, "H5S_UNLIMITED");
@@ -1196,7 +1196,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            hssize_t hssize = va_arg(ap, hssize_t);
+                            hssize_t hssize = HDva_arg(ap, hssize_t);
 
                             HDfprintf(out, "%Hd", hssize);
                             asize[argno] = (hssize_t)hssize;
@@ -1217,7 +1217,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    hid_t obj = va_arg(ap, hid_t);
+                    hid_t obj = HDva_arg(ap, hid_t);
 
                     if(H5P_DEFAULT == obj)
                         HDfprintf(out, "H5P_DEFAULT");
@@ -1355,10 +1355,6 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "%ld (attr)", (long)obj);
                                 break;
 
-                            case H5I_REFERENCE:
-                                HDfprintf(out, "%ld (reference)", (long)obj);
-                                break;
-
                             case H5I_VFL:
                                 HDfprintf(out, "%ld (file driver)", (long)obj);
                                 break;
@@ -1409,7 +1405,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5_index_t idx_type = (H5_index_t)va_arg(ap, int);
+                            H5_index_t idx_type = (H5_index_t)HDva_arg(ap, int);
 
                             switch(idx_type) {
                                 case H5_INDEX_UNKNOWN:
@@ -1443,7 +1439,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5_iter_order_t order = (H5_iter_order_t)va_arg(ap, int);
+                            H5_iter_order_t order = (H5_iter_order_t)HDva_arg(ap, int);
 
                             switch(order) {
                                 case H5_ITER_UNKNOWN:
@@ -1490,7 +1486,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            int is = va_arg(ap, int);
+                            int is = HDva_arg(ap, int);
 
                             HDfprintf (out, "%d", is);
                             asize[argno] = is;
@@ -1505,7 +1501,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5I_type_t id_type = (H5I_type_t)va_arg(ap, int);
+                            H5I_type_t id_type = (H5I_type_t)HDva_arg(ap, int);
 
                             switch (id_type) {
                                 case H5I_UNINIT:
@@ -1540,10 +1536,6 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     HDfprintf(out, "H5I_ATTR");
                                     break;
 
-                                case H5I_REFERENCE:
-                                    HDfprintf(out, "H5I_REFERENCE");
-                                    break;
-
                                 case H5I_VFL:
                                     HDfprintf(out, "H5I_VFL");
                                     break;
@@ -1600,7 +1592,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            unsigned iu = va_arg(ap, unsigned);
+                            unsigned iu = HDva_arg(ap, unsigned);
 
                             HDfprintf(out, "%u", iu);
                             asize[argno] = iu;
@@ -1623,7 +1615,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5L_type_t link_type = (H5L_type_t)va_arg(ap, int);
+                            H5L_type_t link_type = (H5L_type_t)HDva_arg(ap, int);
 
                             switch(link_type) {
                                 case H5L_TYPE_ERROR:
@@ -1670,7 +1662,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         } /* end if */
 #ifdef H5_HAVE_PARALLEL
                         else {
-                            MPI_Comm comm = va_arg(ap, MPI_Comm);
+                            MPI_Comm comm = HDva_arg(ap, MPI_Comm);
 
                             HDfprintf(out, "%ld", (long)comm);
                         } /* end else */
@@ -1686,7 +1678,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         } /* end if */
 #ifdef H5_HAVE_PARALLEL
                         else {
-                            MPI_Info info = va_arg(ap, MPI_Info);
+                            MPI_Info info = HDva_arg(ap, MPI_Info);
 
                             HDfprintf(out, "%ld", (long)info);
                         } /* end else */
@@ -1701,7 +1693,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5FD_mem_t mt = (H5FD_mem_t)va_arg(ap, int);
+                            H5FD_mem_t mt = (H5FD_mem_t)HDva_arg(ap, int);
 
                             switch(mt) {
                                 case H5FD_MEM_NOLIST:
@@ -1760,7 +1752,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    off_t offset = va_arg(ap, off_t);
+                    off_t offset = HDva_arg(ap, off_t);
 
                     HDfprintf (out, "%ld", (long)offset);
                 } /* end else */
@@ -1776,7 +1768,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5O_type_t objtype = (H5O_type_t)va_arg(ap, int);
+                            H5O_type_t objtype = (H5O_type_t)HDva_arg(ap, int);
 
                             switch(objtype) {
                                 case H5O_TYPE_UNKNOWN:
@@ -1820,7 +1812,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    hid_t pclass_id = va_arg(ap, hid_t);
+                    hid_t pclass_id = HDva_arg(ap, hid_t);
                     char *class_name = NULL;
                     H5P_genclass_t *pclass;
 
@@ -1844,7 +1836,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    hobj_ref_t ref = va_arg(ap, hobj_ref_t);
+                    hobj_ref_t ref = HDva_arg(ap, hobj_ref_t);
 
                     HDfprintf(out, "Reference Object=%a", ref);
                 } /* end else */
@@ -1860,7 +1852,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5R_type_t reftype = (H5R_type_t)va_arg(ap, int);
+                            H5R_type_t reftype = (H5R_type_t)HDva_arg(ap, int);
 
                             switch(reftype) {
                                 case H5R_BADTYPE:
@@ -1902,7 +1894,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5S_class_t cls = (H5S_class_t)va_arg(ap, int);
+                            H5S_class_t cls = (H5S_class_t)HDva_arg(ap, int);
 
                             switch(cls) {
                                 case H5S_NO_CLASS:
@@ -1936,7 +1928,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5S_seloper_t so = (H5S_seloper_t)va_arg(ap, int);
+                            H5S_seloper_t so = (H5S_seloper_t)HDva_arg(ap, int);
 
                             switch(so) {
                                 case H5S_SELECT_NOOP:
@@ -1994,7 +1986,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5S_sel_type st = (H5S_sel_type)va_arg(ap, int);
+                            H5S_sel_type st = (H5S_sel_type)HDva_arg(ap, int);
 
                             switch(st) {
                                 case H5S_SEL_ERROR:
@@ -2042,7 +2034,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    const char *str = va_arg(ap, const char *);
+                    const char *str = HDva_arg(ap, const char *);
 
                     HDfprintf(out, "\"%s\"", str);
                 } /* end else */
@@ -2058,7 +2050,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5T_cset_t cset = (H5T_cset_t)va_arg(ap, int);
+                            H5T_cset_t cset = (H5T_cset_t)HDva_arg(ap, int);
 
                             switch(cset) {
                                 case H5T_CSET_ERROR:
@@ -2105,7 +2097,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5T_direction_t direct = (H5T_direction_t)va_arg(ap, int);
+                            H5T_direction_t direct = (H5T_direction_t)HDva_arg(ap, int);
 
                             switch(direct) {
                                 case H5T_DIR_DEFAULT:
@@ -2135,7 +2127,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5T_pers_t pers = (H5T_pers_t)va_arg(ap, int);
+                            H5T_pers_t pers = (H5T_pers_t)HDva_arg(ap, int);
 
                             switch(pers) {
                                 case H5T_PERS_DONTCARE:
@@ -2165,7 +2157,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5T_norm_t norm = (H5T_norm_t)va_arg(ap, int);
+                            H5T_norm_t norm = (H5T_norm_t)HDva_arg(ap, int);
 
                             switch(norm) {
                                 case H5T_NORM_ERROR:
@@ -2199,7 +2191,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5T_order_t order = (H5T_order_t)va_arg(ap, int);
+                            H5T_order_t order = (H5T_order_t)HDva_arg(ap, int);
 
                             switch(order) {
                                 case H5T_ORDER_ERROR:
@@ -2241,7 +2233,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5T_pad_t pad = (H5T_pad_t)va_arg(ap, int);
+                            H5T_pad_t pad = (H5T_pad_t)HDva_arg(ap, int);
 
                             switch(pad) {
                                 case H5T_PAD_ERROR:
@@ -2279,7 +2271,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5T_sign_t sign = (H5T_sign_t)va_arg(ap, int);
+                            H5T_sign_t sign = (H5T_sign_t)HDva_arg(ap, int);
 
                             switch(sign) {
                                 case H5T_SGN_ERROR:
@@ -2313,7 +2305,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5T_class_t type_class = (H5T_class_t)va_arg(ap, int);
+                            H5T_class_t type_class = (H5T_class_t)HDva_arg(ap, int);
 
                             switch(type_class) {
                                 case H5T_NO_CLASS:
@@ -2383,7 +2375,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5T_str_t str = (H5T_str_t)va_arg(ap, int);
+                            H5T_str_t str = (H5T_str_t)HDva_arg(ap, int);
 
                             switch(str) {
                                 case H5T_STR_ERROR:
@@ -2439,7 +2431,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    htri_t tri_var = va_arg (ap, htri_t);
+                    htri_t tri_var = HDva_arg (ap, htri_t);
 
                     if(tri_var>0)
                         HDfprintf (out, "TRUE");
@@ -2469,7 +2461,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            unsigned long iul = va_arg(ap, unsigned long);
+                            unsigned long iul = HDva_arg(ap, unsigned long);
 
                             HDfprintf(out, "%lu", iul);
                             asize[argno] = (hssize_t)iul;
@@ -2493,7 +2485,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            unsigned long long iull = va_arg(ap, unsigned long long);
+                            unsigned long long iull = HDva_arg(ap, unsigned long long);
 
                             HDfprintf(out, "%llu", iull);
                             asize[argno] = (hssize_t)iull;
@@ -2516,7 +2508,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5VL_attr_get_t get = (H5VL_attr_get_t)va_arg(ap, int);
+                            H5VL_attr_get_t get = (H5VL_attr_get_t)HDva_arg(ap, int);
 
                             switch(get) {
                                 case H5VL_ATTR_GET_SPACE:
@@ -2551,7 +2543,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5VL_attr_specific_t specific = (H5VL_attr_specific_t)va_arg(ap, int);
+                            H5VL_attr_specific_t specific = (H5VL_attr_specific_t)HDva_arg(ap, int);
 
                             switch(specific) {
                                 case H5VL_ATTR_DELETE:
@@ -2580,7 +2572,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5VL_class_value_t class_val = (H5VL_class_value_t)va_arg(ap, H5VL_class_value_t);
+                            H5VL_class_value_t class_val = (H5VL_class_value_t)HDva_arg(ap, H5VL_class_value_t);
 
                             if(H5_VOL_NATIVE == class_val)
                                 HDfprintf(out, "H5_VOL_NATIVE");
@@ -2596,7 +2588,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5VL_dataset_get_t get = (H5VL_dataset_get_t)va_arg(ap, int);
+                            H5VL_dataset_get_t get = (H5VL_dataset_get_t)HDva_arg(ap, int);
 
                             switch(get) {
                                 case H5VL_DATASET_GET_SPACE:
@@ -2634,7 +2626,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5VL_dataset_specific_t specific = (H5VL_dataset_specific_t)va_arg(ap, int);
+                            H5VL_dataset_specific_t specific = (H5VL_dataset_specific_t)HDva_arg(ap, int);
 
                             switch(specific) {
                                 case H5VL_DATASET_SET_EXTENT:
@@ -2660,7 +2652,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5VL_datatype_get_t get = (H5VL_datatype_get_t)va_arg(ap, int);
+                            H5VL_datatype_get_t get = (H5VL_datatype_get_t)HDva_arg(ap, int);
 
                             switch(get) {
                                 case H5VL_DATATYPE_GET_BINARY:
@@ -2683,7 +2675,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5VL_datatype_specific_t specific = (H5VL_datatype_specific_t)va_arg(ap, int);
+                            H5VL_datatype_specific_t specific = (H5VL_datatype_specific_t)HDva_arg(ap, int);
 
                             switch(specific) {
                                 case H5VL_DATATYPE_FLUSH:
@@ -2706,7 +2698,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5VL_file_get_t get = (H5VL_file_get_t)va_arg(ap, int);
+                            H5VL_file_get_t get = (H5VL_file_get_t)HDva_arg(ap, int);
 
                             switch(get) {
                                 case H5VL_FILE_GET_FAPL:
@@ -2744,7 +2736,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5VL_file_specific_t specific = (H5VL_file_specific_t)va_arg(ap, int);
+                            H5VL_file_specific_t specific = (H5VL_file_specific_t)HDva_arg(ap, int);
 
                             switch(specific) {
                                 case H5VL_FILE_FLUSH:
@@ -2762,9 +2754,6 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 case H5VL_FILE_IS_ACCESSIBLE:
                                     HDfprintf(out, "H5VL_FILE_IS_ACCESSIBLE");
                                     break;
-                                case H5VL_FILE_CACHE_VOL_CONN:
-                                    HDfprintf(out, "H5VL_FILE_CACHE_VOL_CONN");
-                                    break;
                                 default:
                                     HDfprintf(out, "%ld", (long)specific);
                                     break;
@@ -2779,7 +2768,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5VL_group_get_t get = (H5VL_group_get_t)va_arg(ap, int);
+                            H5VL_group_get_t get = (H5VL_group_get_t)HDva_arg(ap, int);
 
                             switch(get) {
                                 case H5VL_GROUP_GET_GCPL:
@@ -2802,7 +2791,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5VL_group_specific_t specific = (H5VL_group_specific_t)va_arg(ap, int);
+                            H5VL_group_specific_t specific = (H5VL_group_specific_t)HDva_arg(ap, int);
 
                             switch(specific) {
                                 case H5VL_GROUP_FLUSH:
@@ -2825,7 +2814,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5VL_link_create_type_t create = (H5VL_link_create_type_t)va_arg(ap, int);
+                            H5VL_link_create_type_t create = (H5VL_link_create_type_t)HDva_arg(ap, int);
 
                             switch(create) {
                                 case H5VL_LINK_CREATE_HARD:
@@ -2851,7 +2840,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5VL_link_get_t get = (H5VL_link_get_t)va_arg(ap, int);
+                            H5VL_link_get_t get = (H5VL_link_get_t)HDva_arg(ap, int);
 
                             switch(get) {
                                 case H5VL_LINK_GET_INFO:
@@ -2877,7 +2866,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5VL_link_specific_t specific = (H5VL_link_specific_t)va_arg(ap, int);
+                            H5VL_link_specific_t specific = (H5VL_link_specific_t)HDva_arg(ap, int);
 
                             switch(specific) {
                                 case H5VL_LINK_DELETE:
@@ -2903,7 +2892,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5VL_object_get_t get = (H5VL_object_get_t)va_arg(ap, int);
+                            H5VL_object_get_t get = (H5VL_object_get_t)HDva_arg(ap, int);
 
                             switch(get) {
                                 case H5VL_REF_GET_REGION:
@@ -2932,7 +2921,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5VL_object_specific_t specific = (H5VL_object_specific_t)va_arg(ap, int);
+                            H5VL_object_specific_t specific = (H5VL_object_specific_t)HDva_arg(ap, int);
 
                             switch(specific) {
                                 case H5VL_OBJECT_CHANGE_REF_COUNT:
@@ -2967,7 +2956,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5VL_request_specific_t specific = (H5VL_request_specific_t)va_arg(ap, int);
+                            H5VL_request_specific_t specific = (H5VL_request_specific_t)HDva_arg(ap, int);
 
                             switch(specific) {
                                 case H5VL_REQUEST_WAITANY:
@@ -3012,7 +3001,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    vp = va_arg (ap, void *);
+                    vp = HDva_arg (ap, void *);
 
                     if(vp)
                         HDfprintf(out, "0x%lx", (unsigned long)vp);
@@ -3038,7 +3027,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    size_t size = va_arg(ap, size_t);
+                    size_t size = HDva_arg(ap, size_t);
 
                     HDfprintf(out, "%Zu", size);
                     asize[argno] = (hssize_t)size;
@@ -3055,7 +3044,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5Z_SO_scale_type_t scale_type = (H5Z_SO_scale_type_t)va_arg(ap, int);
+                            H5Z_SO_scale_type_t scale_type = (H5Z_SO_scale_type_t)HDva_arg(ap, int);
 
                             switch(scale_type) {
                                 case H5Z_SO_FLOAT_DSCALE:
@@ -3085,7 +3074,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5Z_class2_t *filter = va_arg(ap, H5Z_class2_t*);
+                            H5Z_class2_t *filter = HDva_arg(ap, H5Z_class2_t*);
 
                             HDfprintf(out, "0x%lx", (unsigned long)filter);
                         } /* end else */
@@ -3099,7 +3088,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5Z_EDC_t edc = (H5Z_EDC_t)va_arg(ap, int);
+                            H5Z_EDC_t edc = (H5Z_EDC_t)HDva_arg(ap, int);
 
                             if(H5Z_DISABLE_EDC == edc)
                                 HDfprintf(out, "H5Z_DISABLE_EDC");
@@ -3118,7 +3107,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5Z_filter_t id = va_arg(ap, H5Z_filter_t);
+                            H5Z_filter_t id = HDva_arg(ap, H5Z_filter_t);
 
                             if(H5Z_FILTER_DEFLATE == id)
                                 HDfprintf(out, "H5Z_FILTER_DEFLATE");
@@ -3144,7 +3133,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            ssize_t ssize = va_arg(ap, ssize_t);
+                            ssize_t ssize = HDva_arg(ap, ssize_t);
 
                             HDfprintf(out, "%Zd", ssize);
                             asize[argno] = (hssize_t)ssize;
@@ -3172,7 +3161,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                 (event_time.etime - *returning));
 
 error:
-    va_end(ap);
+    HDva_end(ap);
     if(returning)
         HDfprintf(out, ";\n");
     else {