Commit f1cb1c98 authored by gsell's avatar gsell

Merge branch 'master' of gitlab.psi.ch:H5hut/src

parents 627d6673 df2be384
......@@ -165,10 +165,9 @@ h5_openfile (
h5_int64_t* _props,
const int _len_fname
) {
int len_fname = strlenf (_fname, _len_fname);
H5_API_ENTER (h5_int64_t,
"fname = %*s, mode=%lld, props=%lld",
len_fname, _fname, (long long int)*_mode, (long long int)*_props);
_len_fname, _fname, (long long int)*_mode, (long long int)*_props);
char* fname = h5_strdupfor2c (_fname, _len_fname);
h5_int64_t mode = *_mode;
h5_prop_t props = (h5_prop_t)*_props;
......
......@@ -765,8 +765,7 @@ h5_err_t
h5_start_traverse_iterations (
const h5_file_t f_ /*!< file handle */
) {
h5_file_p f = (h5_file_p)f_;
H5_CORE_API_ENTER (int, "f=%p", f);
H5_CORE_API_ENTER (int, "f=%p", (void*)f_);
/*
fast test: Does Step#0 or Step#1 exist?
......
......@@ -687,6 +687,7 @@ rebuild_map_elem_g2l (
H5_RETURN (H5_SUCCESS);
}
#if defined(WITH_PARALLEL_H5GRID)
/*
Rebuild mapping of global element indices to their local indices.
*/
......@@ -716,6 +717,7 @@ rebuild_map_elem_g2l_partial (
h5priv_sort_idxmap (map);
H5_RETURN (H5_SUCCESS);
}
#endif
h5_err_t
h5t_end_store_elems (
......
......@@ -248,10 +248,9 @@ h5u_write_dataset (
const void* data, /*!< IN: Array to commit to disk */
const h5_types_t type /*!< IN: Type of data */
) {
h5_file_p f = (h5_file_p)fh;
H5_CORE_API_ENTER (h5_err_t,
"f=%p, name='%s', data=%p, type=%lld",
f, name, data, (long long int)type);
(void*)fh, name, data, (long long int)type);
hid_t dset_id;
TRY (dset_id = h5u_open_dataset (fh, name, type));
TRY (h5u_write (fh, dset_id, type, data));
......
......@@ -43,9 +43,15 @@
#define H5_PRIV_FUNC_ENTER(type, fmt, ...) \
__FUNC_ENTER(type, H5_DEBUG_PRIV_FUNC, fmt, __VA_ARGS__ )
#ifdef NDEBUG
#define H5_INLINE_FUNC_ENTER(type) \
type ret_value = (type)H5_ERR; int __log__ = 0;
type ret_value = (type)H5_ERR;
#else
#define H5_INLINE_FUNC_ENTER(type) \
type ret_value = (type)H5_ERR; int __log__ = 0;
#endif
#define HDF5_WRAPPER_ENTER(type, fmt, ...) \
__FUNC_ENTER(type, H5_DEBUG_HDF5, fmt, __VA_ARGS__ )
......
......@@ -191,9 +191,9 @@ h5t_add_chunked_tetrahedral_mesh (
const h5_weight_t num_weights,
h5t_mesh_t** mesh
) {
h5_file_p f = (h5_file_p)fh;
H5_CORE_API_ENTER (h5_err_t, "f=%p, name=%s, mesh=%p", f, name, mesh);
H5_CORE_API_ENTER (h5_err_t, "f=%p, name=%s, mesh=%p", (void*)fh, name, mesh);
#ifdef WITH_PARALLEL_H5GRID
h5_file_p f = (h5_file_p)fh;
CHECK_WRITABLE_MODE (f);
h5_err_t exists;
TRY (exists = h5priv_link_exists (
......
......@@ -209,9 +209,9 @@ h5t_add_chunked_triangle_mesh(
const h5_weight_t num_weights,
h5t_mesh_t** mesh
) {
h5_file_p f = (h5_file_p)fh;
H5_CORE_API_ENTER (h5_err_t, "f=%p, name=%s, mesh=%p", f, name, mesh);
H5_CORE_API_ENTER (h5_err_t, "f=%p, name=%s, mesh=%p", (void*)fh, name, mesh);
#ifdef WITH_PARALLEL_H5GRID
h5_file_p f = (h5_file_p)fh;
int size = -1;
TRY (h5priv_mpi_comm_size (f->props->comm, &size));
if (size != 1) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment