[svn-r13475] There's a configure issue linking szip's shared libraries when running on kagiso.

The static szip libraries are working as intended, but when shared szip 
libraries are present and intended for use they cannot be opened. A check 
has been implemented to test if shared szip libraries are functional on 
current platform. If they are not, and the user is trying to use them, 
szip is now disbaled and the user is informed.

This issue occurs on kagiso, and the resolution was tested on kagiso.

32 files changed, 170 insertions, 148 deletions

diff --git a/src/H5A.c b/src/H5A.c
index dd49708..32061f2 100644
--- a/src/H5A.c
+++ b/src/H5A.c
@@ -231,7 +231,7 @@ H5Acreate2(hid_t loc_id, const char *obj_name, const char *attr_name,
     hid_t		ret_value;              /* Return value */
 
     FUNC_ENTER_API(H5Acreate2, FAIL)
-    H5TRACE8("i", "issiiiii", loc_id, obj_name, attr_name, type_id, space_id,
+    H5TRACE8("i", "i*s*siiiii", loc_id, obj_name, attr_name, type_id, space_id,
              acpl_id, aapl_id, lapl_id);
 
     /* check arguments */
@@ -451,7 +451,7 @@ H5Aopen(hid_t loc_id, const char *obj_name, const char *attr_name,
     hid_t		ret_value;
 
     FUNC_ENTER_API(H5Aopen, FAIL)
-    H5TRACE5("i", "issii", loc_id, obj_name, attr_name, aapl_id, lapl_id);
+    H5TRACE5("i", "i*s*sii", loc_id, obj_name, attr_name, aapl_id, lapl_id);
 
     /* check arguments */
     if(H5I_ATTR == H5I_get_type(loc_id))
@@ -519,7 +519,7 @@ H5Aopen_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
     hid_t	ret_value;      /* Return value */
 
     FUNC_ENTER_API(H5Aopen_by_idx, FAIL)
-    H5TRACE7("i", "isIiIohii", loc_id, obj_name, idx_type, order, n, aapl_id,
+    H5TRACE7("i", "i*sIiIohii", loc_id, obj_name, idx_type, order, n, aapl_id,
              lapl_id);
 
     /* check arguments */
@@ -769,7 +769,7 @@ H5Awrite(hid_t attr_id, hid_t dtype_id, const void *buf)
     herr_t	    ret_value;
 
     FUNC_ENTER_API(H5Awrite, FAIL)
-    H5TRACE3("e", "iix", attr_id, dtype_id, buf);
+    H5TRACE3("e", "ii*x", attr_id, dtype_id, buf);
 
     /* check arguments */
     if(NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))
@@ -927,7 +927,7 @@ H5Aread(hid_t attr_id, hid_t dtype_id, void *buf)
     herr_t		ret_value;
 
     FUNC_ENTER_API(H5Aread, FAIL)
-    H5TRACE3("e", "iix", attr_id, dtype_id, buf);
+    H5TRACE3("e", "ii*x", attr_id, dtype_id, buf);
 
     /* check arguments */
     if(NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))
@@ -1234,7 +1234,7 @@ H5Aget_name(hid_t attr_id, size_t buf_size, char *buf)
     ssize_t		ret_value;
 
     FUNC_ENTER_API(H5Aget_name, FAIL)
-    H5TRACE3("Zs", "izs", attr_id, buf_size, buf);
+    H5TRACE3("Zs", "iz*s", attr_id, buf_size, buf);
 
     /* check arguments */
     if(NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))
@@ -1292,7 +1292,7 @@ H5Aget_name_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
     ssize_t	ret_value;      /* Return value */
 
     FUNC_ENTER_API(H5Aget_name_by_idx, FAIL)
-    H5TRACE8("Zs", "isIiIohxzi", loc_id, obj_name, idx_type, order, n, name, size,
+    H5TRACE8("Zs", "i*sIiIohxzi", loc_id, obj_name, idx_type, order, n, name, size,
              lapl_id);
 
     /* Check args */
@@ -1425,6 +1425,7 @@ H5Aget_info(hid_t attr_id, H5A_info_t *ainfo)
     herr_t	ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_API(H5Aget_info, FAIL)
+    H5TRACE2("e", "i*x", attr_id, ainfo);
 
     /* Check args */
     if(NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))
@@ -1461,6 +1462,7 @@ H5Aget_info_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
     herr_t	ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_API(H5Aget_info_by_name, FAIL)
+    H5TRACE5("e", "i*s*s*xi", loc_id, obj_name, attr_name, ainfo, lapl_id);
 
     /* Check args */
     if(H5I_ATTR == H5I_get_type(loc_id))
@@ -1519,6 +1521,8 @@ H5Aget_info_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
     herr_t	ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_API(H5Aget_info_by_idx, FAIL)
+    H5TRACE7("e", "i*sIiIoh*xi", loc_id, obj_name, idx_type, order, n, ainfo,
+             lapl_id);
 
     /* Check args */
     if(H5I_ATTR == H5I_get_type(loc_id))
@@ -1622,7 +1626,8 @@ H5Arename2(hid_t loc_id, const char *obj_name, const char *old_attr_name,
     herr_t	ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_API(H5Arename2, FAIL)
-    H5TRACE5("e", "isssi", loc_id, obj_name, old_attr_name, new_attr_name, lapl_id);
+    H5TRACE5("e", "i*s*s*si", loc_id, obj_name, old_attr_name, new_attr_name,
+             lapl_id);
 
     /* check arguments */
     if(H5I_ATTR == H5I_get_type(loc_id))
@@ -1727,6 +1732,8 @@ H5Aiterate2(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
     herr_t	ret_value;      /* Return value */
 
     FUNC_ENTER_API(H5Aiterate2, FAIL)
+    H5TRACE8("e", "i*sIiIo*hx*xi", loc_id, obj_name, idx_type, order, idx, op,
+             op_data, lapl_id);
 
     /* check arguments */
     if(H5I_ATTR == H5I_get_type(loc_id))
@@ -1813,7 +1820,7 @@ H5Adelete2(hid_t loc_id, const char *obj_name, const char *attr_name,
     herr_t	ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_API(H5Adelete2, FAIL)
-    H5TRACE4("e", "issi", loc_id, obj_name, attr_name, lapl_id);
+    H5TRACE4("e", "i*s*si", loc_id, obj_name, attr_name, lapl_id);
 
     /* check arguments */
     if(H5I_ATTR == H5I_get_type(loc_id))
@@ -1889,7 +1896,7 @@ H5Adelete_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
     herr_t	ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_API(H5Adelete_by_idx, FAIL)
-    H5TRACE6("e", "isIiIohi", loc_id, obj_name, idx_type, order, n, lapl_id);
+    H5TRACE6("e", "i*sIiIohi", loc_id, obj_name, idx_type, order, n, lapl_id);
 
     /* check arguments */
     if(H5I_ATTR == H5I_get_type(loc_id))
diff --git a/src/H5Adeprec.c b/src/H5Adeprec.c
index b235a5c..e9d8327 100644
--- a/src/H5Adeprec.c
+++ b/src/H5Adeprec.c
@@ -140,7 +140,7 @@ H5Acreate(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
     hid_t		ret_value;              /* Return value */
 
     FUNC_ENTER_API(H5Acreate, FAIL)
-    H5TRACE5("i", "isiii", loc_id, name, type_id, space_id, plist_id);
+    H5TRACE5("i", "i*siii", loc_id, name, type_id, space_id, plist_id);
 
     /* check arguments */
     if(H5I_ATTR == H5I_get_type(loc_id))
@@ -193,7 +193,7 @@ H5Aopen_name(hid_t loc_id, const char *name)
     hid_t		ret_value;
 
     FUNC_ENTER_API(H5Aopen_name, FAIL)
-    H5TRACE2("i", "is", loc_id, name);
+    H5TRACE2("i", "i*s", loc_id, name);
 
     /* check arguments */
     if(H5I_ATTR == H5I_get_type(loc_id))
@@ -355,7 +355,7 @@ H5Arename(hid_t loc_id, const char *old_name, const char *new_name)
     herr_t	ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_API(H5Arename, FAIL)
-    H5TRACE3("e", "iss", loc_id, old_name, new_name);
+    H5TRACE3("e", "i*s*s", loc_id, old_name, new_name);
 
     /* check arguments */
     if(!old_name || !new_name)
@@ -420,7 +420,7 @@ H5Aiterate(hid_t loc_id, unsigned *attr_num, H5A_operator_t op, void *op_data)
     herr_t	        ret_value;      /* Return value */
 
     FUNC_ENTER_API(H5Aiterate, FAIL)
-    H5TRACE4("e", "i*Iuxx", loc_id, attr_num, op, op_data);
+    H5TRACE4("e", "i*Iux*x", loc_id, attr_num, op, op_data);
 
     /* check arguments */
     if(H5I_ATTR == H5I_get_type(loc_id))
@@ -465,7 +465,7 @@ H5Adelete(hid_t loc_id, const char *name)
     herr_t	ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_API(H5Adelete, FAIL)
-    H5TRACE2("e", "is", loc_id, name);
+    H5TRACE2("e", "i*s", loc_id, name);
 
     /* check arguments */
     if(H5I_ATTR == H5I_get_type(loc_id))
diff --git a/src/H5D.c b/src/H5D.c
index 3d4239d..2ffe9e2 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -298,7 +298,7 @@ H5Dcreate(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
     hid_t           ret_value;          /* Return value */
 
     FUNC_ENTER_API(H5Dcreate, FAIL)
-    H5TRACE5("i", "isiii", loc_id, name, type_id, space_id, dcpl_id);
+    H5TRACE5("i", "i*siii", loc_id, name, type_id, space_id, dcpl_id);
 
     /* Check arguments */
     if(H5G_loc(loc_id, &loc) < 0)
@@ -481,7 +481,7 @@ H5Dopen(hid_t loc_id, const char *name)
     hid_t        ret_value;
 
     FUNC_ENTER_API(H5Dopen, FAIL)
-    H5TRACE2("i", "is", loc_id, name);
+    H5TRACE2("i", "i*s", loc_id, name);
 
     /* Check args */
     if(H5G_loc(loc_id, &loc) < 0)
@@ -562,7 +562,7 @@ H5Dopen_expand(hid_t loc_id, const char *name, hid_t dapl_id)
     hid_t        ret_value;
 
     FUNC_ENTER_API(H5Dopen_expand, FAIL)
-    H5TRACE3("i", "isi", loc_id, name, dapl_id);
+    H5TRACE3("i", "i*si", loc_id, name, dapl_id);
 
     /* Check args */
     if(H5G_loc(loc_id, &loc) < 0)
@@ -2736,7 +2736,7 @@ H5Diterate(void *buf, hid_t type_id, hid_t space_id, H5D_operator_t op,
     herr_t ret_value;
 
     FUNC_ENTER_API(H5Diterate, FAIL)
-    H5TRACE5("e", "xiixx", buf, type_id, space_id, op, operator_data);
+    H5TRACE5("e", "*xiix*x", buf, type_id, space_id, op, operator_data);
 
     /* Check args */
     if(NULL==op)
@@ -2814,7 +2814,7 @@ H5Dvlen_reclaim(hid_t type_id, hid_t space_id, hid_t plist_id, void *buf)
     herr_t ret_value;
 
     FUNC_ENTER_API(H5Dvlen_reclaim, FAIL)
-    H5TRACE4("e", "iiix", type_id, space_id, plist_id, buf);
+    H5TRACE4("e", "iii*x", type_id, space_id, plist_id, buf);
 
     /* Check args */
     if(H5I_DATATYPE != H5I_get_type(type_id) || buf == NULL)
diff --git a/src/H5Dio.c b/src/H5Dio.c
index 2459a2b..ceaf86c 100644
--- a/src/H5Dio.c
+++ b/src/H5Dio.c
@@ -184,7 +184,7 @@ H5Dfill(const void *fill, hid_t fill_type_id, void *buf, hid_t buf_type_id, hid_
     herr_t ret_value=SUCCEED;   /* Return value */
 
     FUNC_ENTER_API(H5Dfill, FAIL)
-    H5TRACE5("e", "xixii", fill, fill_type_id, buf, buf_type_id, space_id);
+    H5TRACE5("e", "*xi*xii", fill, fill_type_id, buf, buf_type_id, space_id);
 
     /* Check args */
     if (buf==NULL)
@@ -550,7 +550,7 @@ H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
     herr_t                  ret_value=SUCCEED;  /* Return value */
 
     FUNC_ENTER_API(H5Dwrite, FAIL)
-    H5TRACE6("e", "iiiiix", dset_id, mem_type_id, mem_space_id, file_space_id,
+    H5TRACE6("e", "iiiii*x", dset_id, mem_type_id, mem_space_id, file_space_id,
              plist_id, buf);
 
     /* check arguments */
diff --git a/src/H5E.c b/src/H5E.c
index 25e9f2a..d2291ff 100644
--- a/src/H5E.c
+++ b/src/H5E.c
@@ -371,7 +371,7 @@ H5Eregister_class(const char *cls_name, const char *lib_name, const char *versio
     hid_t       ret_value;   /* Return value */
 
     FUNC_ENTER_API(H5Eregister_class, FAIL)
-    H5TRACE3("i", "sss", cls_name, lib_name, version);
+    H5TRACE3("i", "*s*s*s", cls_name, lib_name, version);
 
     /* Check arguments */
     if (cls_name==NULL || lib_name==NULL || version==NULL)
@@ -536,7 +536,7 @@ H5Eget_class_name(hid_t class_id, char *name, size_t size)
     ssize_t     ret_value;   /* Return value */
 
     FUNC_ENTER_API(H5Eget_class_name, FAIL)
-    H5TRACE3("Zs", "isz", class_id, name, size);
+    H5TRACE3("Zs", "i*sz", class_id, name, size);
 
     /* Get the error class */
     if(NULL==(cls = H5I_object_verify(class_id, H5I_ERROR_CLASS)))
@@ -715,7 +715,7 @@ H5Ecreate_msg(hid_t class_id, H5E_type_t msg_type, const char *msg_str)
     hid_t       ret_value;      /* Return value */
 
     FUNC_ENTER_API(H5Ecreate_msg, FAIL)
-    H5TRACE3("i", "iEts", class_id, msg_type, msg_str);
+    H5TRACE3("i", "iEt*s", class_id, msg_type, msg_str);
 
     /* Check arguments */
     if(msg_type!=H5E_MAJOR && msg_type!=H5E_MINOR)
@@ -906,7 +906,7 @@ H5Eget_msg(hid_t msg_id, H5E_type_t *type, char *msg_str, size_t size)
     ssize_t      ret_value;     /* Return value */
 
     FUNC_ENTER_API(H5Eget_msg, FAIL)
-    H5TRACE4("Zs", "i*Etsz", msg_id, type, msg_str, size);
+    H5TRACE4("Zs", "i*Et*sz", msg_id, type, msg_str, size);
 
     /* Get the message object */
     if((msg = H5I_object_verify(msg_id, H5I_ERROR_MSG))==NULL)
@@ -1449,7 +1449,7 @@ H5Epush(const char *file, const char *func, unsigned line,
 
     /* Don't clear the error stack! :-) */
     FUNC_ENTER_API_NOCLEAR(H5Epush, FAIL)
-    H5TRACE6("e", "ssIuiis", file, func, line, maj, min, str);
+    H5TRACE6("e", "*s*sIuii*s", file, func, line, maj, min, str);
 
     /* Push the error on the stack */
     if(H5E_push_stack(estack, file, func, line, H5E_ERR_CLS_g, maj, min, str)<0)
@@ -2467,7 +2467,7 @@ H5Eget_auto(H5E_auto_t *func, void **client_data)
     herr_t ret_value = SUCCEED;   /* Return value */
 
     FUNC_ENTER_API(H5Eget_auto, FAIL)
-    H5TRACE2("e", "*xx", func, client_data);
+    H5TRACE2("e", "*x**x", func, client_data);
 
     /* Retrieve default error stack */
     if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */
@@ -2507,7 +2507,7 @@ H5Eget_auto_stack(hid_t estack_id, H5E_auto_stack_t *func, void **client_data)
     herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(H5Eget_auto_stack, FAIL)
-    H5TRACE3("e", "i*xx", estack_id, func, client_data);
+    H5TRACE3("e", "i*x**x", estack_id, func, client_data);
 
     if(estack_id == H5E_DEFAULT) {
     	if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */
@@ -2598,7 +2598,7 @@ H5Eset_auto(H5E_auto_t func, void *client_data)
 
     /* Don't clear the error stack! :-) */
     FUNC_ENTER_API_NOCLEAR(H5Eset_auto, FAIL)
-    H5TRACE2("e", "xx", func, client_data);
+    H5TRACE2("e", "x*x", func, client_data);
 
     if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */
         HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get current error stack")
@@ -2646,7 +2646,7 @@ H5Eset_auto_stack(hid_t estack_id, H5E_auto_stack_t func, void *client_data)
 
     /* Don't clear the error stack! :-) */
     FUNC_ENTER_API_NOCLEAR(H5Eset_auto_stack, FAIL)
-    H5TRACE3("e", "ixx", estack_id, func, client_data);
+    H5TRACE3("e", "ix*x", estack_id, func, client_data);
 
     if(estack_id == H5E_DEFAULT) {
     	if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */
diff --git a/src/H5F.c b/src/H5F.c
index bd51aa9..96fe355 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -688,7 +688,7 @@ H5Fget_vfd_handle(hid_t file_id, hid_t fapl, void **file_handle)
     herr_t              ret_value;
 
     FUNC_ENTER_API(H5Fget_vfd_handle, FAIL)
-    H5TRACE3("e", "iix", file_id, fapl, file_handle);
+    H5TRACE3("e", "ii**x", file_id, fapl, file_handle);
 
     /* Check args */
     assert(file_handle);
@@ -762,7 +762,7 @@ H5Fis_hdf5(const char *name)
     htri_t	ret_value;
 
     FUNC_ENTER_API(H5Fis_hdf5, FAIL)
-    H5TRACE1("t", "s", name);
+    H5TRACE1("t", "*s", name);
 
     /* Check args and all the boring stuff. */
     if (!name || !*name)
@@ -1419,7 +1419,7 @@ H5Fcreate(const char *filename, unsigned flags, hid_t fcpl_id, hid_t fapl_id)
     hid_t	ret_value;	        /*return value			*/
 
     FUNC_ENTER_API(H5Fcreate, FAIL)
-    H5TRACE4("i", "sIuii", filename, flags, fcpl_id, fapl_id);
+    H5TRACE4("i", "*sIuii", filename, flags, fcpl_id, fapl_id);
 
     /* Check/fix arguments */
     if (!filename || !*filename)
@@ -1521,7 +1521,7 @@ H5Fopen(const char *filename, unsigned flags, hid_t fapl_id)
     hid_t	ret_value;	        /*return value			*/
 
     FUNC_ENTER_API(H5Fopen, FAIL)
-    H5TRACE3("i", "sIui", filename, flags, fapl_id);
+    H5TRACE3("i", "*sIui", filename, flags, fapl_id);
 
     /* Check/fix arguments. */
     if(!filename || !*filename)
@@ -3224,7 +3224,7 @@ H5Fget_mdc_config(hid_t file_id,
     herr_t     result;
 
     FUNC_ENTER_API(H5Fget_mdc_config, FAIL)
-    H5TRACE2("e", "ix", file_id, config_ptr);
+    H5TRACE2("e", "i*x", file_id, config_ptr);
 
     /* Check args */
     if ( NULL == (file = H5I_object_verify(file_id, H5I_FILE)) ) {
@@ -3283,7 +3283,7 @@ H5Fset_mdc_config(hid_t file_id,
     herr_t     result;
 
     FUNC_ENTER_API(H5Fset_mdc_config, FAIL)
-    H5TRACE2("e", "ix", file_id, config_ptr);
+    H5TRACE2("e", "i*x", file_id, config_ptr);
 
     /* Check args */
     if ( NULL == (file = H5I_object_verify(file_id, H5I_FILE)) ) {
diff --git a/src/H5FD.c b/src/H5FD.c
index 61cee22..ce8d91f 100644
--- a/src/H5FD.c
+++ b/src/H5FD.c
@@ -250,7 +250,7 @@ H5FDregister(const H5FD_class_t *cls)
     H5FD_mem_t		type;
 
     FUNC_ENTER_API(H5FDregister, FAIL)
-    H5TRACE1("i", "x", cls);
+    H5TRACE1("i", "*x", cls);
 
     /* Check arguments */
     if(!cls)
@@ -1109,7 +1109,7 @@ H5FDclose(H5FD_t *file)
     herr_t      ret_value=SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(H5FDclose, FAIL)
-    H5TRACE1("e", "x", file);
+    H5TRACE1("e", "*x", file);
 
     if(!file || !file->cls)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file pointer")
@@ -1277,7 +1277,7 @@ H5FDcmp(const H5FD_t *f1, const H5FD_t *f2)
     int	ret_value;
 
     FUNC_ENTER_API(H5FDcmp, -1) /*return value is arbitrary*/
-    H5TRACE2("Is", "xx", f1, f2);
+    H5TRACE2("Is", "*x*x", f1, f2);
 
     ret_value = H5FD_cmp(f1, f2);
 
@@ -1358,7 +1358,7 @@ H5FDquery(const H5FD_t *f, unsigned long *flags/*out*/)
     int	ret_value;
 
     FUNC_ENTER_API(H5FDquery, FAIL)
-    H5TRACE2("Is", "xx", f, flags);
+    H5TRACE2("Is", "*xx", f, flags);
 
     assert(f);
     assert(flags);
@@ -1454,7 +1454,7 @@ H5FDalloc(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
     haddr_t	ret_value = HADDR_UNDEF;
 
     FUNC_ENTER_API(H5FDalloc, HADDR_UNDEF)
-    H5TRACE4("a", "xMtih", file, type, dxpl_id, size);
+    H5TRACE4("a", "*xMtih", file, type, dxpl_id, size);
 
     /* Check args */
     if(!file || !file->cls)
@@ -2206,7 +2206,7 @@ H5FDfree(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsize_t siz
     herr_t      ret_value=SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(H5FDfree, FAIL)
-    H5TRACE5("e", "xMtiah", file, type, dxpl_id, addr, size);
+    H5TRACE5("e", "*xMtiah", file, type, dxpl_id, addr, size);
 
     /* Check args */
     if(!file || !file->cls)
@@ -2501,7 +2501,7 @@ H5FDrealloc(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t old_addr, hsiz
     haddr_t	ret_value = HADDR_UNDEF;
 
     FUNC_ENTER_API(H5FDrealloc, HADDR_UNDEF)
-    H5TRACE6("a", "xMtiahh", file, type, dxpl_id, old_addr, old_size, new_size);
+    H5TRACE6("a", "*xMtiahh", file, type, dxpl_id, old_addr, old_size, new_size);
 
     /* Check args */
     if(H5P_DEFAULT == dxpl_id)
@@ -2854,7 +2854,7 @@ H5FDget_eoa(H5FD_t *file, H5FD_mem_t type)
     haddr_t	ret_value;
 
     FUNC_ENTER_API(H5FDget_eoa, HADDR_UNDEF)
-    H5TRACE2("a", "xMt", file, type);
+    H5TRACE2("a", "*xMt", file, type);
 
     /* Check args */
     if(!file || !file->cls)
@@ -2943,7 +2943,7 @@ H5FDset_eoa(H5FD_t *file, H5FD_mem_t type, haddr_t addr)
     herr_t      ret_value=SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(H5FDset_eoa, FAIL)
-    H5TRACE3("e", "xMta", file, type, addr);
+    H5TRACE3("e", "*xMta", file, type, addr);
 
     /* Check args */
     if(!file || !file->cls)
@@ -3033,7 +3033,7 @@ H5FDget_eof(H5FD_t *file)
     haddr_t	ret_value;
 
     FUNC_ENTER_API(H5FDget_eof, HADDR_UNDEF)
-    H5TRACE1("a", "x", file);
+    H5TRACE1("a", "*x", file);
 
     /* Check arguments */
     if(!file || !file->cls)
@@ -3114,7 +3114,7 @@ H5FDread(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size
     herr_t      ret_value=SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(H5FDread, FAIL)
-    H5TRACE6("e", "xMtiazx", file, type, dxpl_id, addr, size, buf);
+    H5TRACE6("e", "*xMtiazx", file, type, dxpl_id, addr, size, buf);
 
     /* Check args */
     if(!file || !file->cls)
@@ -3343,7 +3343,7 @@ H5FDwrite(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t siz
     herr_t      ret_value=SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(H5FDwrite, FAIL)
-    H5TRACE6("e", "xMtiazx", file, type, dxpl_id, addr, size, buf);
+    H5TRACE6("e", "*xMtiaz*x", file, type, dxpl_id, addr, size, buf);
 
     /* Check args */
     if(!file || !file->cls)
@@ -3647,7 +3647,7 @@ H5FDflush(H5FD_t *file, hid_t dxpl_id, unsigned closing)
     herr_t      ret_value=SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(H5FDflush, FAIL)
-    H5TRACE3("e", "xiIu", file, dxpl_id, closing);
+    H5TRACE3("e", "*xiIu", file, dxpl_id, closing);
 
     /* Check args */
     if(!file || !file->cls)
@@ -3768,6 +3768,7 @@ H5FDget_vfd_handle(H5FD_t *file, hid_t fapl, void **file_handle)
     herr_t              ret_value;
 
     FUNC_ENTER_API(H5FDget_vfd_handle, FAIL)
+    H5TRACE3("e", "*xi**x", file, fapl, file_handle);
 
     /* Check arguments */
     HDassert(file);
diff --git a/src/H5FDlog.c b/src/H5FDlog.c
index 5886a0f..4645003 100644
--- a/src/H5FDlog.c
+++ b/src/H5FDlog.c
@@ -349,7 +349,7 @@ H5Pset_fapl_log(hid_t fapl_id, const char *logfile, unsigned flags, size_t buf_s
     herr_t ret_value;
 
     FUNC_ENTER_API(H5Pset_fapl_log, FAIL)
-    H5TRACE4("e", "isIuz", fapl_id, logfile, flags, buf_size);
+    H5TRACE4("e", "i*sIuz", fapl_id, logfile, flags, buf_size);
 
     if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index f2555fe..6593969 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -562,6 +562,7 @@ H5Pset_dxpl_mpio_collective_opt(hid_t dxpl_id, H5FD_mpio_collective_opt_t opt_mo
     herr_t ret_value;
 
     FUNC_ENTER_API(H5Pset_dxpl_mpio_collective_opt, FAIL)
+    H5TRACE2("e", "iDc", dxpl_id, opt_mode);
 /*    H5TRACE2("e","iDt",dxpl_id,xfer_mode);*/
 
     if(dxpl_id==H5P_DEFAULT)
@@ -614,6 +615,7 @@ H5Pset_dxpl_mpio_chunk_opt(hid_t dxpl_id, H5FD_mpio_chunk_opt_t opt_mode)
     herr_t ret_value;
 
     FUNC_ENTER_API(H5Pset_dxpl_mpio_chunk_opt, FAIL)
+    H5TRACE2("e", "iDh", dxpl_id, opt_mode);
 /*    H5TRACE2("e","iDt",dxpl_id,xfer_mode);*/
 
     if(dxpl_id==H5P_DEFAULT)
diff --git a/src/H5Fmount.c b/src/H5Fmount.c
index 41ab6d0..538204c 100644
--- a/src/H5Fmount.c
+++ b/src/H5Fmount.c
@@ -481,7 +481,7 @@ H5Fmount(hid_t loc_id, const char *name, hid_t child_id, hid_t plist_id)
     herr_t      ret_value=SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(H5Fmount, FAIL)
-    H5TRACE4("e", "isii", loc_id, name, child_id, plist_id);
+    H5TRACE4("e", "i*sii", loc_id, name, child_id, plist_id);
 
     /* Check arguments */
     if(H5G_loc(loc_id, &loc) < 0)
@@ -531,7 +531,7 @@ H5Funmount(hid_t loc_id, const char *name)
     herr_t      ret_value=SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(H5Funmount, FAIL)
-    H5TRACE2("e", "is", loc_id, name);
+    H5TRACE2("e", "i*s", loc_id, name);
 
     /* Check args */
     if(H5G_loc(loc_id, &loc) < 0)
diff --git a/src/H5G.c b/src/H5G.c
index 86b446e..64eb8c2 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -162,7 +162,7 @@ H5Gcreate(hid_t loc_id, const char *name, size_t size_hint)
     hid_t	    ret_value;
 
     FUNC_ENTER_API(H5Gcreate, FAIL)
-    H5TRACE3("i", "isz", loc_id, name, size_hint);
+    H5TRACE3("i", "i*sz", loc_id, name, size_hint);
 
     /* Check arguments */
     if(H5G_loc(loc_id, &loc) < 0)
@@ -360,7 +360,7 @@ H5Gopen(hid_t loc_id, const char *name)
     hid_t       ret_value;              /* Return value */
 
     FUNC_ENTER_API(H5Gopen, FAIL)
-    H5TRACE2("i", "is", loc_id, name);
+    H5TRACE2("i", "i*s", loc_id, name);
 
     /* Check args */
     if(H5G_loc(loc_id, &loc) < 0)
@@ -438,7 +438,7 @@ H5Gopen_expand(hid_t loc_id, const char *name, hid_t gapl_id)
     hid_t       ret_value;              /* Return value */
 
     FUNC_ENTER_API(H5Gopen_expand, FAIL);
-    H5TRACE3("i", "isi", loc_id, name, gapl_id);
+    H5TRACE3("i", "i*si", loc_id, name, gapl_id);
 
     /* Check args */
     if(H5G_loc(loc_id, &loc) < 0)
@@ -606,6 +606,7 @@ H5Gget_info(hid_t loc_id, const char *name, H5G_info_t *grp_info, hid_t lapl_id)
     herr_t      ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_API(H5Gget_info, FAIL)
+    H5TRACE4("e", "i*s*xi", loc_id, name, grp_info, lapl_id);
 
     /* Check args */
     if(H5G_loc(loc_id, &loc) < 0)
@@ -668,6 +669,8 @@ H5Gget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
     herr_t      ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_API(H5Gget_info_by_idx, FAIL)
+    H5TRACE7("e", "i*sIiIoh*xi", loc_id, group_name, idx_type, order, n, grp_info,
+             lapl_id);
 
     /* Check args */
     if(H5G_loc(loc_id, &loc) < 0)
diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c
index 5dbb1d2..d202f7f 100644
--- a/src/H5Gdeprec.c
+++ b/src/H5Gdeprec.c
@@ -139,7 +139,7 @@ H5Glink(hid_t cur_loc_id, H5L_type_t type, const char *cur_name, const char *new
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_API(H5Glink, FAIL)
-    H5TRACE4("e", "iLlss", cur_loc_id, type, cur_name, new_name);
+    H5TRACE4("e", "iLl*s*s", cur_loc_id, type, cur_name, new_name);
 
     /* Check arguments */
     if(!cur_name || !*cur_name)
@@ -185,7 +185,7 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5L_type_t type,
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_API(H5Glink2, FAIL)
-    H5TRACE5("e", "isLlis", cur_loc_id, cur_name, type, new_loc_id, new_name);
+    H5TRACE5("e", "i*sLli*s", cur_loc_id, cur_name, type, new_loc_id, new_name);
 
     /* Check arguments */
     if(!cur_name || !*cur_name)
@@ -288,7 +288,7 @@ H5Gmove(hid_t src_loc_id, const char *src_name, const char *dst_name)
     herr_t      ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(H5Gmove, FAIL)
-    H5TRACE3("e", "iss", src_loc_id, src_name, dst_name);
+    H5TRACE3("e", "i*s*s", src_loc_id, src_name, dst_name);
 
     /* Call common routine to move the link */
     if(H5G_move(src_loc_id, src_name, H5L_SAME_LOC, dst_name) < 0)
@@ -313,7 +313,7 @@ H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
     herr_t      ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(H5Gmove2, FAIL)
-    H5TRACE4("e", "isis", src_loc_id, src_name, dst_loc_id, dst_name);
+    H5TRACE4("e", "i*si*s", src_loc_id, src_name, dst_loc_id, dst_name);
 
     /* Call common routine to move the link */
     if(H5G_move(src_loc_id, src_name, dst_loc_id, dst_name) < 0)
@@ -395,7 +395,7 @@ H5Gunlink(hid_t loc_id, const char *name)
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_API(H5Gunlink, FAIL)
-    H5TRACE2("e", "is", loc_id, name);
+    H5TRACE2("e", "i*s", loc_id, name);
 
     /* Check arguments */
     if(H5G_loc(loc_id, &loc) < 0)
@@ -427,7 +427,7 @@ H5Gget_linkval(hid_t loc_id, const char *name, size_t size, char *buf/*out*/)
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_API(H5Gget_linkval, FAIL)
-    H5TRACE4("e", "iszx", loc_id, name, size, buf);
+    H5TRACE4("e", "i*szx", loc_id, name, size, buf);
 
     /* Check arguments */
     if(H5G_loc(loc_id, &loc))
@@ -475,7 +475,7 @@ H5Gget_objname_by_idx(hid_t loc_id, hsize_t idx, char *name, size_t size)
     ssize_t		ret_value;
 
     FUNC_ENTER_API(H5Gget_objname_by_idx, FAIL)
-    H5TRACE4("Zs", "ihsz", loc_id, idx, name, size);
+    H5TRACE4("Zs", "ih*sz", loc_id, idx, name, size);
 
     /* Check args */
     if(H5G_loc(loc_id, &loc) < 0)
@@ -518,7 +518,7 @@ H5Gset_comment(hid_t loc_id, const char *name, const char *comment)
     herr_t      ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(H5Gset_comment, FAIL)
-    H5TRACE3("e", "iss", loc_id, name, comment);
+    H5TRACE3("e", "i*s*s", loc_id, name, comment);
 
     if(H5G_loc(loc_id, &loc) < 0)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
@@ -563,7 +563,7 @@ H5Gget_comment(hid_t loc_id, const char *name, size_t bufsize, char *buf)
     int	ret_value;
 
     FUNC_ENTER_API(H5Gget_comment, FAIL)
-    H5TRACE4("Is", "iszs", loc_id, name, bufsize, buf);
+    H5TRACE4("Is", "i*sz*s", loc_id, name, bufsize, buf);
 
     if(H5G_loc(loc_id, &loc) < 0)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
@@ -728,7 +728,7 @@ H5Giterate(hid_t loc_id, const char *name, int *idx_p, H5G_iterate_t op,
     herr_t	ret_value;
 
     FUNC_ENTER_API(H5Giterate, FAIL)
-    H5TRACE5("e", "is*Isxx", loc_id, name, idx_p, op, op_data);
+    H5TRACE5("e", "i*s*Isx*x", loc_id, name, idx_p, op, op_data);
 
     /* Check args */
     if(!name || !*name)
@@ -826,7 +826,7 @@ H5Gget_objinfo(hid_t loc_id, const char *name, hbool_t follow_link,
     herr_t      ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(H5Gget_objinfo, FAIL)
-    H5TRACE4("e", "isbx", loc_id, name, follow_link, statbuf);
+    H5TRACE4("e", "i*sbx", loc_id, name, follow_link, statbuf);
 
     /* Check arguments */
     if(H5G_loc(loc_id, &loc) < 0)
diff --git a/src/H5L.c b/src/H5L.c
index 5943ec0..5927029 100644
--- a/src/H5L.c
+++ b/src/H5L.c
@@ -309,7 +309,7 @@ H5Lmove(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
     herr_t      ret_value=SUCCEED;              /* Return value */
 
     FUNC_ENTER_API(H5Lmove, FAIL)
-    H5TRACE6("e", "isisii", src_loc_id, src_name, dst_loc_id, dst_name, lcpl_id,
+    H5TRACE6("e", "i*si*sii", src_loc_id, src_name, dst_loc_id, dst_name, lcpl_id,
              lapl_id);
 
     /* Check arguments */
@@ -367,7 +367,7 @@ H5Lcopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
     herr_t      ret_value=SUCCEED;              /* Return value */
 
     FUNC_ENTER_API(H5Lcopy, FAIL)
-    H5TRACE6("e", "isisii", src_loc_id, src_name, dst_loc_id, dst_name, lcpl_id,
+    H5TRACE6("e", "i*si*sii", src_loc_id, src_name, dst_loc_id, dst_name, lcpl_id,
              lapl_id);
 
     /* Check arguments */
@@ -432,7 +432,7 @@ H5Llink(hid_t new_loc_id, const char *new_name, hid_t obj_id, hid_t lcpl_id,
     herr_t      ret_value=SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(H5Llink, FAIL)
-    H5TRACE5("e", "isiii", new_loc_id, new_name, obj_id, lcpl_id, lapl_id);
+    H5TRACE5("e", "i*siii", new_loc_id, new_name, obj_id, lcpl_id, lapl_id);
 
     /* Check arguments */
     if(new_loc_id == H5L_SAME_LOC)
@@ -483,7 +483,7 @@ H5Lcreate_soft(const char *target_path,
     herr_t      ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_API(H5Lcreate_soft, FAIL)
-    H5TRACE5("e", "sisii", target_path, cur_loc_id, new_name, lcpl_id, lapl_id);
+    H5TRACE5("e", "*si*sii", target_path, cur_loc_id, new_name, lcpl_id, lapl_id);
 
     /* Check arguments */
     if(H5G_loc(cur_loc_id, &cur_loc) < 0)
@@ -529,7 +529,7 @@ H5Lcreate_hard(hid_t cur_loc_id, const char *cur_name,
     herr_t      ret_value = SUCCEED;            /* Return value */
 
     FUNC_ENTER_API(H5Lcreate_hard, FAIL)
-    H5TRACE6("e", "isisii", cur_loc_id, cur_name, new_loc_id, new_name, lcpl_id,
+    H5TRACE6("e", "i*si*sii", cur_loc_id, cur_name, new_loc_id, new_name, lcpl_id,
              lapl_id);
 
     /* Check arguments */
@@ -598,8 +598,8 @@ H5Lcreate_ud(hid_t link_loc_id, const char *link_name, H5L_type_t link_type,
     herr_t      ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(H5Lcreate_ud, FAIL)
-    H5TRACE7("e", "isLlxzii", link_loc_id, link_name, link_type, udata, udata_size,
-             lcpl_id, lapl_id);
+    H5TRACE7("e", "i*sLl*xzii", link_loc_id, link_name, link_type, udata,
+             udata_size, lcpl_id, lapl_id);
 
     /* Check arguments */
     if(H5G_loc(link_loc_id, &link_loc) < 0)
@@ -641,7 +641,7 @@ H5Ldelete(hid_t loc_id, const char *name, hid_t lapl_id)
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_API(H5Ldelete, FAIL)
-    H5TRACE3("e", "isi", loc_id, name, lapl_id);
+    H5TRACE3("e", "i*si", loc_id, name, lapl_id);
 
     /* Check arguments */
     if(H5G_loc(loc_id, &loc) < 0)
@@ -686,7 +686,7 @@ H5Ldelete_by_idx(hid_t loc_id, const char *group_name,
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_API(H5Ldelete_by_idx, FAIL)
-    H5TRACE6("e", "isIiIohi", loc_id, group_name, idx_type, order, n, lapl_id);
+    H5TRACE6("e", "i*sIiIohi", loc_id, group_name, idx_type, order, n, lapl_id);
 
     /* Check arguments */
     if(H5G_loc(loc_id, &loc) < 0)
@@ -745,7 +745,7 @@ H5Lget_val(hid_t loc_id, const char *name, void *buf/*out*/, size_t size,
     herr_t      ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_API(H5Lget_val, FAIL)
-    H5TRACE5("e", "isxzi", loc_id, name, buf, size, lapl_id);
+    H5TRACE5("e", "i*sxzi", loc_id, name, buf, size, lapl_id);
 
     /* Check arguments */
     if(H5G_loc(loc_id, &loc))
@@ -795,7 +795,7 @@ H5Lget_val_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
     herr_t      ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_API(H5Lget_val_by_idx, FAIL)
-    H5TRACE8("e", "isIiIohxzi", loc_id, group_name, idx_type, order, n, buf, size,
+    H5TRACE8("e", "i*sIiIohxzi", loc_id, group_name, idx_type, order, n, buf, size,
              lapl_id);
 
     /* Check arguments */
@@ -853,7 +853,7 @@ H5Lget_info(hid_t loc_id, const char *name, H5L_info_t *linfo /*out*/,
     herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_API(H5Lget_info, FAIL)
-    H5TRACE4("e", "isxi", loc_id, name, linfo, lapl_id);
+    H5TRACE4("e", "i*sxi", loc_id, name, linfo, lapl_id);
 
     /* Check arguments */
     if(H5G_loc(loc_id, &loc))
@@ -899,7 +899,7 @@ H5Lget_info_by_idx(hid_t loc_id, const char *group_name,
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_API(H5Lget_info_by_idx, FAIL)
-    H5TRACE7("e", "isIiIohxi", loc_id, group_name, idx_type, order, n, linfo,
+    H5TRACE7("e", "i*sIiIohxi", loc_id, group_name, idx_type, order, n, linfo,
              lapl_id);
 
     /* Check arguments */
@@ -1088,7 +1088,7 @@ H5Lget_name_by_idx(hid_t loc_id, const char *group_name,
     ssize_t ret_value;          /* Return value */
 
     FUNC_ENTER_API(H5Lget_name_by_idx, FAIL)
-    H5TRACE8("Zs", "isIiIohxzi", loc_id, group_name, idx_type, order, n, name, size,
+    H5TRACE8("Zs", "i*sIiIohxzi", loc_id, group_name, idx_type, order, n, name, size,
              lapl_id);
 
     /* Check arguments */
@@ -1160,7 +1160,7 @@ H5Literate(hid_t loc_id, const char *group_name,
     herr_t ret_value;           /* Return value */
 
     FUNC_ENTER_API(H5Literate, FAIL)
-    H5TRACE8("e", "isIiIo*hxxi", loc_id, group_name, idx_type, order, idx_p, op,
+    H5TRACE8("e", "i*sIiIo*hx*xi", loc_id, group_name, idx_type, order, idx_p, op,
              op_data, lapl_id);
 
     /* Check arguments */
diff --git a/src/H5Lexternal.c b/src/H5Lexternal.c
index 074cb47..254544d 100644
--- a/src/H5Lexternal.c
+++ b/src/H5Lexternal.c
@@ -273,8 +273,8 @@ H5Lcreate_external(const char *file_name, const char *obj_name,
     herr_t      ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(H5Lcreate_external, FAIL)
-    H5TRACE6("e", "ssisii", file_name, obj_name, link_loc_id, link_name, lcpl_id,
-             lapl_id);
+    H5TRACE6("e", "*s*si*sii", file_name, obj_name, link_loc_id, link_name,
+             lcpl_id, lapl_id);
 
     /* Check arguments */
     if(!file_name || !*file_name)
@@ -364,7 +364,7 @@ H5Lunpack_elink_val(char *ext_linkval, size_t link_size, char **filename,
     herr_t      ret_value=SUCCEED;  /* Return value */
 
     FUNC_ENTER_API(H5Lunpack_elink_val, FAIL)
-    H5TRACE4("e", "sz*s*s", ext_linkval, link_size, filename, obj_path);
+    H5TRACE4("e", "*sz**s**s", ext_linkval, link_size, filename, obj_path);
 
     if(ext_linkval == NULL )
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not an external link linkval buffer")
diff --git a/src/H5O.c b/src/H5O.c
index 94bfcc1..f4dd5d9 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -199,7 +199,7 @@ H5Oopen(hid_t loc_id, const char *name, hid_t lapl_id)
     hid_t       ret_value = FAIL;
 
     FUNC_ENTER_API(H5Oopen, FAIL)
-    H5TRACE3("i", "isi", loc_id, name, lapl_id);
+    H5TRACE3("i", "i*si", loc_id, name, lapl_id);
 
     /* Check args */
     if(H5G_loc(loc_id, &loc) < 0)
@@ -251,7 +251,7 @@ H5Oopen_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
     hid_t       ret_value = FAIL;
 
     FUNC_ENTER_API(H5Oopen_by_idx, FAIL)
-    H5TRACE6("i", "isIiIohi", loc_id, group_name, idx_type, order, n, lapl_id);
+    H5TRACE6("i", "i*sIiIohi", loc_id, group_name, idx_type, order, n, lapl_id);
 
     /* Check args */
     if(H5G_loc(loc_id, &loc) < 0)
@@ -469,6 +469,7 @@ H5Oget_info(hid_t loc_id, const char *name, H5O_info_t *oinfo, hid_t lapl_id)
     herr_t      ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_API(H5Oget_info, FAIL)
+    H5TRACE4("e", "i*s*xi", loc_id, name, oinfo, lapl_id);
 
     /* Check args */
     if(H5G_loc(loc_id, &loc) < 0)
@@ -518,6 +519,8 @@ H5Oget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
     herr_t      ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_API(H5Oget_info_by_idx, FAIL)
+    H5TRACE7("e", "i*sIiIoh*xi", loc_id, group_name, idx_type, order, n, oinfo,
+             lapl_id);
 
     /* Check args */
     if(H5G_loc(loc_id, &loc) < 0)
diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c
index 418506a..6a01355 100644
--- a/src/H5Ocopy.c
+++ b/src/H5Ocopy.c
@@ -186,8 +186,8 @@ H5Ocopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
     herr_t      ret_value = SUCCEED;        /* Return value */
 
     FUNC_ENTER_API(H5Ocopy, FAIL)
-    H5TRACE6("e", "isisii", src_loc_id, src_name, dst_loc_id, dst_name, ocpypl_id,
-             lcpl_id);
+    H5TRACE6("e", "i*si*sii", src_loc_id, src_name, dst_loc_id, dst_name,
+             ocpypl_id, lcpl_id);
 
     /* Check arguments */
     if(H5G_loc(src_loc_id, &loc) < 0)
diff --git a/src/H5P.c b/src/H5P.c
index afc7d72..17f0b57 100644
--- a/src/H5P.c
+++ b/src/H5P.c
@@ -1619,7 +1619,7 @@ H5Pcreate_class(hid_t parent, const char *name,
     hid_t	ret_value;                  /* Return value		   */
 
     FUNC_ENTER_API(H5Pcreate_class, FAIL);
-    H5TRACE8("i", "isxxxxxx", parent, name, cls_create, create_data, cls_copy,
+    H5TRACE8("i", "i*sx*xx*xx*x", parent, name, cls_create, create_data, cls_copy,
              copy_data, cls_close, close_data);
 
     /* Check arguments. */
@@ -2952,7 +2952,7 @@ H5Pset(hid_t plist_id, const char *name, void *value)
     herr_t ret_value=SUCCEED;   /* return value */
 
     FUNC_ENTER_API(H5Pset, FAIL);
-    H5TRACE3("e", "isx", plist_id, name, value);
+    H5TRACE3("e", "i*s*x", plist_id, name, value);
 
     /* Check arguments. */
     if (NULL == (plist = H5I_object_verify(plist_id, H5I_GENPROP_LST)))
@@ -3102,7 +3102,7 @@ H5Pexist(hid_t id, const char *name)
     htri_t ret_value;           /* return value */
 
     FUNC_ENTER_API(H5Pexist, FAIL);
-    H5TRACE2("t", "is", id, name);
+    H5TRACE2("t", "i*s", id, name);
 
     /* Check arguments. */
     if (H5I_GENPROP_LST != H5I_get_type(id) && H5I_GENPROP_CLS != H5I_get_type(id))
@@ -3255,7 +3255,7 @@ H5Pget_size(hid_t id, const char *name, size_t *size)
     herr_t ret_value;           /* return value */
 
     FUNC_ENTER_API(H5Pget_size, FAIL);
-    H5TRACE3("e", "is*z", id, name, size);
+    H5TRACE3("e", "i*s*z", id, name, size);
 
     /* Check arguments. */
     if (H5I_GENPROP_LST != H5I_get_type(id) && H5I_GENPROP_CLS != H5I_get_type(id))
@@ -4387,7 +4387,7 @@ H5Piterate(hid_t id, int *idx, H5P_iterate_t iter_func, void *iter_data)
     int ret_value;          /* return value */
 
     FUNC_ENTER_API(H5Piterate, FAIL);
-    H5TRACE4("Is", "i*Isxx", id, idx, iter_func, iter_data);
+    H5TRACE4("Is", "i*Isx*x", id, idx, iter_func, iter_data);
 
     /* Check arguments. */
     if (H5I_GENPROP_LST != H5I_get_type(id) && H5I_GENPROP_CLS != H5I_get_type(id))
@@ -4777,7 +4777,7 @@ H5Pget(hid_t plist_id, const char *name, void *value)
     herr_t ret_value=SUCCEED;   /* return value */
 
     FUNC_ENTER_API(H5Pget, FAIL);
-    H5TRACE3("e", "isx", plist_id, name, value);
+    H5TRACE3("e", "i*s*x", plist_id, name, value);
 
     /* Check arguments. */
     if(NULL == (plist = H5I_object_verify(plist_id, H5I_GENPROP_LST)))
@@ -4960,7 +4960,7 @@ H5Premove(hid_t plist_id, const char *name)
     herr_t ret_value;           /* return value */
 
     FUNC_ENTER_API(H5Premove, FAIL);
-    H5TRACE2("e", "is", plist_id, name);
+    H5TRACE2("e", "i*s", plist_id, name);
 
     /* Check arguments. */
     if (NULL == (plist = H5I_object_verify(plist_id, H5I_GENPROP_LST)))
@@ -5194,7 +5194,7 @@ H5Pcopy_prop(hid_t dst_id, hid_t src_id, const char *name)
     herr_t ret_value=SUCCEED;      /* return value */
 
     FUNC_ENTER_API(H5Pcopy_prop, FAIL);
-    H5TRACE3("e", "iis", dst_id, src_id, name);
+    H5TRACE3("e", "ii*s", dst_id, src_id, name);
 
     /* Check arguments. */
     if ((H5I_GENPROP_LST != H5I_get_type(src_id) && H5I_GENPROP_CLS != H5I_get_type(src_id))
@@ -5305,7 +5305,7 @@ H5Punregister(hid_t pclass_id, const char *name)
     herr_t ret_value;           /* return value */
 
     FUNC_ENTER_API(H5Punregister, FAIL);
-    H5TRACE2("e", "is", pclass_id, name);
+    H5TRACE2("e", "i*s", pclass_id, name);
 
     /* Check arguments. */
     if (NULL == (pclass = H5I_object_verify(pclass_id, H5I_GENPROP_CLS)))
diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c
index 9d950c7..ee039c7 100644
--- a/src/H5Pdcpl.c
+++ b/src/H5Pdcpl.c
@@ -864,7 +864,7 @@ H5Pset_external(hid_t plist_id, const char *name, off_t offset, hsize_t size)
     herr_t      ret_value=SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(H5Pset_external, FAIL)
-    H5TRACE4("e", "isoh", plist_id, name, offset, size);
+    H5TRACE4("e", "i*soh", plist_id, name, offset, size);
 
     /* Check arguments */
     if (!name || !*name)
@@ -1990,7 +1990,7 @@ H5Pset_fill_value(hid_t plist_id, hid_t type_id, const void *value)
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_API(H5Pset_fill_value, FAIL)
-    H5TRACE3("e", "iix", plist_id, type_id, value);
+    H5TRACE3("e", "ii*x", plist_id, type_id, value);
 
     /* Get the plist structure */
     if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_CREATE)))
diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c
index 38d64c9..6affcad 100644
--- a/src/H5Pdxpl.c
+++ b/src/H5Pdxpl.c
@@ -565,7 +565,7 @@ H5Pset_data_transform(hid_t plist_id, const char *expression)
     herr_t ret_value = SUCCEED;   /* return value */
 
     FUNC_ENTER_API(H5Pset_data_transform, FAIL)
-    H5TRACE2("e", "is", plist_id, expression);
+    H5TRACE2("e", "i*s", plist_id, expression);
 
     /* Check arguments */
     if(expression == NULL)
@@ -699,7 +699,7 @@ H5Pset_buffer(hid_t plist_id, size_t size, void *tconv, void *bkg)
     herr_t ret_value=SUCCEED;   /* return value */
 
     FUNC_ENTER_API(H5Pset_buffer, FAIL)
-    H5TRACE4("e", "izxx", plist_id, size, tconv, bkg);
+    H5TRACE4("e", "iz*x*x", plist_id, size, tconv, bkg);
 
     /* Check arguments */
     if (size<=0)
@@ -966,7 +966,7 @@ H5Pset_filter_callback(hid_t plist_id, H5Z_filter_func_t func, void *op_data)
     H5Z_cb_t            cb_struct;
 
     FUNC_ENTER_API(H5Pset_filter_callback, FAIL)
-    H5TRACE3("e", "ixx", plist_id, func, op_data);
+    H5TRACE3("e", "ix*x", plist_id, func, op_data);
 
     /* Get the plist structure */
     if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER)))
@@ -1008,7 +1008,7 @@ H5Pset_type_conv_cb(hid_t plist_id, H5T_conv_except_func_t op, void *operate_dat
     H5T_conv_cb_t       cb_struct;
 
     FUNC_ENTER_API(H5Pset_type_conv_cb, FAIL)
-    H5TRACE3("e", "ixx", plist_id, op, operate_data);
+    H5TRACE3("e", "ix*x", plist_id, op, operate_data);
 
     /* Get the plist structure */
     if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER)))
@@ -1050,7 +1050,7 @@ H5Pget_type_conv_cb(hid_t plist_id, H5T_conv_except_func_t *op, void **operate_d
     herr_t              ret_value=SUCCEED;   /* return value */
 
     FUNC_ENTER_API(H5Pget_type_conv_cb, FAIL)
-    H5TRACE3("e", "i*xx", plist_id, op, operate_data);
+    H5TRACE3("e", "i*x**x", plist_id, op, operate_data);
 
     /* Get the plist structure */
     if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER)))
@@ -1249,7 +1249,8 @@ H5Pset_vlen_mem_manager(hid_t plist_id, H5MM_allocate_t alloc_func,
     herr_t ret_value=SUCCEED;   /* return value */
 
     FUNC_ENTER_API(H5Pset_vlen_mem_manager, FAIL)
-    H5TRACE5("e", "ixxxx", plist_id, alloc_func, alloc_info, free_func, free_info);
+    H5TRACE5("e", "ix*xx*x", plist_id, alloc_func, alloc_info, free_func,
+             free_info);
 
     /* Check arguments */
     if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER)))
diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c
index eee0049..737f136 100644
--- a/src/H5Pfapl.c
+++ b/src/H5Pfapl.c
@@ -649,7 +649,7 @@ H5Pset_driver(hid_t plist_id, hid_t new_driver_id, const void *new_driver_info)
     herr_t ret_value=SUCCEED;   /* Return value */
 
     FUNC_ENTER_API(H5Pset_driver, FAIL);
-    H5TRACE3("e", "iix", plist_id, new_driver_id, new_driver_info);
+    H5TRACE3("e", "ii*x", plist_id, new_driver_id, new_driver_info);
 
     /* Check arguments */
     if(NULL == (plist = H5I_object_verify(plist_id, H5I_GENPROP_LST)))
@@ -1328,7 +1328,7 @@ H5Pset_mdc_config(hid_t                 plist_id,
     herr_t ret_value=SUCCEED;   /* return value */
 
     FUNC_ENTER_API(H5Pset_mdc_config, FAIL);
-    H5TRACE2("e", "ix", plist_id, config_ptr);
+    H5TRACE2("e", "i*x", plist_id, config_ptr);
 
     /* Get the plist structure */
     if( NULL == ( plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS) ) ) {
@@ -1392,7 +1392,7 @@ H5Pget_mdc_config(hid_t                 plist_id,
     herr_t ret_value = SUCCEED;   /* return value */
 
     FUNC_ENTER_API(H5Pget_mdc_config, FAIL);
-    H5TRACE2("e", "ix", plist_id, config_ptr);
+    H5TRACE2("e", "i*x", plist_id, config_ptr);
 
     /* Get the plist structure */
     if ( NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS)) ) {
diff --git a/src/H5Plapl.c b/src/H5Plapl.c
index 41e06a5..8987c49 100644
--- a/src/H5Plapl.c
+++ b/src/H5Plapl.c
@@ -331,7 +331,7 @@ H5Pset_elink_prefix(hid_t plist_id, const char *prefix)
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_API(H5Pset_elink_prefix, FAIL)
-    H5TRACE2("e", "is", plist_id, prefix);
+    H5TRACE2("e", "i*s", plist_id, prefix);
 
     /* Get the plist structure */
     if(NULL == (plist = H5P_object_verify(plist_id, H5P_LINK_ACCESS)))
@@ -382,7 +382,7 @@ H5Pget_elink_prefix(hid_t plist_id, char *prefix, size_t size)
     ssize_t 	ret_value;              /* Return value */
 
     FUNC_ENTER_API(H5Pget_elink_prefix, FAIL)
-    H5TRACE3("Zs", "isz", plist_id, prefix, size);
+    H5TRACE3("Zs", "i*sz", plist_id, prefix, size);
 
     /* Get the plist structure */
     if(NULL == (plist = H5P_object_verify(plist_id, H5P_LINK_ACCESS)))
diff --git a/src/H5Pocpl.c b/src/H5Pocpl.c
index 726e41d..b947bef 100755
--- a/src/H5Pocpl.c
+++ b/src/H5Pocpl.c
@@ -371,6 +371,7 @@ H5Pset_obj_track_times(hid_t plist_id, hbool_t track_times)
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_API(H5Pset_obj_track_times, FAIL)
+    H5TRACE2("e", "ib", plist_id, track_times);
 
     /* Get the plist structure */
     if(NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE)))
@@ -413,6 +414,7 @@ H5Pget_obj_track_times(hid_t plist_id, hbool_t *track_times)
     herr_t ret_value = SUCCEED;   /* return value */
 
     FUNC_ENTER_API(H5Pget_obj_track_times, FAIL)
+    H5TRACE2("e", "i*b", plist_id, track_times);
 
     /* Get values */
     if(track_times) {
diff --git a/src/H5R.c b/src/H5R.c
index b9040dd..64fb18c 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -288,7 +288,7 @@ H5Rcreate(void *ref, hid_t loc_id, const char *name, H5R_type_t ref_type, hid_t
     herr_t      ret_value;      /* Return value */
 
     FUNC_ENTER_API(H5Rcreate, FAIL)
-    H5TRACE5("e", "xisRti", ref, loc_id, name, ref_type, space_id);
+    H5TRACE5("e", "*xi*sRti", ref, loc_id, name, ref_type, space_id);
 
     /* Check args */
     if(ref == NULL)
@@ -494,7 +494,7 @@ H5Rdereference(hid_t id, H5R_type_t ref_type, const void *_ref)
     hid_t ret_value;
 
     FUNC_ENTER_API(H5Rdereference, FAIL)
-    H5TRACE3("i", "iRtx", id, ref_type, _ref);
+    H5TRACE3("i", "iRt*x", id, ref_type, _ref);
 
     /* Check args */
     if(H5G_loc(id, &loc) < 0)
@@ -617,7 +617,7 @@ H5Rget_region(hid_t id, H5R_type_t ref_type, const void *ref)
     hid_t ret_value;
 
     FUNC_ENTER_API(H5Rget_region, FAIL)
-    H5TRACE3("i", "iRtx", id, ref_type, ref);
+    H5TRACE3("i", "iRt*x", id, ref_type, ref);
 
     /* Check args */
     if(H5G_loc(id, &loc) < 0)
@@ -764,7 +764,7 @@ H5Rget_obj_type(hid_t id, H5R_type_t ref_type, const void *ref)
     H5G_obj_t ret_value;
 
     FUNC_ENTER_API(H5Rget_obj_type, H5G_UNKNOWN)
-    H5TRACE3("Go", "iRtx", id, ref_type, ref);
+    H5TRACE3("Go", "iRt*x", id, ref_type, ref);
 
     /* Check args */
     if(H5G_loc(id, &loc) < 0)
@@ -922,7 +922,7 @@ H5Rget_name(hid_t id, H5R_type_t ref_type, const void *_ref, char *name,
     ssize_t ret_value;  /* Return value */
 
     FUNC_ENTER_API(H5Rget_name, FAIL)
-    H5TRACE5("Zs", "iRtxsz", id, ref_type, _ref, name, size);
+    H5TRACE5("Zs", "iRt*x*sz", id, ref_type, _ref, name, size);
 
     /* Check args */
     if(H5G_loc(id, &loc) < 0)
diff --git a/src/H5S.c b/src/H5S.c
index efb6ffb..b7104a0 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -1692,7 +1692,7 @@ H5Sencode(hid_t obj_id, void *buf, size_t *nalloc)
     herr_t      ret_value=SUCCEED;
 
     FUNC_ENTER_API (H5Sencode, FAIL);
-    H5TRACE3("e", "ix*z", obj_id, buf, nalloc);
+    H5TRACE3("e", "i*x*z", obj_id, buf, nalloc);
 
     /* Check argument and retrieve object */
     if (NULL==(dspace=(H5S_t *)H5I_object_verify(obj_id, H5I_DATASPACE)))
@@ -1805,7 +1805,7 @@ H5Sdecode(const void *buf)
     hid_t       ret_value;
 
     FUNC_ENTER_API (H5Sdecode, FAIL)
-    H5TRACE1("i", "x", buf);
+    H5TRACE1("i", "*x", buf);
 
     if(buf == NULL)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "empty buffer")
diff --git a/src/H5T.c b/src/H5T.c
index 67c322c..f494928 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -2408,7 +2408,7 @@ H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id,
     herr_t	ret_value=SUCCEED;	/*return value			*/
 
     FUNC_ENTER_API(H5Tregister, FAIL);
-    H5TRACE5("e", "Tesiix", pers, name, src_id, dst_id, func);
+    H5TRACE5("e", "Te*siix", pers, name, src_id, dst_id, func);
 
     /* Check args */
     if (H5T_PERS_HARD!=pers && H5T_PERS_SOFT!=pers)
@@ -2557,7 +2557,7 @@ H5Tunregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id,
     herr_t      ret_value=SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(H5Tunregister, FAIL);
-    H5TRACE5("e", "Tesiix", pers, name, src_id, dst_id, func);
+    H5TRACE5("e", "Te*siix", pers, name, src_id, dst_id, func);
 
     /* Check arguments */
     if (src_id>0 && (NULL==(src=H5I_object_verify(src_id,H5I_DATATYPE))))
@@ -2601,7 +2601,7 @@ H5Tfind(hid_t src_id, hid_t dst_id, H5T_cdata_t **pcdata)
     H5T_path_t	*path = NULL;
 
     FUNC_ENTER_API(H5Tfind, NULL);
-    H5TRACE3("x", "iix", src_id, dst_id, pcdata);
+    H5TRACE3("x", "ii**x", src_id, dst_id, pcdata);
 
     /* Check args */
     if (NULL == (src = H5I_object_verify(src_id,H5I_DATATYPE)) ||
@@ -2703,7 +2703,7 @@ H5Tconvert(hid_t src_id, hid_t dst_id, size_t nelmts, void *buf,
     herr_t      ret_value=SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(H5Tconvert, FAIL);
-    H5TRACE6("e", "iizxxi", src_id, dst_id, nelmts, buf, background, dxpl_id);
+    H5TRACE6("e", "iiz*x*xi", src_id, dst_id, nelmts, buf, background, dxpl_id);
 
     /* Check args */
     if (NULL==(src=H5I_object_verify(src_id,H5I_DATATYPE)) ||
@@ -2752,7 +2752,7 @@ H5Tencode(hid_t obj_id, void *buf, size_t *nalloc)
     herr_t      ret_value = SUCCEED;
 
     FUNC_ENTER_API (H5Tencode, FAIL)
-    H5TRACE3("e", "ix*z", obj_id, buf, nalloc);
+    H5TRACE3("e", "i*x*z", obj_id, buf, nalloc);
 
     /* Check argument and retrieve object */
     if(NULL == (dtype = H5I_object_verify(obj_id, H5I_DATATYPE)))
@@ -2792,7 +2792,7 @@ H5Tdecode(const void *buf)
     hid_t       ret_value;
 
     FUNC_ENTER_API(H5Tdecode, FAIL)
-    H5TRACE1("i", "x", buf);
+    H5TRACE1("i", "*x", buf);
 
     /* Check args */
     if(buf == NULL)
diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c
index dd92fd3..b198a37 100644
--- a/src/H5Tcommit.c
+++ b/src/H5Tcommit.c
@@ -91,7 +91,7 @@ H5Tcommit(hid_t loc_id, const char *name, hid_t type_id)
     herr_t      ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(H5Tcommit, FAIL)
-    H5TRACE3("e", "isi", loc_id, name, type_id);
+    H5TRACE3("e", "i*si", loc_id, name, type_id);
 
     /* Check arguments */
     if(H5G_loc(loc_id, &loc) < 0)
@@ -446,7 +446,7 @@ H5Topen(hid_t loc_id, const char *name)
     hid_t        ret_value = FAIL;
 
     FUNC_ENTER_API(H5Topen, FAIL)
-    H5TRACE2("i", "is", loc_id, name);
+    H5TRACE2("i", "i*s", loc_id, name);
 
     /* Check args */
     if(H5G_loc(loc_id, &loc) < 0)
@@ -523,7 +523,7 @@ H5Topen_expand(hid_t loc_id, const char *name, hid_t tapl_id)
     hid_t        ret_value = FAIL;
 
     FUNC_ENTER_API(H5Topen_expand, FAIL)
-    H5TRACE3("i", "isi", loc_id, name, tapl_id);
+    H5TRACE3("i", "i*si", loc_id, name, tapl_id);
 
     /* Check args */
     if(H5G_loc(loc_id, &loc) < 0)
diff --git a/src/H5Tcompound.c b/src/H5Tcompound.c
index 4facb2a..fbaacfc 100644
--- a/src/H5Tcompound.c
+++ b/src/H5Tcompound.c
@@ -337,7 +337,7 @@ H5Tinsert(hid_t parent_id, const char *name, size_t offset, hid_t member_id)
     herr_t      ret_value=SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(H5Tinsert, FAIL)
-    H5TRACE4("e", "iszi", parent_id, name, offset, member_id);
+    H5TRACE4("e", "i*szi", parent_id, name, offset, member_id);
 
     /* Check args */
     if (parent_id==member_id)
diff --git a/src/H5Tenum.c b/src/H5Tenum.c
index 1055fc8..5ab6964 100644
--- a/src/H5Tenum.c
+++ b/src/H5Tenum.c
@@ -170,7 +170,7 @@ H5Tenum_insert(hid_t type, const char *name, const void *value)
     herr_t      ret_value=SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(H5Tenum_insert, FAIL)
-    H5TRACE3("e", "isx", type, name, value);
+    H5TRACE3("e", "i*s*x", type, name, value);
 
     /* Check args */
     if (NULL==(dt=H5I_object_verify(type,H5I_DATATYPE)))
@@ -363,7 +363,7 @@ H5Tenum_nameof(hid_t type, const void *value, char *name/*out*/, size_t size)
     herr_t      ret_value=SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(H5Tenum_nameof, FAIL)
-    H5TRACE4("e", "ixxz", type, value, name, size);
+    H5TRACE4("e", "i*xxz", type, value, name, size);
 
     /* Check args */
     if (NULL==(dt=H5I_object_verify(type,H5I_DATATYPE)))
@@ -503,7 +503,7 @@ H5Tenum_valueof(hid_t type, const char *name, void *value/*out*/)
     herr_t      ret_value=SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(H5Tenum_valueof, FAIL)
-    H5TRACE3("e", "isx", type, name, value);
+    H5TRACE3("e", "i*sx", type, name, value);
 
     /* Check args */
     if (NULL==(dt=H5I_object_verify(type,H5I_DATATYPE)))
diff --git a/src/H5Tfields.c b/src/H5Tfields.c
index fa6467f..0237fc4 100644
--- a/src/H5Tfields.c
+++ b/src/H5Tfields.c
@@ -252,7 +252,7 @@ H5Tget_member_index(hid_t type_id, const char *name)
     unsigned    i;
 
     FUNC_ENTER_API(H5Tget_member_index, FAIL)
-    H5TRACE2("Is", "is", type_id, name);
+    H5TRACE2("Is", "i*s", type_id, name);
 
     /* Check arguments */
     assert(name);
diff --git a/src/H5Topaque.c b/src/H5Topaque.c
index 71e34a4..0e137ac 100644
--- a/src/H5Topaque.c
+++ b/src/H5Topaque.c
@@ -74,7 +74,7 @@ H5Tset_tag(hid_t type_id, const char *tag)
     herr_t      ret_value=SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(H5Tset_tag, FAIL)
-    H5TRACE2("e", "is", type_id, tag);
+    H5TRACE2("e", "i*s", type_id, tag);
 
     /* Check args */
     if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE)))
diff --git a/src/H5Z.c b/src/H5Z.c
index 97c4878..a96e783 100644
--- a/src/H5Z.c
+++ b/src/H5Z.c
@@ -224,7 +224,7 @@ H5Zregister(const H5Z_class_t *cls)
     herr_t      ret_value=SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(H5Zregister, FAIL)
-    H5TRACE1("e", "Zc", cls);
+    H5TRACE1("e", "*Zc", cls);
 
     /* Check args */
     if (cls==NULL)
diff --git a/src/Makefile.in b/src/Makefile.in
index 57e0112..bc614d6 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -99,17 +99,18 @@ am_libhdf5_la_OBJECTS = H5.lo H5checksum.lo H5dbg.lo H5system.lo \
 	H5HFdbg.lo H5HFdblock.lo H5HFdtable.lo H5HFhdr.lo H5HFhuge.lo \
 	H5HFiblock.lo H5HFiter.lo H5HFman.lo H5HFsection.lo \
 	H5HFspace.lo H5HFstat.lo H5HFtest.lo H5HFtiny.lo H5HG.lo \
-	H5HGdbg.lo H5HL.lo H5HLdbg.lo H5HP.lo H5I.lo H5MF.lo H5MM.lo \
-	H5MP.lo H5MPtest.lo H5L.lo H5Lexternal.lo H5O.lo H5Oainfo.lo H5Oalloc.lo \
-	H5Oattr.lo H5Oattribute.lo H5Obogus.lo H5Obtreek.lo H5Ocache.lo H5Ocont.lo \
-	H5Ocopy.lo H5Odbg.lo H5Odrvinfo.lo H5Odtype.lo H5Oefl.lo H5Ofill.lo \
-	H5Oginfo.lo H5Olayout.lo H5Olinfo.lo H5Olink.lo H5Omessage.lo \
-	H5Omtime.lo H5Oname.lo H5Onull.lo H5Opline.lo H5Osdspace.lo \
-	H5Oshared.lo H5Ostab.lo H5Oshmesg.lo H5Otest.lo H5P.lo \
-	H5Pacpl.lo H5Pdcpl.lo H5Pdxpl.lo H5Pfapl.lo H5Pfcpl.lo \
-	H5Pfmpl.lo H5Pgcpl.lo H5Plapl.lo H5Plcpl.lo H5Pocpl.lo \
-	H5Pocpypl.lo H5Pstrcpl.lo H5Ptest.lo H5R.lo H5RC.lo H5RS.lo \
-	H5S.lo H5Sall.lo H5Shyper.lo H5Smpio.lo H5Snone.lo H5Spoint.lo \
+	H5HGdbg.lo H5HL.lo H5HLdbg.lo H5HP.lo H5I.lo H5L.lo \
+	H5Lexternal.lo H5MF.lo H5MM.lo H5MP.lo H5MPtest.lo H5O.lo \
+	H5Oainfo.lo H5Oalloc.lo H5Oattr.lo H5Oattribute.lo H5Obogus.lo \
+	H5Obtreek.lo H5Ocache.lo H5Ocont.lo H5Ocopy.lo H5Odbg.lo \
+	H5Odrvinfo.lo H5Odtype.lo H5Oefl.lo H5Ofill.lo H5Oginfo.lo \
+	H5Olayout.lo H5Olinfo.lo H5Olink.lo H5Omessage.lo H5Omtime.lo \
+	H5Oname.lo H5Onull.lo H5Opline.lo H5Osdspace.lo H5Oshared.lo \
+	H5Ostab.lo H5Oshmesg.lo H5Otest.lo H5P.lo H5Pacpl.lo \
+	H5Pdcpl.lo H5Pdxpl.lo H5Pfapl.lo H5Pfcpl.lo H5Pfmpl.lo \
+	H5Pgcpl.lo H5Plapl.lo H5Plcpl.lo H5Pocpl.lo H5Pocpypl.lo \
+	H5Pstrcpl.lo H5Ptest.lo H5R.lo H5RC.lo H5RS.lo H5S.lo \
+	H5Sall.lo H5Shyper.lo H5Smpio.lo H5Snone.lo H5Spoint.lo \
 	H5Sselect.lo H5Stest.lo H5SL.lo H5SM.lo H5SMbtree2.lo \
 	H5SMcache.lo H5SMtest.lo H5ST.lo H5T.lo H5Tarray.lo H5Tbit.lo \
 	H5Tcommit.lo H5Tcompound.lo H5Tconv.lo H5Tcset.lo H5Tenum.lo \
@@ -417,10 +418,12 @@ libhdf5_la_SOURCES = H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \
         H5HF.c H5HFbtree2.c H5HFcache.c H5HFdbg.c H5HFdblock.c H5HFdtable.c \
         H5HFhdr.c H5HFhuge.c H5HFiblock.c H5HFiter.c H5HFman.c H5HFsection.c \
         H5HFspace.c H5HFstat.c H5HFtest.c H5HFtiny.c \
-        H5HG.c H5HGdbg.c H5HL.c H5HLdbg.c H5HP.c H5I.c H5MF.c H5MM.c \
-        H5MP.c H5MPtest.c H5L.c H5Lexternal.c H5O.c H5Oainfo.c H5Oalloc.c H5Oattr.c \
+        H5HG.c H5HGdbg.c H5HL.c H5HLdbg.c H5HP.c H5I.c H5L.c H5Lexternal.c \
+        H5MF.c H5MM.c H5MP.c H5MPtest.c \
+        H5O.c H5Oainfo.c H5Oalloc.c H5Oattr.c \
         H5Oattribute.c H5Obogus.c H5Obtreek.c H5Ocache.c \
-        H5Ocont.c H5Ocopy.c H5Odbg.c H5Odrvinfo.c H5Odtype.c H5Oefl.c H5Ofill.c H5Oginfo.c \
+        H5Ocont.c H5Ocopy.c H5Odbg.c H5Odrvinfo.c H5Odtype.c H5Oefl.c \
+        H5Ofill.c H5Oginfo.c \
         H5Olayout.c \
         H5Olinfo.c H5Olink.c H5Omessage.c H5Omtime.c \
         H5Oname.c H5Onull.c H5Opline.c H5Osdspace.c H5Oshared.c H5Ostab.c \