From 87feccada8b9d15a4f59847b3672ae525678a13f Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Mon, 23 May 2011 14:50:00 +0000 Subject: [PATCH] several format warnings fixed --- src/C/H5.c | 6 +++--- src/C/H5Block.c | 45 +++++++++++++++++++++++++++++---------------- src/C/H5Part.c | 32 ++++++++++++++++---------------- src/C/H5_attribs.c | 10 +++++----- 4 files changed, 53 insertions(+), 40 deletions(-) diff --git a/src/C/H5.c b/src/C/H5.c index 2990406..5de0a9b 100644 --- a/src/C/H5.c +++ b/src/C/H5.c @@ -114,7 +114,7 @@ H5SetStepNameFormat ( ) { H5_API_ENTER3 (h5_err_t, "f=0x%p, name=\"%s\", width=%lld", - f, name, width); + f, name, (long long) width); H5_API_RETURN (h5_set_stepname_fmt (f, name, width)); } @@ -135,7 +135,7 @@ H5GetStepNameFormat ( ) { H5_API_ENTER4 (h5_err_t, "f=0x%p, name=0x%p, l_name=%llu, width=0x%p", - f, name, l_name, width); + f, name, (long long)l_name, width); H5_API_RETURN (h5_get_stepname_fmt (f, name, l_name, width)); } @@ -151,7 +151,7 @@ H5SetStep ( h5_file_t* const f, /*!< [in] Handle to open file */ const h5_id_t step /*!< [in] Step to set. */ ) { - H5_API_ENTER2 (h5_err_t, "f=0x%p, step=%llu", f, step); + H5_API_ENTER2 (h5_err_t, "f=0x%p, step=%llu", f, (long long)step); H5_API_RETURN (h5_set_step (f, step)); } diff --git a/src/C/H5Block.c b/src/C/H5Block.c index 0652112..b1d9954 100644 --- a/src/C/H5Block.c +++ b/src/C/H5Block.c @@ -101,13 +101,13 @@ H5Block3dSetView ( ) { H5_API_ENTER7 (h5_err_t, "f=0X%p, " - "i_start=%llu, i_end=%llu, " - "j_start=%llu, j_end=%llu, " - "k_start=%llu, k_end=%llu", + "i_start=%lld, i_end=%lld, " + "j_start=%lld, j_end=%lld, " + "k_start=%lld, k_end=%lld", f, - i_start, i_end, - j_start, j_end, - k_start, k_end); + (long long)i_start, (long long)i_end, + (long long)j_start, (long long)j_end, + (long long)k_start, (long long)k_end); H5_API_RETURN (h5b_3d_set_view(f, i_start, i_end, j_start, j_end, k_start, k_end)); } @@ -186,7 +186,10 @@ H5Block3dSetChunk ( ) { H5_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); H5_API_RETURN (h5b_3d_set_chunk(f, i, j, k)); } @@ -235,7 +238,10 @@ H5Block3dSetGrid ( ) { H5_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); H5_API_RETURN (h5b_3d_set_grid(f, i, j, k)); } @@ -280,8 +286,11 @@ H5Block3dSetDims ( const h5_size_t k /*!< IN: dimension in \c k */ ) { H5_API_ENTER4 (h5_err_t, - "f=0x%p, i=%llu, j=%llu, k=%llu", - f, i, j, k); + "f=0x%p, i=%llu, j=%llu, k=%llu", + f, + (long long unsigned)i, + (long long unsigned)j, + (long long unsigned)k); H5_API_RETURN (h5b_3d_set_dims(f, i, j, k)); } #endif @@ -307,7 +316,10 @@ H5Block3dSetHalo ( ) { H5_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); H5_API_RETURN (h5b_3d_set_halo(f, i, j, k)); } @@ -358,9 +370,10 @@ H5BlockGetFieldInfo ( "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, - field_rank, field_dims, elem_rank, type); + f, (long long unsigned)idx, + name, (long long unsigned)len_name, + field_rank, field_dims, elem_rank, + type); H5_API_RETURN ( h5b_get_field_info ( f, @@ -524,8 +537,8 @@ H5BlockGetFieldAttribInfo ( "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); H5_API_RETURN ( diff --git a/src/C/H5Part.c b/src/C/H5Part.c index 5b4aec3..051be01 100644 --- a/src/C/H5Part.c +++ b/src/C/H5Part.c @@ -387,12 +387,12 @@ H5PartGetDatasetName ( const h5_size_t len /*!< [in] Size of buffer \c name */ ) { H5_API_ENTER4 (h5_err_t, - "f=0x%p, " - "idx=%llu, " - "name=\"%s\", len=%llu, ", - f, - idx, - name, len); + "f=0x%p, " + "idx=%llu, " + "name=\"%s\", len=%llu, ", + f, + (long long)idx, + name, (long long)len); H5_API_RETURN (h5u_get_dataset_info(f, idx, name, len, NULL, NULL)); } @@ -422,14 +422,14 @@ H5PartGetDatasetInfo ( h5_size_t *nelem /*!< [out] Number of elements. */ ) { H5_API_ENTER6 (h5_int64_t, - "f=0x%p, " - "idx=%llu, " - "dataset_name=\"%s\", len_dataset_name=%llu, " - "type=0x%p, nelem=0x%p", - f, - idx, - dataset_name, len_dataset_name, - type, nelem); + "f=0x%p, " + "idx=%llu, " + "dataset_name=\"%s\", len_dataset_name=%llu, " + "type=0x%p, nelem=0x%p", + f, + (long long)idx, + dataset_name, (long long)len_dataset_name, + type, nelem); H5_API_RETURN (h5u_get_dataset_info(f, idx, dataset_name, len_dataset_name, type, nelem)); } @@ -524,7 +524,7 @@ H5PartSetView ( ) { H5_API_ENTER3 (h5_err_t, "f=0x%p, start=%lld, end=%lld", - f, start, end); + f, (long long)start, (long long)end); H5_API_RETURN (h5u_set_view (f, start, end)); } @@ -559,7 +559,7 @@ H5PartSetViewIndices ( ) { H5_API_ENTER3 (h5_err_t, "f=0x%p, indices=0x%p, nelems=%llu", - f, indices, nelems); + f, indices, (long long unsigned)nelems); H5_API_RETURN (h5u_set_view_indices (f, indices, nelems)); } diff --git a/src/C/H5_attribs.c b/src/C/H5_attribs.c index c11042f..033c080 100644 --- a/src/C/H5_attribs.c +++ b/src/C/H5_attribs.c @@ -683,12 +683,12 @@ H5GetFileAttribInfo ( ) { H5_API_ENTER6 (h5_err_t, "f=%p, " - "attrib_idx=%llu, attrib_name=%p, len_attrib_name=%llu, " + "attrib_idx=%llu, attrib_name=0x%p, len_attrib_name=%llu, " "attrib_type=%p, attrib_nelem=%p", f, - attrib_idx, + (long long unsigned)attrib_idx, attrib_name, - len_of_attrib_name, + (long long unsigned)len_of_attrib_name, attrib_type, attrib_nelem); H5_API_RETURN (h5_get_attrib_info ( @@ -730,9 +730,9 @@ H5GetStepAttribInfo ( "attrib_idx=%llu, attrib_name=%p, len_attrib_name=%llu, " "attrib_type=%p, attrib_nelem=%p", f, - attrib_idx, + (long long)attrib_idx, attrib_name, - len_of_attrib_name, + (long long)len_of_attrib_name, attrib_type, attrib_nelem); H5_API_RETURN (h5_get_attrib_info (