From 2a2c461f71aed4785991bb07549489f2cfc8eb97 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Mon, 23 May 2011 14:51:55 +0000 Subject: [PATCH] several format warnings fixed --- src/h5core/h5_attribs.c | 8 ++++---- src/h5core/h5_maps.c | 6 +++--- src/h5core/h5_readwrite.c | 4 ++-- src/h5core/h5b_attribs.c | 6 +++--- src/h5core/h5b_model.c | 32 +++++++++++++++++++++++--------- src/h5core/h5t_map.c | 12 ++++++------ src/h5core/h5t_tags.c | 2 +- src/h5core/h5u_model.c | 14 ++++++++------ 8 files changed, 50 insertions(+), 34 deletions(-) diff --git a/src/h5core/h5_attribs.c b/src/h5core/h5_attribs.c index 62d7600..055d81a 100644 --- a/src/h5core/h5_attribs.c +++ b/src/h5core/h5_attribs.c @@ -183,9 +183,9 @@ h5priv_get_attrib_info ( "attrib_name=%p, len_attrib_name=%llu, " "attrib_type=%p, attrib_nelem=%p", id, - attrib_idx, + (long long unsigned)attrib_idx, attrib_name, - len_attrib_name, + (long long unsigned)len_attrib_name, attrib_type, attrib_nelem); hid_t attrib_id; @@ -237,9 +237,9 @@ h5_get_attrib_info ( "attrib_idx=%llu, attrib_name=%p, len_attrib_name=%llu, " "attrib_type=%p, attrib_nelem=%p", f, mode, - attrib_idx, + (long long unsigned)attrib_idx, attrib_name, - len_attrib_name, + (long long unsigned)len_attrib_name, attrib_type, attrib_nelem); diff --git a/src/h5core/h5_maps.c b/src/h5core/h5_maps.c index d28eab8..48969d6 100644 --- a/src/h5core/h5_maps.c +++ b/src/h5core/h5_maps.c @@ -20,7 +20,7 @@ h5priv_alloc_idlist ( ) { H5_PRIV_API_ENTER2 (h5_err_t, "list=0x%p, size=%llu", - list, size); + list, (long long unsigned)size); TRY (*list = h5_calloc ( 1, sizeof (**list)+size*sizeof ((*list)->items[0]))); (*list)->size = size; @@ -156,7 +156,7 @@ h5priv_alloc_idxmap ( ) { H5_PRIV_API_ENTER2 (h5_err_t, "map=0x%p, size=%llu", - map, size); + map, (long long unsigned)size); int new = (map->items == NULL); size_t size_in_bytes = size * sizeof (map->items[0]); TRY (map->items = h5_alloc (map->items, size_in_bytes)); @@ -215,7 +215,7 @@ h5priv_search_idxmap ( ) { H5_PRIV_API_ENTER2 (h5_err_t, "map=0x%p, value=%llu", - map, value); + map, (long long)value); register h5_loc_idx_t low = 0; register h5_loc_idx_t high = map->num_items - 1; while (low <= high) { diff --git a/src/h5core/h5_readwrite.c b/src/h5core/h5_readwrite.c index 6c26c64..d42bbe9 100644 --- a/src/h5core/h5_readwrite.c +++ b/src/h5core/h5_readwrite.c @@ -171,7 +171,7 @@ h5_set_step ( h5_file_t* const f, /*!< [in] Handle to open file */ const h5_id_t step_idx /*!< [in] Step to set. */ ) { - H5_CORE_API_ENTER2 (h5_err_t, "f=0x%p, step_idx=%llu", f, step_idx); + H5_CORE_API_ENTER2 (h5_err_t, "f=0x%p, step_idx=%lld", f, (long long)step_idx); TRY (h5priv_close_step (f)); f->step_idx = step_idx; @@ -253,7 +253,7 @@ h5_has_step ( h5_file_t* const f, /*!< [in] Handle to open file */ const h5_id_t step_idx /*!< [in] Step number to query */ ) { - H5_CORE_API_ENTER2 (h5_err_t, "f=0x%p, step_idx=%llu", f, step_idx); + H5_CORE_API_ENTER2 (h5_err_t, "f=0x%p, step_idx=%lld", f, (long long)step_idx); char name[2*H5_STEPNAME_LEN]; sprintf (name, "%s#%0*lld", diff --git a/src/h5core/h5b_attribs.c b/src/h5core/h5b_attribs.c index d2b9527..99f3d9e 100644 --- a/src/h5core/h5b_attribs.c +++ b/src/h5core/h5b_attribs.c @@ -48,7 +48,7 @@ h5_read_field_attrib ( f, field_name, attrib_name, - attrib_type, + (long long)attrib_type, buffer); TRY( h5bpriv_open_field_group(f, field_name) ); @@ -97,8 +97,8 @@ h5b_get_field_attrib_info ( "attrib_nelem=0x%p", f, field_name, - attrib_idx, - attrib_name, len_attrib_name, + (long long unsigned)attrib_idx, + attrib_name, (long long unsigned)len_attrib_name, attrib_type, attrib_nelem); diff --git a/src/h5core/h5b_model.c b/src/h5core/h5b_model.c index 3eed488..4568342 100644 --- a/src/h5core/h5b_model.c +++ b/src/h5core/h5b_model.c @@ -533,9 +533,9 @@ h5b_3d_set_view ( "j_start=%llu, j_end=%llu, " "k_start=%llu, k_end=%llu", f, - i_start, i_end, - j_start, j_end, - k_start, k_end); + (long long unsigned)i_start, (long long unsigned)i_end, + (long long unsigned)j_start, (long long unsigned)j_end, + (long long unsigned)k_start, (long long unsigned)k_end); h5b_partition_t *p = f->b->user_layout; p->i_start = i_start; p->i_end = i_end; @@ -663,7 +663,10 @@ h5b_3d_set_chunk ( ) { H5_CORE_API_ENTER4 (h5_err_t, "f=0x%p, i=%llu, j=%llu, k=%llu", - f, i, j, k); + f, + (long long unsigned)i, + (long long unsigned)j, + (long long unsigned)k); if ( i == 0 || j == 0 || k == 0 ) { h5_info ("Disabling chunking" ); @@ -728,7 +731,10 @@ h5b_3d_set_grid ( ) { H5_CORE_API_ENTER4 (h5_err_t, "f=0x%p, i=%llu, j=%llu, k=%llu", - f, i, j, k); + f, + (long long unsigned)i, + (long long unsigned)j, + (long long unsigned)k); if (i*j*k != f->nprocs) { H5_CORE_API_LEAVE ( h5_error(H5_ERR_INVAL, @@ -787,7 +793,10 @@ h5b_3d_set_dims ( ) { H5_CORE_API_ENTER4 (h5_err_t, "f=0x%p, i=%llu, j=%llu, k=%llu", - f, i, j, k); + f, + (long long unsigned)i, + (long long unsigned)j, + (long long unsigned)k); if ( ! f->b->have_grid ) H5_CORE_API_LEAVE ( h5_error(H5_ERR_INVAL, @@ -849,7 +858,11 @@ h5b_3d_set_halo ( ) { H5_CORE_API_ENTER4 (h5_err_t, "f=0x%p, i=%llu, j=%llu, k=%llu", - f, i, j, k); + f, + (long long unsigned)i, + (long long unsigned)j, + (long long unsigned)k); + if ( ! f->b->have_grid ) { H5_CORE_API_LEAVE ( h5_error(H5_ERR_INVAL, @@ -947,8 +960,9 @@ h5b_get_field_info ( "f=0x%p, idx=%llu, " "name=0x%p, len_name=%llu, " "field_rank=0x%p, field_dims=0x%p, elem_rank=0x%p, type=0x%p", - f, idx, - name, len_name, + f, + (long long unsigned)idx, + name, (long long unsigned)len_name, field_rank, field_dims, elem_rank, type); CHECK_TIMEGROUP( f ); diff --git a/src/h5core/h5t_map.c b/src/h5core/h5t_map.c index 42a2909..331f2d2 100644 --- a/src/h5core/h5t_map.c +++ b/src/h5core/h5t_map.c @@ -67,8 +67,8 @@ h5t_map_global_vertex_idx2local ( const h5_glb_idx_t glb_idx ) { H5_CORE_API_ENTER2 (h5_loc_idx_t, - "f=0x%p, glb_idx=%llu", - f, glb_idx); + "f=0x%p, glb_idx=%lld", + f, (long long)glb_idx); if (glb_idx < 0) return -1; h5_loc_idx_t loc_idx = h5priv_search_idxmap (&f->t->map_vertex_g2l, glb_idx); @@ -87,7 +87,7 @@ h5t_map_global_vertex_indices2local ( ) { H5_CORE_API_ENTER4 (h5_err_t, "f=0x%p, glb_indices=0x%p, size=%llu, loc_indices=0x%p", - f, glb_indices, size, loc_indices); + f, glb_indices, (long long unsigned)size, loc_indices); h5_size_t i; for (i = 0; i < size; i++) { TRY (loc_indices[i] = @@ -110,8 +110,8 @@ h5t_map_glb_elem_idx2loc ( const h5_glb_idx_t glb_idx ) { H5_CORE_API_ENTER2 (h5_loc_idx_t, - "f=0x%p, glb_idx=%llu", - f, glb_idx); + "f=0x%p, glb_idx=%lld", + f, (long long)glb_idx); if (glb_idx < 0) H5_CORE_API_LEAVE (-1); h5_loc_idx_t loc_idx = h5priv_search_idxmap (&f->t->map_elem_g2l, glb_idx); @@ -129,7 +129,7 @@ h5t_map_glb_elem_indices2loc ( ) { H5_CORE_API_ENTER4 (h5_err_t, "f=0x%p, glb_indices=0x%p, size=%llu, loc_indices=0x%p", - f, glb_indices, size, loc_indices); + f, glb_indices, (long long unsigned)size, loc_indices); const h5_glb_idx_t* end = glb_indices+size; while (glb_indices < end) { diff --git a/src/h5core/h5t_tags.c b/src/h5core/h5t_tags.c index 78f3a89..d47c98e 100644 --- a/src/h5core/h5t_tags.c +++ b/src/h5core/h5t_tags.c @@ -343,7 +343,7 @@ h5t_get_mtagset_info ( ) { H5_CORE_API_ENTER4 (h5_ssize_t, "f=0x%p, idx=%lld, name=0x%p, type=0x%p", - f, idx, name, type); + f, (long long)idx, name, type); h5t_fdata_t* t = f->t; *name = t->mtags.names[idx]; void* __retval = NULL; diff --git a/src/h5core/h5u_model.c b/src/h5core/h5u_model.c index 91fa98e..94e0139 100644 --- a/src/h5core/h5u_model.c +++ b/src/h5core/h5u_model.c @@ -60,7 +60,8 @@ h5u_set_num_particles ( ) { H5_CORE_API_ENTER3 (h5_ssize_t, "f=0x%p, nparticles=%llu, stride=%llu", - f, nparticles, stride); + f, (long long unsigned)nparticles, + (long long unsigned)stride); struct h5u_fdata *u = f->u; hsize_t hstride; hsize_t count; @@ -201,7 +202,7 @@ h5u_set_view ( ) { H5_CORE_API_ENTER3 (h5_ssize_t, "f=0x%p, start=%lld, end=%lld", - f, start, end); + f, (long long)start, (long long)end); hsize_t total; hsize_t stride = 1; hsize_t hstart; @@ -280,7 +281,7 @@ h5u_set_view_indices ( ) { H5_CORE_API_ENTER3 (h5_err_t, "f=0x%p, indices=0x%p, nelems=%llu", - f, indices, nelems); + f, indices, (long long unsigned)nelems); hsize_t total; hsize_t dmax = H5S_UNLIMITED; struct h5u_fdata *u = f->u; @@ -432,8 +433,9 @@ h5u_get_dataset_info ( "dataset_name=\"%s\", len_dataset_name=%llu, " "type=0x%p, nelem=0x%p", f, - idx, - dataset_name, len_dataset_name, + (long long unsigned)idx, + dataset_name, + (long long unsigned)len_dataset_name, type, nelem); TRY (hdf5_get_name_of_dataset_by_idx ( f->step_gid, @@ -462,7 +464,7 @@ h5u_set_chunk ( h5_file_t *const f, const h5_size_t size ) { - H5_CORE_API_ENTER2 (h5_int64_t, "f=0x%p, size=%llu", f, size); + H5_CORE_API_ENTER2 (h5_int64_t, "f=0x%p, size=%llu", f, (long long unsigned)size); if ( size == 0 ) { h5_info ("Disabling chunking" );