Skip to content

GitLab

S
src
Commit 1dfcd9f8 authored by gsell's avatar gsell
Browse files
Options

fixes for hdf5 1.10.x

parent 2dd2c625
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 220 additions and 184 deletions
src/h5core/h5_attribs.c
View file @ 1dfcd9f8
......@@ -54,10 +54,10 @@ h5priv_get_attrib_info_by_name (
h5_size_t* attrib_nelem /*!< OUT: number of elements */
) {
H5_PRIV_API_ENTER (h5_err_t,
"id=%d, "
"id=%lld, "
"attrib_name=%s,"
"attrib_type=%p, attrib_nelem=%p",
id,
(long long int)id,
attrib_name,
attrib_type,
attrib_nelem);
......@@ -76,11 +76,11 @@ h5priv_get_attrib_info_by_idx (
h5_size_t* attrib_nelem /*!< OUT: number of elements */
) {
H5_PRIV_API_ENTER (h5_err_t,
"id=%d, "
"id=%lld, "
"attrib_idx=%llu, "
"attrib_name=%p, len_attrib_name=%llu, "
"attrib_type=%p, attrib_nelem=%p",
id,
(long long int)id,
(long long unsigned)attrib_idx,
attrib_name,
(long long unsigned)len_attrib_name,
......@@ -108,10 +108,10 @@ h5priv_read_attrib (
void* const attrib_value /*!< OUT: attribute value */
) {
H5_PRIV_API_ENTER (h5_err_t,
"id=%d, attrib_name='%s', attrib_type=%d, attrib_value=%p",
id,
"id=%lld, attrib_name='%s', attrib_type=%lld, attrib_value=%p",
(long long int)id,
attrib_name,
attrib_type,
(long long int)attrib_type,
attrib_value);
hid_t attrib_id;
hid_t type_id;
......@@ -148,11 +148,11 @@ h5priv_write_attrib (
const int overwrite
) {
H5_PRIV_API_ENTER (h5_err_t,
"id=%d, attrib_name='%s', attrib_type=%d, "
"id=%lld, attrib_name='%s', attrib_type=%lld, "
"attrib_value=%p, attrib_nelem=%llu, overwrite=%d",
id,
(long long int)id,
attrib_name,
attrib_type,
(long long int)attrib_type,
attrib_value,
attrib_nelem,
overwrite);
......@@ -355,11 +355,11 @@ h5_read_file_attrib (
) {
h5_file_p f = (h5_file_p)f_;
H5_CORE_API_ENTER (h5_err_t,
"f=%p, attrib_name='%s', attrib_type=%d, "
"f=%p, attrib_name='%s', attrib_type=%lld, "
"attrib_value=%p",
f,
attrib_name,
attrib_type,
(long long int)attrib_type,
attrib_value);
CHECK_FILEHANDLE (f);
H5_CORE_API_RETURN (h5priv_read_attrib (
......@@ -378,11 +378,11 @@ h5_read_step_attrib (
) {
h5_file_p f = (h5_file_p)f_;
H5_CORE_API_ENTER (h5_err_t,
"f=%p, attrib_name='%s', attrib_type=%d, "
"f=%p, attrib_name='%s', attrib_type=%lld, "
"attrib_value=%p",
f,
attrib_name,
attrib_type,
(long long int)attrib_type,
attrib_value);
CHECK_FILEHANDLE (f);
CHECK_TIMEGROUP (f);
......@@ -404,11 +404,11 @@ h5_write_file_attrib (
) {
h5_file_p f = (h5_file_p)f_;
H5_CORE_API_ENTER (h5_err_t,
"f=%p, attrib_name='%s', attrib_type=%d, "
"f=%p, attrib_name='%s', attrib_type=%lld, "
"attrib_value=%p, attrib_nelem=%llu",
f,
attrib_name,
attrib_type,
(long long int)attrib_type,
attrib_value,
attrib_nelem);
CHECK_FILEHANDLE (f);
......@@ -432,11 +432,11 @@ h5_write_step_attrib (
) {
h5_file_p f = (h5_file_p)f_;
H5_CORE_API_ENTER (h5_err_t,
"f=%p, attrib_name='%s', attrib_type=%d, "
"f=%p, attrib_name='%s', attrib_type=%lld, "
"attrib_value=%p, attrib_nelem=%llu",
f,
attrib_name,
attrib_type,
(long long int)attrib_type,
attrib_value,
attrib_nelem);
CHECK_FILEHANDLE (f);
......
src/h5core/h5_errorhandling.c
View file @ 1dfcd9f8
......@@ -31,7 +31,7 @@ char *h5_rfmts[] = {
[e_h5t_iterator_p] "%p",
[e_h5_loc_id_t] "%ld",
[e_h5_loc_idx_t] "%ld",
[e_hid_t] "%ld",
[e_hid_t] "%lld",
[e_H5O_type_t] "%ld",
[e_h5_glb_elem_p] "%p",
[e_h5_prop_p] "%p",
......
src/h5core/h5_hdf5.c
View file @ 1dfcd9f8
......@@ -24,8 +24,9 @@ h5priv_link_exists_ (
const char const* path[],
size_t size
) {
H5_PRIV_FUNC_ENTER (h5_err_t, "loc_id=%d, (%s), path=%s, ...",
loc_id, hdf5_get_objname (loc_id), path[0]);
H5_PRIV_FUNC_ENTER (h5_err_t,
"loc_id=%lld, (%s), path=%s, ...",
(long long int)loc_id, hdf5_get_objname (loc_id), path[0]);
// for the time being we limit the concatenated path to 1024 bytes
char name[1024];
char* s = name;
......@@ -57,8 +58,8 @@ h5priv_open_group_ (
size_t size
) {
H5_PRIV_FUNC_ENTER (h5_err_t,
"create_intermediate=%d, loc_id=%d, (%s), path=%s, ...",
create_intermediate, loc_id, hdf5_get_objname (loc_id),
"create_intermediate=%d, loc_id=%lld, (%s), path=%s, ...",
create_intermediate, (long long int)loc_id, hdf5_get_objname (loc_id),
path[0]);
hid_t hid = loc_id;
hid_t hid2 = 0;
......@@ -205,8 +206,8 @@ iter_op_count_match (
void* _op_data
) {
H5_PRIV_FUNC_ENTER (herr_t,
"g_id=%d, name='%s', info=%p, _op_data=%p",
g_id, name, info, _op_data);
"g_id=%lld, name='%s', info=%p, _op_data=%p",
(long long int)g_id, name, info, _op_data);
op_data_t* op_data = (op_data_t*)_op_data;
H5O_type_t type;
TRY (type = iter_op_get_obj_type (g_id, name, info));
......@@ -223,7 +224,9 @@ ssize_t
hdf5_get_num_groups (
const hid_t loc_id
) {
HDF5_WRAPPER_ENTER (ssize_t, "loc_id=%d (%s)", loc_id, hdf5_get_objname (loc_id));
HDF5_WRAPPER_ENTER (ssize_t,
"loc_id=%lld (%s)",
(long long int)loc_id, hdf5_get_objname (loc_id));
op_data_t op_data;
memset (&op_data, 0, sizeof (op_data));
op_data.type = H5O_TYPE_GROUP;
......@@ -247,8 +250,8 @@ hdf5_get_num_groups_matching_prefix (
char* prefix
) {
HDF5_WRAPPER_ENTER (ssize_t,
"loc_id=%d (%s), prefix='%s'",
loc_id, hdf5_get_objname (loc_id), prefix);
"loc_id=%lld (%s), prefix='%s'",
(long long int)loc_id, hdf5_get_objname (loc_id), prefix);
op_data_t op_data;
memset (&op_data, 0, sizeof (op_data));
op_data.type = H5O_TYPE_GROUP;
......@@ -276,8 +279,8 @@ hdf5_get_name_of_group_by_idx (
size_t len
) {
HDF5_WRAPPER_ENTER (h5_err_t,
"loc_id=%d (%s), idx=%llu, name=%p, len=%llu",
loc_id, hdf5_get_objname (loc_id),
"loc_id=%lld (%s), idx=%llu, name=%p, len=%llu",
(long long int)loc_id, hdf5_get_objname (loc_id),
idx, name, (unsigned long long)len);
op_data_t op_data;
memset (&op_data, 0, sizeof (op_data));
......@@ -307,7 +310,8 @@ hdf5_get_num_datasets (
const hid_t loc_id
) {
HDF5_WRAPPER_ENTER (ssize_t,
"loc_id=%d (%s)", loc_id, hdf5_get_objname (loc_id));
"loc_id=%lld (%s)",
(long long int)loc_id, hdf5_get_objname (loc_id));
op_data_t op_data;
memset (&op_data, 0, sizeof (op_data));
op_data.type = H5O_TYPE_DATASET;
......@@ -336,8 +340,8 @@ hdf5_get_name_of_dataset_by_idx (
size_t len
) {
HDF5_WRAPPER_ENTER (h5_err_t,
"loc_id=%d (%s), idx=%llu, name=%p, len=%llu",
loc_id, hdf5_get_objname (loc_id),
"loc_id=%lld (%s), idx=%llu, name=%p, len=%llu",
(long long int)loc_id, hdf5_get_objname (loc_id),
idx, name, (unsigned long long)len);
op_data_t op_data;
memset (&op_data, 0, sizeof (op_data));
......
src/h5core/h5_hdf5_private.h
View file @ 1dfcd9f8
This diff is collapsed.
src/h5core/h5_model.c
View file @ 1dfcd9f8
......@@ -66,7 +66,9 @@ h5_int64_t
h5priv_normalize_h5_type (
hid_t type
) {
H5_CORE_API_ENTER (h5_int64_t, "type=%d", type);
H5_CORE_API_ENTER (h5_int64_t,
"type=%lld",
(long long int)type);
H5T_class_t tclass;
int size;
TRY (tclass = H5Tget_class (type));
......@@ -104,8 +106,8 @@ h5priv_get_dataset_type(
const char* dset_name
) {
H5_CORE_API_ENTER (h5_int64_t,
"group_id=%d, dset_name='%s'",
group_id, dset_name);
"group_id=%lld, dset_name='%s'",
(long long int)group_id, dset_name);
hid_t dset_id;
hid_t hdf5_type;
h5_int64_t type;
......
src/h5core/h5_readwrite.c
View file @ 1dfcd9f8
......@@ -25,8 +25,8 @@
*/
h5_err_t
h5priv_write_dataset_by_name (
h5t_mesh_t* const m,
const h5_file_p f,
h5t_mesh_t* const m,
const h5_file_p f,
const hid_t loc_id,
h5_dsinfo_t* dsinfo,
hid_t (*set_memspace)(h5t_mesh_t*,hid_t),
......@@ -34,9 +34,9 @@ h5priv_write_dataset_by_name (
const void* const data
) {
H5_PRIV_API_ENTER (h5_err_t,
"m=%p, f=%p, loc_id=%d (%s), dsinfo=%p, set_memspace=%p, "
"m=%p, f=%p, loc_id=%lld (%s), dsinfo=%p, set_memspace=%p, "
"set_diskspace=%p, data=%p",
m, f, loc_id, hdf5_get_objname(loc_id),
m, f, (long long int)loc_id, hdf5_get_objname(loc_id),
dsinfo,
set_memspace, set_diskspace, data);
h5_info ("Writing dataset %s/%s.",
......@@ -117,12 +117,12 @@ h5priv_write_dataset_by_name_id (
const void* const data
) {
H5_PRIV_API_ENTER (h5_err_t,
"f=%p, loc_id=%d (%s), dsinfo=%p, dset_id=%d, memspace_id=%d, "
"diskspace_id=%d, data=%p",
f, loc_id, hdf5_get_objname(loc_id),
"f=%p, loc_id=%lld (%s), dsinfo=%p, dset_id=%lld, memspace_id=%lld, "
"diskspace_id=%lld, data=%p",
f, (long long int)loc_id, hdf5_get_objname(loc_id),
dsinfo,
dset_id,
memspace_id, diskspace_id, data);
(long long int)dset_id,
(long long int)memspace_id, (long long int)diskspace_id, data);
h5_info ("Writing dataset %s/%s.",
hdf5_get_objname (loc_id), dsinfo->name);
......
src/h5core/h5b_attribs.c
View file @ 1dfcd9f8
......@@ -30,12 +30,12 @@ h5b_write_field_attrib (
h5_file_p f = (h5_file_p)fh;
H5_CORE_API_ENTER (h5_err_t,
"f=%p, field_name='%s', "
"attrib_name='%s', attrib_type=%d, "
"attrib_name='%s', attrib_type=%lld, "
"attrib_value=%p, attrib_nelem=%lld",
f,
field_name,
attrib_name,
attrib_type,
(long long int)attrib_type,
attrib_value,
(long long)attrib_nelem);
CHECK_FILEHANDLE (f);
......
src/h5core/h5b_readwrite.c
View file @ 1dfcd9f8
......@@ -201,8 +201,8 @@ _write_data (
const hid_t type /*!< IN: data type */
) {
H5_PRIV_FUNC_ENTER (h5_err_t,
"f=%p, field_name=%s, data_name=%s, data=%p type=%d",
f, field_name, data_name, data, type);
"f=%p, field_name=%s, data_name=%s, data=%p type=%lld",
f, field_name, data_name, data, (long long int)type);
hid_t dataset;
h5b_fdata_t *b = f->b;
......@@ -252,8 +252,8 @@ h5b_write_scalar_data (
) {
h5_file_p f = (h5_file_p)fh;
H5_CORE_API_ENTER (h5_err_t,
"f=%p, field_name='%s', data=%p, type=%d",
f, field_name, data, type);
"f=%p, field_name='%s', data=%p, type=%lld",
f, field_name, data, (long long int)type);
CHECK_TIMEGROUP (f);
CHECK_WRITABLE_MODE (f);
CHECK_LAYOUT (f);
......@@ -280,8 +280,8 @@ h5b_write_vector3d_data (
"xdata=%p, "
"ydata=%p, "
"zdata=%p, "
"type=%d",
f, field_name, xdata, ydata, zdata, type);
"type=%lld",
f, field_name, xdata, ydata, zdata, (long long int)type);
CHECK_TIMEGROUP( f );
CHECK_WRITABLE_MODE( f );
CHECK_LAYOUT( f );
......@@ -300,7 +300,9 @@ _select_hyperslab_for_reading (
const h5_file_p f, /*!< IN: file handle */
const hid_t dataset
) {
H5_PRIV_FUNC_ENTER (h5_err_t, "f=%p, dataset=%d", f, dataset);
H5_PRIV_FUNC_ENTER (h5_err_t,
"f=%p, dataset=%lld",
f, (long long int)dataset);
h5b_fdata_t *b = f->b;
h5b_partition_t *p = b->user_layout;
int rank;
......@@ -381,8 +383,8 @@ read_data (
const hid_t type /*!< IN: data type */
) {
H5_PRIV_FUNC_ENTER (h5_err_t,
"f=%p, dataset_name=%s, data=%p, type=%d",
f, dataset_name, data, type);
"f=%p, dataset_name=%s, data=%p, type=%lld",
f, dataset_name, data, (long long int)type);
hid_t dataset;
h5b_fdata_t *b = f->b;
......@@ -411,8 +413,8 @@ h5b_read_scalar_data (
) {
h5_file_p f = (h5_file_p)fh;
H5_CORE_API_ENTER (h5_err_t,
"f=%p, field_name='%s', data=%p, type=%d",
f, field_name, data, type);
"f=%p, field_name='%s', data=%p, type=%lld",
f, field_name, data, (long long int)type);
CHECK_TIMEGROUP( f );
CHECK_LAYOUT( f );
......@@ -437,8 +439,8 @@ h5b_read_vector3d_data (
"xdata=%p, "
"ydata=%p, "
"zdata=%p, "
"type=%d",
f, field_name, xdata, ydata, zdata, type);
"type=%lld",
f, field_name, xdata, ydata, zdata, (long long int)type);
CHECK_TIMEGROUP( f );
CHECK_LAYOUT( f );
......
src/h5core/h5t_tags.c
View file @ 1dfcd9f8
......@@ -38,9 +38,9 @@ read_dataset (
void* const data
) {
H5_PRIV_API_ENTER (h5_err_t,
"f=%p, dset_id=%d (%s), dsinfo=%p, set_mspace=%p, "
"f=%p, dset_id=%lld (%s), dsinfo=%p, set_mspace=%p, "
"set_dspace=%p, data=%p",
f, dset_id, hdf5_get_objname(dset_id),
f, (long long int)dset_id, hdf5_get_objname(dset_id),
dsinfo,
set_mspace, set_dspace, data);
......@@ -105,8 +105,8 @@ get_tagset_info (
h5_int64_t* const type
) {
H5_PRIV_FUNC_ENTER (h5_err_t,
"loc_id=%d, idx=%llu, name=%p, len_name=%llu, type=%p",
loc_id, (long long unsigned)idx, name,
"loc_id=%lld, idx=%llu, name=%p, len_name=%llu, type=%p",
(long long int)loc_id, (long long unsigned)idx, name,
(long long unsigned)len_name, type);
hid_t tags_id, tag_id, dset_id;
......@@ -740,7 +740,9 @@ remove_tagset (
const hid_t tagsets_id,
const char name[]
) {
H5_PRIV_FUNC_ENTER (h5_err_t, "tagsets_id=%d, name=%s", tagsets_id, name);
H5_PRIV_FUNC_ENTER (h5_err_t,
"tagsets_id=%lld, name=%s",
(long long int)tagsets_id, name);
hid_t loc_id;
TRY (loc_id = hdf5_open_group (tagsets_id, name));
TRY (hdf5_delete_link (loc_id, "elems", H5P_DEFAULT));
......
src/h5core/h5u_readwrite.c
View file @ 1dfcd9f8
......@@ -85,8 +85,9 @@ h5u_read_data (
const hid_t type
) {
h5_file_p f = (h5_file_p)fh;
H5_CORE_API_ENTER (h5_err_t, "f=%p, name='%s', data=%p, type=%d",
f, name, data, type);
H5_CORE_API_ENTER (h5_err_t,
"f=%p, name='%s', data=%p, type=%lld",
f, name, data, (long long int)type);
CHECK_TIMEGROUP (f);
struct h5u_fdata *u = f->u;
......@@ -181,8 +182,9 @@ h5u_write_data (
const hid_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=%d",
f, name, data, type);
H5_CORE_API_ENTER (h5_err_t,
"f=%p, name='%s', data=%p, type=%lld",
f, name, data, (long long int)type);
CHECK_TIMEGROUP( f );
CHECK_WRITABLE_MODE( f );
......
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