From 2227f881c7492ecaadbbad44ac5f8f7416cd5b66 Mon Sep 17 00:00:00 2001 From: Mohamad Chaarawi Date: Thu, 24 Jul 2014 14:33:56 -0500 Subject: [svn-r25481] - remove unsigned char * from trace - add H5Iiterate callback type to trace - other minor tweeks --- bin/trace | 2 +- src/H5I.c | 1 + src/H5Tcommit.c | 4 ++-- src/H5VL.c | 4 ++-- src/H5VLint.c | 2 +- src/H5VLnative.c | 6 +++--- src/H5VLprivate.h | 2 +- src/H5VLpublic.h | 4 ++-- tools/h5dump/h5dump_ddl.c | 2 ++ 9 files changed, 15 insertions(+), 12 deletions(-) diff --git a/bin/trace b/bin/trace index a48cbb3..4149b14 100755 --- a/bin/trace +++ b/bin/trace @@ -78,7 +78,6 @@ $Source = ""; "hobj_ref_t" => "r", "H5R_type_t" => "Rt", "char" => "s", - "unsigned char" => "s", "H5S_class_t" => "Sc", "H5S_seloper_t" => "Ss", "H5S_sel_type" => "St", @@ -131,6 +130,7 @@ $Source = ""; "H5G_iterate_t" => "x", "H5G_info_t" => "x", "H5I_free_t" => "x", + "H5I_iterate_func_t" => "x", "H5L_class_t" => "x", "H5L_elink_traverse_t" => "x", "H5L_iterate_t" => "x", 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); diff --git a/tools/h5dump/h5dump_ddl.c b/tools/h5dump/h5dump_ddl.c index c2f3914..e38b93b 100644 --- a/tools/h5dump/h5dump_ddl.c +++ b/tools/h5dump/h5dump_ddl.c @@ -724,7 +724,9 @@ dump_named_datatype(hid_t tid, const char *name) /* print attributes */ dump_indent += COL; + attr_iteration(tid, attr_crt_order_flags); + dump_indent -= COL; done: -- cgit v0.12