H5hut/src_old
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

several warnings with Intel-C/GCC -Wall fixed

Browse Source
This commit is contained in:
gsell
2011-05-24 12:59:35 +00:00
parent 2a2c461f71
commit bb5bbb4216
9 changed files with 105 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/C/H5.c
+2 -2
View File
@@ -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, (long long)l_name, width);
f, name, 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, (long long)step);
H5_API_ENTER2 (h5_err_t, "f=0x%p, step=%lld", f, step);
H5_API_RETURN (h5_set_step (f, step));
}
src/C/H5Block_readwrite.c
+83 -82
View File
@@ -1,5 +1,6 @@
#include "h5core/h5_core.h"
#include "H5Block_readwrite.h"
/*!
\ingroup h5block_data
@@ -92,15 +93,15 @@ h5_err_t
H5Block3dReadVector3dFieldFloat64 (
h5_file_t *const f, /*!< IN: file handle */
const char *name, /*!< IN: name of dataset to write */
const h5_float64_t *x_buf, /*!< OUT: pointer to X axis buffer */
const h5_float64_t *y_buf, /*!< OUT: pointer to Y axis buffer */
const h5_float64_t *z_buf /*!< OUT: pointer to Z axis buffer */
h5_float64_t *const x_buf, /*!< OUT: pointer to X axis buffer */
h5_float64_t *const y_buf, /*!< OUT: pointer to Y axis buffer */
h5_float64_t *const z_buf /*!< OUT: pointer to Z axis buffer */
) {
H5_API_ENTER5 (h5_err_t, "f=0x%p, name=\"%s\", x_buf=0x%p, y_buf=0x%p, z_buf=0x%p",
f, name, x_buf, y_buf, z_buf);
H5_API_RETURN(h5b_read_vector3d_data(f, name,
(void*)x_buf, (void*)y_buf, (void*)z_buf, H5T_NATIVE_DOUBLE));
x_buf, y_buf, z_buf, H5T_NATIVE_DOUBLE));
}
/*!
@@ -123,7 +124,7 @@ H5Block3dWriteScalarFieldFloat32 (
H5_API_ENTER3 (h5_err_t, "f=0x%p, name=\"%s\", buffer=0x%p",
f, name, buffer);
H5_API_RETURN (h5b_write_scalar_data(f, name, (void*)buffer, H5T_NATIVE_FLOAT ));
H5_API_RETURN (h5b_write_scalar_data(f, name, buffer, H5T_NATIVE_FLOAT ));
}
/*!
@@ -141,12 +142,12 @@ h5_err_t
H5Block3dReadScalarFieldFloat32 (
h5_file_t *const f, /*!< IN: file handle */
const char *name, /*!< IN: name of dataset to read */
h5_float32_t *buffer /*!< OUT: pointer to read buffer */
h5_float32_t *const buffer /*!< OUT: pointer to read buffer */
) {
H5_API_ENTER3 (h5_err_t, "f=0x%p, name=\"%s\", buffer=0x%p",
f, name, buffer);
H5_API_RETURN (h5b_read_scalar_data(f, name, (void*)buffer, H5T_NATIVE_FLOAT));
H5_API_RETURN (h5b_read_scalar_data(f, name, buffer, H5T_NATIVE_FLOAT));
}
/*!
@@ -174,7 +175,7 @@ H5Block3dWriteVector3dFieldFloat32 (
H5_API_ENTER5 (h5_err_t, "f=0x%p, name=\"%s\", x_buf=0x%p, y_buf=0x%p, z_buf=0x%p",
f, name, x_buf, y_buf, z_buf);
H5_API_RETURN(h5b_write_vector3d_data(f, name,
(void*)x_buf, (void*)y_buf, (void*)z_buf, H5T_NATIVE_FLOAT));
x_buf, y_buf, z_buf, H5T_NATIVE_FLOAT));
}
/*!
@@ -194,15 +195,15 @@ h5_err_t
H5Block3dReadVector3dFieldFloat32 (
h5_file_t *const f, /*!< IN: file handle */
const char *name, /*!< IN: name of dataset to write */
const h5_float32_t *x_buf, /*!< OUT: pointer to X axis buffer */
const h5_float32_t *y_buf, /*!< OUT: pointer to Y axis buffer */
const h5_float32_t *z_buf /*!< OUT: pointer to Z axis buffer */
h5_float32_t *const x_buf, /*!< OUT: pointer to X axis buffer */
h5_float32_t *const y_buf, /*!< OUT: pointer to Y axis buffer */
h5_float32_t *const z_buf /*!< OUT: pointer to Z axis buffer */
) {
H5_API_ENTER5 (h5_err_t, "f=0x%p, name=\"%s\", x_buf=0x%p, y_buf=0x%p, z_buf=0x%p",
f, name, x_buf, y_buf, z_buf);
H5_API_RETURN(h5b_read_vector3d_data(f, name,
(void*)x_buf, (void*)y_buf, (void*)z_buf, H5T_NATIVE_FLOAT));
x_buf, y_buf, z_buf, H5T_NATIVE_FLOAT));
}
/*!
@@ -225,7 +226,7 @@ H5Block3dWriteScalarFieldInt64 (
H5_API_ENTER3 (h5_err_t, "f=0x%p, name=\"%s\", buffer=0x%p",
f, name, buffer);
H5_API_RETURN (h5b_write_scalar_data(f, name, (void*)buffer, H5T_NATIVE_INT64 ));
H5_API_RETURN (h5b_write_scalar_data(f, name, buffer, H5T_NATIVE_INT64 ));
}
/*!
@@ -243,12 +244,12 @@ h5_err_t
H5Block3dReadScalarFieldInt64 (
h5_file_t *const f, /*!< IN: file handle */
const char *name, /*!< IN: name of dataset to read */
h5_int64_t *buffer /*!< OUT: pointer to read buffer */
h5_int64_t *const buffer /*!< OUT: pointer to read buffer */
) {
H5_API_ENTER3 (h5_err_t, "f=0x%p, name=\"%s\", buffer=0x%p",
f, name, buffer);
H5_API_RETURN (h5b_read_scalar_data(f, name, (void*)buffer, H5T_NATIVE_INT64));
H5_API_RETURN (h5b_read_scalar_data(f, name, buffer, H5T_NATIVE_INT64));
}
/*!
@@ -275,8 +276,8 @@ H5Block3dWriteVector3dFieldInt64 (
H5_API_ENTER5 (h5_err_t, "f=0x%p, name=\"%s\", x_buf=0x%p, y_buf=0x%p, z_buf=0x%p",
f, name, x_buf, y_buf, z_buf);
H5_API_RETURN(h5b_write_vector3d_data(f, name,
(void*)x_buf, (void*)y_buf, (void*)z_buf, H5T_NATIVE_INT64));
H5_API_RETURN (h5b_write_vector3d_data(f, name,
x_buf, y_buf, z_buf, H5T_NATIVE_INT64));
}
/*!
@@ -296,15 +297,15 @@ h5_err_t
H5Block3dReadVector3dFieldInt64 (
h5_file_t *const f, /*!< IN: file handle */
const char *name, /*!< IN: name of dataset to write */
const h5_int64_t *x_buf, /*!< OUT: pointer to X axis buffer */
const h5_int64_t *y_buf, /*!< OUT: pointer to Y axis buffer */
const h5_int64_t *z_buf /*!< OUT: pointer to Z axis buffer */
h5_int64_t *const x_buf, /*!< OUT: pointer to X axis buffer */
h5_int64_t *const y_buf, /*!< OUT: pointer to Y axis buffer */
h5_int64_t *const z_buf /*!< OUT: pointer to Z axis buffer */
) {
H5_API_ENTER5 (h5_err_t, "f=0x%p, name=\"%s\", x_buf=0x%p, y_buf=0x%p, z_buf=0x%p",
f, name, x_buf, y_buf, z_buf);
H5_API_RETURN(h5b_read_vector3d_data(f, name,
(void*)x_buf, (void*)y_buf, (void*)z_buf, H5T_NATIVE_INT64));
f, name, x_buf, y_buf, z_buf);
H5_API_RETURN (h5b_read_vector3d_data(f, name,
x_buf, y_buf, z_buf, H5T_NATIVE_INT64));
}
/*!
@@ -327,7 +328,7 @@ H5Block3dWriteScalarFieldInt32 (
H5_API_ENTER3 (h5_err_t, "f=0x%p, name=\"%s\", buffer=0x%p",
f, name, buffer);
H5_API_RETURN (h5b_write_scalar_data(f, name, (void*)buffer, H5T_NATIVE_INT32 ));
H5_API_RETURN (h5b_write_scalar_data(f, name, buffer, H5T_NATIVE_INT32 ));
}
/*!
@@ -345,12 +346,12 @@ h5_err_t
H5Block3dReadScalarFieldInt32 (
h5_file_t *const f, /*!< IN: file handle */
const char *name, /*!< IN: name of dataset to read */
h5_int32_t *buffer /*!< OUT: pointer to read buffer */
h5_int32_t *const buffer /*!< OUT: pointer to read buffer */
) {
H5_API_ENTER3 (h5_err_t, "f=0x%p, name=\"%s\", buffer=0x%p",
f, name, buffer);
H5_API_RETURN (h5b_read_scalar_data(f, name, (void*)buffer, H5T_NATIVE_INT32));
H5_API_RETURN (h5b_read_scalar_data(f, name, buffer, H5T_NATIVE_INT32));
}
/*!
@@ -376,9 +377,9 @@ H5Block3dWriteVector3dFieldInt32 (
) {
H5_API_ENTER5 (h5_err_t, "f=0x%p, name=\"%s\", x_buf=0x%p, y_buf=0x%p, z_buf=0x%p",
f, name, x_buf, y_buf, z_buf);
f, name, x_buf, y_buf, z_buf);
H5_API_RETURN(h5b_write_vector3d_data(f, name,
(void*)x_buf, (void*)y_buf, (void*)z_buf, H5T_NATIVE_INT32));
x_buf, y_buf, z_buf, H5T_NATIVE_INT32));
}
/*!
@@ -398,15 +399,15 @@ h5_err_t
H5Block3dReadVector3dFieldInt32 (
h5_file_t *const f, /*!< IN: file handle */
const char *name, /*!< IN: name of dataset to write */
const h5_int32_t *x_buf, /*!< OUT: pointer to X axis buffer */
const h5_int32_t *y_buf, /*!< OUT: pointer to Y axis buffer */
const h5_int32_t *z_buf /*!< OUT: pointer to Z axis buffer */
h5_int32_t *const x_buf, /*!< OUT: pointer to X axis buffer */
h5_int32_t *const y_buf, /*!< OUT: pointer to Y axis buffer */
h5_int32_t *const z_buf /*!< OUT: pointer to Z axis buffer */
) {
H5_API_ENTER5 (h5_err_t, "f=0x%p, name=\"%s\", x_buf=0x%p, y_buf=0x%p, z_buf=0x%p",
f, name, x_buf, y_buf, z_buf);
f, name, x_buf, y_buf, z_buf);
H5_API_RETURN(h5b_read_vector3d_data(f, name,
(void*)x_buf, (void*)y_buf, (void*)z_buf, H5T_NATIVE_INT32));
x_buf, y_buf, z_buf, H5T_NATIVE_INT32));
}
/*!
@@ -429,13 +430,13 @@ H5BlockWriteFieldAttribFloat64 (
H5_API_ENTER5 (h5_err_t, "f=0x%p, field_name=\"%s\", attrib_name=\"%s\", "
"buffer=0x%p, nelems=%lld",
f, field_name, attrib_name, buffer, (long long)nelems);
H5_API_RETURN(h5_write_field_attrib (
f,
field_name,
attrib_name,
H5T_NATIVE_DOUBLE,
buffer,
nelems ));
H5_API_RETURN (h5_write_field_attrib (
f,
field_name,
attrib_name,
H5T_NATIVE_DOUBLE,
buffer,
nelems ));
}
/*!
@@ -456,12 +457,12 @@ H5BlockReadFieldAttribFloat64 (
H5_API_ENTER4 (h5_err_t, "f=%p, field_name=\"%s\", attrib_name=\"%s\", buffer=0x%p",
f, field_name, attrib_name, buffer);
H5_API_RETURN(h5_read_field_attrib (
f,
field_name,
attrib_name,
H5T_NATIVE_DOUBLE,
(void*)buffer ));
H5_API_RETURN (h5_read_field_attrib (
f,
field_name,
attrib_name,
H5T_NATIVE_DOUBLE,
(void*)buffer ));
}
/*!
@@ -484,13 +485,13 @@ H5BlockWriteFieldAttribFloat32 (
H5_API_ENTER5 (h5_err_t, "f=0x%p, field_name=\"%s\", attrib_name=\"%s\", "
"buffer=0x%p, nelems=%lld",
f, field_name, attrib_name, buffer, (long long)nelems);
H5_API_RETURN(h5_write_field_attrib (
f,
field_name,
attrib_name,
H5T_NATIVE_FLOAT,
buffer,
nelems ));
H5_API_RETURN (h5_write_field_attrib (
f,
field_name,
attrib_name,
H5T_NATIVE_FLOAT,
buffer,
nelems ));
}
/*!
@@ -506,17 +507,17 @@ H5BlockReadFieldAttribFloat32 (
h5_file_t *const f, /*!< IN: file handle */
const char *field_name, /*!< IN: field name */
const char *attrib_name, /*!< IN: attribute name */
h5_float32_t *buffer /*!< OUT: attribute values */
h5_float32_t *const buffer /*!< OUT: attribute values */
) {
H5_API_ENTER4 (h5_err_t, "f=%p, field_name=\"%s\", attrib_name=\"%s\", buffer=0x%p",
f, field_name, attrib_name, buffer);
H5_API_RETURN(h5_read_field_attrib (
f,
field_name,
attrib_name,
H5T_NATIVE_FLOAT,
(void*)buffer ));
H5_API_RETURN (h5_read_field_attrib (
f,
field_name,
attrib_name,
H5T_NATIVE_FLOAT,
buffer ));
}
/*!
@@ -561,17 +562,17 @@ H5BlockReadFieldAttribInt64 (
h5_file_t *const f, /*!< IN: file handle */
const char *field_name, /*!< IN: field name */
const char *attrib_name, /*!< IN: attribute name */
h5_int64_t *buffer /*!< OUT: attribute values */
h5_int64_t *const buffer /*!< OUT: attribute values */
) {
H5_API_ENTER4 (h5_err_t, "f=%p, field_name=\"%s\", attrib_name=\"%s\", buffer=0x%p",
f, field_name, attrib_name, buffer);
H5_API_RETURN(h5_read_field_attrib (
f,
field_name,
attrib_name,
H5T_NATIVE_INT64,
(void*)buffer ));
f, field_name, attrib_name, buffer);
H5_API_RETURN (h5_read_field_attrib (
f,
field_name,
attrib_name,
H5T_NATIVE_INT64,
buffer ));
}
/*!
@@ -594,13 +595,13 @@ H5BlockWriteFieldAttribInt32 (
H5_API_ENTER5 (h5_err_t, "f=0x%p, field_name=\"%s\", attrib_name=\"%s\", "
"buffer=0x%p, nelems=%lld",
f, field_name, attrib_name, buffer, (long long)nelems);
H5_API_RETURN(h5_write_field_attrib (
f,
field_name,
attrib_name,
H5T_NATIVE_INT32,
buffer,
nelems ));
H5_API_RETURN (h5_write_field_attrib (
f,
field_name,
attrib_name,
H5T_NATIVE_INT32,
buffer,
nelems ));
}
/*!
@@ -620,11 +621,11 @@ H5BlockReadFieldAttribInt32 (
) {
H5_API_ENTER4 (h5_err_t, "f=%p, field_name=\"%s\", attrib_name=\"%s\", buffer=0x%p",
f, field_name, attrib_name, buffer);
H5_API_RETURN(h5_read_field_attrib (
f,
field_name,
attrib_name,
H5T_NATIVE_INT32,
(void*)buffer ));
f, field_name, attrib_name, buffer);
H5_API_RETURN (h5_read_field_attrib (
f,
field_name,
attrib_name,
H5T_NATIVE_INT32,
(void*)buffer ));
}
src/C/H5Part.c
+7 -6
View File
@@ -388,11 +388,11 @@ H5PartGetDatasetName (
) {
H5_API_ENTER4 (h5_err_t,
"f=0x%p, "
"idx=%llu, "
"idx=%lld, "
"name=\"%s\", len=%llu, ",
f,
(long long)idx,
name, (long long)len);
idx,
name, len);
H5_API_RETURN (h5u_get_dataset_info(f, idx, name, len, NULL, NULL));
}
@@ -423,14 +423,15 @@ H5PartGetDatasetInfo (
) {
H5_API_ENTER6 (h5_int64_t,
"f=0x%p, "
"idx=%llu, "
"idx=%lld, "
"dataset_name=\"%s\", len_dataset_name=%llu, "
"type=0x%p, nelem=0x%p",
f,
(long long)idx,
dataset_name, (long long)len_dataset_name,
dataset_name, (long long unsigned)len_dataset_name,
type, nelem);
H5_API_RETURN (h5u_get_dataset_info(f, idx, dataset_name, len_dataset_name, type, nelem));
H5_API_RETURN (h5u_get_dataset_info (
f, idx, dataset_name, len_dataset_name, type, nelem));
}
/*!
src/C/H5_attribs.c
+2 -2
View File
@@ -730,9 +730,9 @@ H5GetStepAttribInfo (
"attrib_idx=%llu, attrib_name=%p, len_attrib_name=%llu, "
"attrib_type=%p, attrib_nelem=%p",
f,
(long long)attrib_idx,
attrib_idx,
attrib_name,
(long long)len_of_attrib_name,
len_of_attrib_name,
attrib_type,
attrib_nelem);
H5_API_RETURN (h5_get_attrib_info (
src/h5core/h5_hsearch.c
+1 -1
View File
@@ -201,7 +201,7 @@ h5priv_hsearch (
) {
H5_PRIV_API_ENTER4 (h5_err_t,
"item=0x%p, action=%d, retval=0x%p, htab=0x%p",
item, action, retval, htab);
item, (int)action, retval, htab);
unsigned int hval;
unsigned int idx;
src/h5core/h5_maps.c
+1 -1
View File
@@ -214,7 +214,7 @@ h5priv_search_idxmap (
h5_glb_idx_t value
) {
H5_PRIV_API_ENTER2 (h5_err_t,
"map=0x%p, value=%llu",
"map=0x%p, value=%lld",
map, (long long)value);
register h5_loc_idx_t low = 0;
register h5_loc_idx_t high = map->num_items - 1;
src/h5core/h5t_adjacencies.c
+2 -2
View File
@@ -51,8 +51,8 @@ h5t_find_te2 (
H5_CORE_API_ENTER4 (h5_err_t,
"f=0x%p, face_idx=%lld, elem_idx=%lld, retval=0x%p",
f,
(long long unsigned)face_idx,
(long long unsigned)elem_idx,
(long long)face_idx,
(long long)elem_idx,
retval);
H5_CORE_API_RETURN (h5tpriv_find_te2 (f,face_idx,elem_idx,retval));
}
src/h5core/h5t_store.c
+4 -1
View File
@@ -125,7 +125,7 @@ h5t_store_vertex (
H5_CORE_API_ENTER3 (h5_loc_idx_t,
"f=0x%p, glb=id=%lld, P=0x%p",
f,
(long long unsigned)glb_id,
(long long)glb_id,
P);
h5t_fdata_t* const t = f->t;
@@ -349,6 +349,8 @@ h5t_end_refine_elems (
H5_CORE_API_RETURN (H5_SUCCESS);
}
#if 0
// index set for DUNE
h5_err_t
h5t_create_index_set (
h5_file_t* const f
@@ -370,3 +372,4 @@ h5t_create_index_set (
}
H5_CORE_API_RETURN (H5_SUCCESS);
}
#endif
src/h5core/h5u_model.c
+3 -3
View File
@@ -427,13 +427,13 @@ h5u_get_dataset_info (
h5_int64_t *type, /*!< [out] Type of data in dataset */
h5_size_t *nelem /*!< [out] Number of elements. */
) {
H5_CORE_API_ENTER6 (h5_int64_t,
H5_CORE_API_ENTER6 (h5_err_t,
"f=0x%p, "
"idx=%llu, "
"idx=%lld, "
"dataset_name=\"%s\", len_dataset_name=%llu, "
"type=0x%p, nelem=0x%p",
f,
(long long unsigned)idx,
(long long)idx,
dataset_name,
(long long unsigned)len_dataset_name,
type, nelem);