[svn-r25481] - remove unsigned char * from trace

- add H5Iiterate callback type to trace
- other minor tweeks

7 files changed, 12 insertions, 11 deletions

diff --git a/src/H5I.c b/src/H5I.c
index a2bcfcf..df304f7 100644
--- a/src/H5I.c
+++ b/src/H5I.c
@@ -2143,6 +2143,7 @@ H5Iiterate(H5I_type_t type, H5I_iterate_func_t op, void *op_data)
     herr_t ret_value;            /* Return value */
 
     FUNC_ENTER_API(FAIL)
+    H5TRACE3("e", "Itx*x", type, op, op_data);
 
     /* Set up udata struct */
     int_udata.op = op;
diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c
index 40024ff..0f840e0 100644
--- a/src/H5Tcommit.c
+++ b/src/H5Tcommit.c
@@ -952,7 +952,7 @@ hid_t
 H5VL_create_datatype(void *dt_obj, H5VL_t *vol_plugin, hbool_t app_ref)
 {
     ssize_t        nalloc;
-    unsigned char *buf = NULL;
+    void          *buf = NULL;
     H5T_t         *dt = NULL;       /* datatype token from VOL plugin */
     hid_t          ret_value = FAIL;
 
@@ -964,7 +964,7 @@ H5VL_create_datatype(void *dt_obj, H5VL_t *vol_plugin, hbool_t app_ref)
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to get datatype size")
 
     /* allocate buffer to store binary description of the datatype */
-    if (NULL == (buf = (unsigned char *) H5MM_malloc ((size_t)nalloc)))
+    if (NULL == (buf = (void *) H5MM_malloc ((size_t)nalloc)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate space for datatype")
 
     /* get binary description of the datatype */
diff --git a/src/H5VL.c b/src/H5VL.c
index 19d47ba..df64993 100644
--- a/src/H5VL.c
+++ b/src/H5VL.c
@@ -852,12 +852,12 @@ done:
  *-------------------------------------------------------------------------
  */
 ssize_t
-H5VLdatatype_get_binary(void *obj, H5VL_t *vol_plugin, unsigned char *buf, size_t size, hid_t dxpl_id, void UNUSED **req)
+H5VLdatatype_get_binary(void *obj, H5VL_t *vol_plugin, void *buf, size_t size, hid_t dxpl_id, void UNUSED **req)
 {
     ssize_t ret_value = FAIL;
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE6("Zs", "*x*x*szi**x", obj, vol_plugin, buf, size, dxpl_id, req);
+    H5TRACE6("Zs", "*x*x*xzi**x", obj, vol_plugin, buf, size, dxpl_id, req);
 
     if (NULL == obj || NULL == vol_plugin || NULL == vol_plugin->cls)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid object/VOL class pointer")
diff --git a/src/H5VLint.c b/src/H5VLint.c
index fe3b794..cd3e09c 100644
--- a/src/H5VLint.c
+++ b/src/H5VLint.c
@@ -852,7 +852,7 @@ done:
  *-------------------------------------------------------------------------
  */
 ssize_t 
-H5VL_datatype_get_binary(void *obj, H5VL_t *vol_plugin, unsigned char *buf, size_t size, 
+H5VL_datatype_get_binary(void *obj, H5VL_t *vol_plugin, void *buf, size_t size, 
                          hid_t dxpl_id, hid_t UNUSED estack_id)
 {
     ssize_t ret_value = FAIL;
diff --git a/src/H5VLnative.c b/src/H5VLnative.c
index c26f68b..7cc98eb 100644
--- a/src/H5VLnative.c
+++ b/src/H5VLnative.c
@@ -76,7 +76,7 @@ static herr_t H5VL_native_attr_close(void *attr, hid_t dxpl_id, void **req);
 /* Datatype callbacks */
 static void *H5VL_native_datatype_commit(void *obj, H5VL_loc_params_t loc_params, const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, hid_t dxpl_id, void **req);
 static void *H5VL_native_datatype_open(void *obj, H5VL_loc_params_t loc_params, const char *name, hid_t tapl_id, hid_t dxpl_id, void **req);
-static ssize_t H5VL_native_datatype_get_binary(void *obj, unsigned char *buf, size_t size, hid_t dxpl_id, void **req);
+static ssize_t H5VL_native_datatype_get_binary(void *obj, void *buf, size_t size, hid_t dxpl_id, void **req);
 static herr_t H5VL_native_datatype_get(void *dt, H5VL_datatype_get_t get_type, hid_t dxpl_id, void **req, va_list arguments);
 static herr_t H5VL_native_datatype_close(void *dt, hid_t dxpl_id, void **req);
 
@@ -1235,7 +1235,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static ssize_t
-H5VL_native_datatype_get_binary(void *obj, unsigned char *buf, size_t size, hid_t UNUSED dxpl_id, void UNUSED **req)
+H5VL_native_datatype_get_binary(void *obj, void *buf, size_t size, hid_t UNUSED dxpl_id, void UNUSED **req)
 {
     H5T_t       *type = (H5T_t *)obj;
     size_t       nalloc = size;
@@ -1243,7 +1243,7 @@ H5VL_native_datatype_get_binary(void *obj, unsigned char *buf, size_t size, hid_
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    if(H5T_encode(type, buf, &nalloc) < 0)
+        if(H5T_encode(type, (unsigned char *)buf, &nalloc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't determine serialized length of datatype")
 
     ret_value = (ssize_t) nalloc;
diff --git a/src/H5VLprivate.h b/src/H5VLprivate.h
index 33f3f5a..6c4e850 100644
--- a/src/H5VLprivate.h
+++ b/src/H5VLprivate.h
@@ -73,7 +73,7 @@ H5_DLL herr_t H5VL_dataset_close(void *dset, H5VL_t *vol_plugin, hid_t dxpl_id,
 
 H5_DLL void *H5VL_datatype_commit(void *obj, H5VL_loc_params_t loc_params, H5VL_t *vol_plugin, const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, hid_t dxpl_id, hid_t estack_id);
 H5_DLL void *H5VL_datatype_open(void *obj, H5VL_loc_params_t loc_params, H5VL_t *vol_plugin, const char *name, hid_t tapl_id, hid_t dxpl_id, hid_t estack_id);
-H5_DLL ssize_t H5VL_datatype_get_binary(void *obj, H5VL_t *vol_plugin, unsigned char *buf, size_t size, hid_t dxpl_id, hid_t estack_id);
+H5_DLL ssize_t H5VL_datatype_get_binary(void *obj, H5VL_t *vol_plugin, void *buf, size_t size, hid_t dxpl_id, hid_t estack_id);
 H5_DLL herr_t H5VL_datatype_get(void *dt, H5VL_t *vol_plugin, H5VL_datatype_get_t get_type, hid_t dxpl_id, hid_t estack_id, ...);
 H5_DLL herr_t H5VL_datatype_close(void *dt, H5VL_t *vol_plugin, hid_t dxpl_id, hid_t estack_id);
 
diff --git a/src/H5VLpublic.h b/src/H5VLpublic.h
index 3f7c2da..0e58014 100644
--- a/src/H5VLpublic.h
+++ b/src/H5VLpublic.h
@@ -230,7 +230,7 @@ typedef struct H5VL_datatype_class_t {
     void  *(*commit)(void *obj, H5VL_loc_params_t loc_params, const char *name, hid_t type_id, 
                      hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, hid_t dxpl_id, void **req);
     void  *(*open)  (void *obj, H5VL_loc_params_t loc_params, const char * name, hid_t tapl_id, hid_t dxpl_id, void **req);
-    ssize_t (*get_binary) (void *obj, unsigned char *buf, size_t size, hid_t dxpl_id, void **req);
+    ssize_t (*get_binary) (void *obj, void *buf, size_t size, hid_t dxpl_id, void **req);
     herr_t (*get)   (void *obj, H5VL_datatype_get_t get_type, hid_t dxpl_id, void **req, va_list arguments);
     herr_t (*close) (void *dt, hid_t dxpl_id, void **req);
 } H5VL_datatype_class_t;
@@ -367,7 +367,7 @@ H5_DLL herr_t H5VLdataset_close(void *dset, H5VL_t *vol_plugin, hid_t dxpl_id, v
 /* DATATYPE OBJECT ROUTINES */
 H5_DLL void *H5VLdatatype_commit(void *obj, H5VL_loc_params_t loc_params, H5VL_t *vol_plugin, const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, hid_t dxpl_id, void **req);
 H5_DLL void *H5VLdatatype_open(void *obj, H5VL_loc_params_t loc_params, H5VL_t *vol_plugin, const char *name, hid_t tapl_id, hid_t dxpl_id, void **req);
-H5_DLL ssize_t H5VLdatatype_get_binary(void *obj, H5VL_t *vol_plugin, unsigned char *buf, size_t size, hid_t dxpl_id, void **req);
+H5_DLL ssize_t H5VLdatatype_get_binary(void *obj, H5VL_t *vol_plugin, void *buf, size_t size, hid_t dxpl_id, void **req);
 H5_DLL herr_t H5VLdatatype_get(void *obj, H5VL_t *vol_plugin, H5VL_datatype_get_t get_type, hid_t dxpl_id, void **req, va_list arguments);
 H5_DLL herr_t H5VLdatatype_close(void *dt, H5VL_t *vol_plugin, hid_t dxpl_id, void **req);