mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-19 16:50:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r10628] Purpose:

Browse Source 
Code cleanup

Description:
    Clean up various warnings reported by the Windows team.

Platforms tested:
    FreeBSD 4.11 (sleipnir)
    Too minor to require h5committest
This commit is contained in:
Quincey Koziol 2005-04-18 16:21:35 -05:00
parent d8b08dbc85
commit af6276f654
29 changed files with 114 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
c++/src/H5DataType.cpp
View File

@ -95,13 +95,13 @@ DataType::DataType(const DataType& original) : H5Object(original)
///\exception H5::DataTypeIException
// Programmer Binh-Minh Ribler - 2000
// Modification
// Replaced resetIdComponent with decRefCount to use new ID
// reference counting mechanisms by Quincey Koziol, June 1, 2004
// Replaced resetIdComponent with decRefCount to use C library
// ID reference counting mechanism - BMR, Feb 20, 2005
//--------------------------------------------------------------------------
void DataType::copy( const DataType& like_type )
{
// reset the identifier of this instance, H5Tclose will be called
// if needed
// reset the identifier of this instance, H5Tclose will be called
// if needed
if( is_predtype == false ) {
try {
decRefCount();
@ -249,7 +249,7 @@ H5T_conv_t DataType::find( const DataType& dest, H5T_cdata_t **pcdata ) const
///\exception H5::DataTypeIException
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
void DataType::convert( const DataType& dest, hsize_t nelmts, void *buf, void *background, PropList& plist ) const
void DataType::convert( const DataType& dest, size_t nelmts, void *buf, void *background, PropList& plist ) const
{
// Get identifiers for C API
hid_t dest_id = dest.getId();
@ -625,8 +625,8 @@ void DataType::close()
///\brief Properly terminates access to this datatype.
// Programmer Binh-Minh Ribler - 2000
// Modification
// Replaced resetIdComponent with decRefCount to use new ID
// reference counting mechanisms by Quincey Koziol, June 1, 2004
// Replaced resetIdComponent with decRefCount to use C library
// ID reference counting mechanism - BMR, Feb 20, 2005
//--------------------------------------------------------------------------
DataType::~DataType()
{

2
c++/src/H5DataType.h
View File

@ -51,7 +51,7 @@ class H5_DLLCPP DataType : public H5Object {
H5T_conv_t find( const DataType& dest, H5T_cdata_t **pcdata ) const;
// Converts data from between specified datatypes.
void convert( const DataType& dest, hsize_t nelmts, void *buf, void *background, PropList& plist ) const;
void convert( const DataType& dest, size_t nelmts, void *buf, void *background, PropList& plist ) const;
// Assignment operator
DataType& operator=( const DataType& rhs );

4
hl/src/H5TB.c
View File

@ -305,12 +305,8 @@ herr_t H5TBappend_records( hid_t loc_id,
hid_t did;
hid_t tid=-1;
hid_t mem_type_id=-1;
hsize_t count[1];
hsize_t offset[1];
hid_t sid=-1;
hid_t mem_space_id=-1;
hsize_t dims[1];
hsize_t mem_dims[1];
hsize_t nrecords_orig;
hsize_t nfields;

7
src/H5B2.c
View File

@ -320,7 +320,8 @@ H5B2_create(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type,
bt2->cache_info.is_dirty = TRUE;
bt2->depth = 0;
bt2->root.addr = HADDR_UNDEF;
bt2->root.node_nrec = bt2->root.all_nrec = 0;
bt2->root.node_nrec = 0;
bt2->root.all_nrec = 0;
/* Initialize shared B-tree info */
if(H5B2_shared_init(f, bt2, type, node_size, rrec_size, split_percent, merge_percent)<0)
@ -532,8 +533,8 @@ H5B2_split_root(H5F_t *f, hid_t dxpl_id, H5B2_t *bt2, H5RC_t *bt2_shared)
/* Determine total number of records in new child nodes */
if(bt2->depth>0) {
unsigned u; /* Local index variable */
unsigned new_left_all_nrec; /* New total number of records in left child */
unsigned new_right_all_nrec; /* New total number of records in right child */
hsize_t new_left_all_nrec; /* New total number of records in left child */
hsize_t new_right_all_nrec; /* New total number of records in right child */
/* Compute total of all records in each child node */
new_left_all_nrec = new_root->node_ptrs[0].node_nrec;

2
src/H5B2test.c
View File

@ -125,7 +125,7 @@ H5B2_test_compare(const void *rec1, const void *rec2)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_test_compare)
FUNC_LEAVE_NOAPI(*(const hssize_t *)rec1-*(const hssize_t *)rec2);
FUNC_LEAVE_NOAPI((herr_t)(*(const hssize_t *)rec1-*(const hssize_t *)rec2));
} /* H5B2_test_compare() */

4
src/H5Dmpio.c
View File

@ -578,7 +578,7 @@ H5D_mpio_spaces_write(H5D_io_info_t *io_info,
* Function: H5D_mpio_spaces_span_read
*
* Purpose: MPI-IO function to read directly from app buffer to file for
span-tree
span-tree
*
* Return: non-negative on success, negative on failure.
*
@ -641,9 +641,7 @@ H5D_mpio_spaces_span_write(H5D_io_info_t *io_info,
FUNC_ENTER_NOAPI_NOFUNC(H5D_mpio_spaces_span_write);
fflush(stdout);
/*OKAY: CAST DISCARDS CONST QUALIFIER*/
ret_value = H5D_mpio_spaces_span_xfer(io_info, elmt_size, file_space,
mem_space, (void*)buf, 1/*write*/);

4
src/H5FD.c
View File

@ -2883,7 +2883,7 @@ done:
*-------------------------------------------------------------------------
*/
haddr_t
H5FD_get_eoa(H5FD_t *file)
H5FD_get_eoa(const H5FD_t *file)
{
haddr_t ret_value;
@ -3048,7 +3048,7 @@ done:
*-------------------------------------------------------------------------
*/
haddr_t
H5FD_get_eof(H5FD_t *file)
H5FD_get_eof(const H5FD_t *file)
{
haddr_t ret_value;

12
src/H5FDcore.c
View File

@ -89,9 +89,9 @@ static H5FD_t *H5FD_core_open(const char *name, unsigned flags, hid_t fapl_id,
haddr_t maxaddr);
static herr_t H5FD_core_close(H5FD_t *_file);
static int H5FD_core_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
static haddr_t H5FD_core_get_eoa(H5FD_t *_file);
static haddr_t H5FD_core_get_eoa(const H5FD_t *_file);
static herr_t H5FD_core_set_eoa(H5FD_t *_file, haddr_t addr);
static haddr_t H5FD_core_get_eof(H5FD_t *_file);
static haddr_t H5FD_core_get_eof(const H5FD_t *_file);
static herr_t H5FD_core_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle);
static herr_t H5FD_core_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
size_t size, void *buf);
@ -531,11 +531,11 @@ done:
*-------------------------------------------------------------------------
*/
static haddr_t
H5FD_core_get_eoa(H5FD_t *_file)
H5FD_core_get_eoa(const H5FD_t *_file)
{
haddr_t ret_value; /* Return value */
H5FD_core_t *file = (H5FD_core_t*)_file;
const H5FD_core_t *file = (const H5FD_core_t*)_file;
FUNC_ENTER_NOAPI(H5FD_core_get_eoa, HADDR_UNDEF)
@ -604,11 +604,11 @@ done:
*-------------------------------------------------------------------------
*/
static haddr_t
H5FD_core_get_eof(H5FD_t *_file)
H5FD_core_get_eof(const H5FD_t *_file)
{
haddr_t ret_value; /* Return value */
H5FD_core_t *file = (H5FD_core_t*)_file;
const H5FD_core_t *file = (const H5FD_core_t*)_file;
FUNC_ENTER_NOAPI(H5FD_core_get_eof, HADDR_UNDEF)

12
src/H5FDfamily.c
View File

@ -89,9 +89,9 @@ static H5FD_t *H5FD_family_open(const char *name, unsigned flags,
static herr_t H5FD_family_close(H5FD_t *_file);
static int H5FD_family_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
static herr_t H5FD_family_query(const H5FD_t *_f1, unsigned long *flags);
static haddr_t H5FD_family_get_eoa(H5FD_t *_file);
static haddr_t H5FD_family_get_eoa(const H5FD_t *_file);
static herr_t H5FD_family_set_eoa(H5FD_t *_file, haddr_t eoa);
static haddr_t H5FD_family_get_eof(H5FD_t *_file);
static haddr_t H5FD_family_get_eof(const H5FD_t *_file);
static herr_t H5FD_family_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle);
static herr_t H5FD_family_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
size_t size, void *_buf/*out*/);
@ -862,9 +862,9 @@ done:
*-------------------------------------------------------------------------
*/
static haddr_t
H5FD_family_get_eoa(H5FD_t *_file)
H5FD_family_get_eoa(const H5FD_t *_file)
{
H5FD_family_t *file = (H5FD_family_t*)_file;
const H5FD_family_t *file = (const H5FD_family_t*)_file;
haddr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_family_get_eoa, HADDR_UNDEF)
@ -970,9 +970,9 @@ done:
*-------------------------------------------------------------------------
*/
static haddr_t
H5FD_family_get_eof(H5FD_t *_file)
H5FD_family_get_eof(const H5FD_t *_file)
{
H5FD_family_t *file = (H5FD_family_t*)_file;
const H5FD_family_t *file = (const H5FD_family_t*)_file;
haddr_t eof=0;
int i; /* Local index variable */
haddr_t ret_value; /* Return value */

16
src/H5FDfphdf5.c
View File

@ -51,9 +51,9 @@ static H5FD_t *H5FD_fphdf5_open(const char *name, unsigned flags,
hid_t fapl_id, haddr_t maxaddr);
static herr_t H5FD_fphdf5_close(H5FD_t *_file);
static herr_t H5FD_fphdf5_query(const H5FD_t *_f1, unsigned long *flags);
static haddr_t H5FD_fphdf5_get_eoa(H5FD_t *_file);
static haddr_t H5FD_fphdf5_get_eoa(const H5FD_t *_file);
static herr_t H5FD_fphdf5_set_eoa(H5FD_t *_file, haddr_t addr);
static haddr_t H5FD_fphdf5_get_eof(H5FD_t *_file);
static haddr_t H5FD_fphdf5_get_eof(const H5FD_t *_file);
static herr_t H5FD_fphdf5_get_handle(H5FD_t *_file, hid_t fapl,
void **file_handle);
static herr_t H5FD_fphdf5_read(H5FD_t *_file, H5FD_mem_t mem_type, hid_t dxpl_id,
@ -359,9 +359,9 @@ done:
*-------------------------------------------------------------------------
*/
hbool_t
H5FD_fphdf5_is_sap(H5FD_t *_file)
H5FD_fphdf5_is_sap(const H5FD_t *_file)
{
H5FD_fphdf5_t *file = (H5FD_fphdf5_t*)_file;
const H5FD_fphdf5_t *file = (const H5FD_fphdf5_t*)_file;
hbool_t ret_value = FALSE;
FUNC_ENTER_NOAPI(H5FD_fphdf5_is_sap, FALSE)
@ -834,9 +834,9 @@ done:
*-------------------------------------------------------------------------
*/
static haddr_t
H5FD_fphdf5_get_eoa(H5FD_t *_file)
H5FD_fphdf5_get_eoa(const H5FD_t *_file)
{
H5FD_fphdf5_t *file = (H5FD_fphdf5_t *)_file;
const H5FD_fphdf5_t *file = (const H5FD_fphdf5_t *)_file;
unsigned req_id = 0;
H5FP_status_t status = H5FP_STATUS_OK;
haddr_t ret_value;
@ -921,9 +921,9 @@ done:
*-------------------------------------------------------------------------
*/
static haddr_t
H5FD_fphdf5_get_eof(H5FD_t *_file)
H5FD_fphdf5_get_eof(const H5FD_t *_file)
{
H5FD_fphdf5_t *file = (H5FD_fphdf5_t*)_file;
const H5FD_fphdf5_t *file = (const H5FD_fphdf5_t*)_file;
haddr_t ret_value;
FUNC_ENTER_NOAPI(H5FD_fphdf5_get_eof, HADDR_UNDEF)

2
src/H5FDfphdf5.h
View File

@ -104,7 +104,7 @@ struct H5P_genplist_t;
H5_DLL hid_t H5FD_fphdf5_init(void);
H5_DLL void H5FD_fphdf5_term(void);
H5_DLL unsigned H5FD_fphdf5_file_id(H5FD_t *_file);
H5_DLL hbool_t H5FD_fphdf5_is_sap(H5FD_t *_file);
H5_DLL hbool_t H5FD_fphdf5_is_sap(const H5FD_t *_file);
H5_DLL hbool_t H5FD_fphdf5_is_captain(H5FD_t *_file);
H5_DLL hbool_t H5FD_is_fphdf5_driver(H5FD_t *_file);

12
src/H5FDlog.c
View File

@ -181,9 +181,9 @@ static herr_t H5FD_log_close(H5FD_t *_file);
static int H5FD_log_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
static herr_t H5FD_log_query(const H5FD_t *_f1, unsigned long *flags);
static haddr_t H5FD_log_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size);
static haddr_t H5FD_log_get_eoa(H5FD_t *_file);
static haddr_t H5FD_log_get_eoa(const H5FD_t *_file);
static herr_t H5FD_log_set_eoa(H5FD_t *_file, haddr_t addr);
static haddr_t H5FD_log_get_eof(H5FD_t *_file);
static haddr_t H5FD_log_get_eof(const H5FD_t *_file);
static herr_t H5FD_log_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle);
static herr_t H5FD_log_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
size_t size, void *buf);
@ -890,9 +890,9 @@ done:
*-------------------------------------------------------------------------
*/
static haddr_t
H5FD_log_get_eoa(H5FD_t *_file)
H5FD_log_get_eoa(const H5FD_t *_file)
{
H5FD_log_t *file = (H5FD_log_t*)_file;
const H5FD_log_t *file = (const H5FD_log_t*)_file;
haddr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_log_get_eoa, HADDR_UNDEF)
@ -959,9 +959,9 @@ done:
*-------------------------------------------------------------------------
*/
static haddr_t
H5FD_log_get_eof(H5FD_t *_file)
H5FD_log_get_eof(const H5FD_t *_file)
{
H5FD_log_t *file = (H5FD_log_t*)_file;
const H5FD_log_t *file = (const H5FD_log_t*)_file;
haddr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_log_get_eof, HADDR_UNDEF)

12
src/H5FDmpio.c
View File

@ -72,9 +72,9 @@ static H5FD_t *H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id,
haddr_t maxaddr);
static herr_t H5FD_mpio_close(H5FD_t *_file);
static herr_t H5FD_mpio_query(const H5FD_t *_f1, unsigned long *flags);
static haddr_t H5FD_mpio_get_eoa(H5FD_t *_file);
static haddr_t H5FD_mpio_get_eoa(const H5FD_t *_file);
static herr_t H5FD_mpio_set_eoa(H5FD_t *_file, haddr_t addr);
static haddr_t H5FD_mpio_get_eof(H5FD_t *_file);
static haddr_t H5FD_mpio_get_eof(const H5FD_t *_file);
static herr_t H5FD_mpio_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle);
static herr_t H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
size_t size, void *buf);
@ -983,9 +983,9 @@ done:
*-------------------------------------------------------------------------
*/
static haddr_t
H5FD_mpio_get_eoa(H5FD_t *_file)
H5FD_mpio_get_eoa(const H5FD_t *_file)
{
H5FD_mpio_t *file = (H5FD_mpio_t*)_file;
const H5FD_mpio_t *file = (const H5FD_mpio_t*)_file;
haddr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpio_get_eoa, HADDR_UNDEF)
@ -1067,9 +1067,9 @@ done:
*-------------------------------------------------------------------------
*/
static haddr_t
H5FD_mpio_get_eof(H5FD_t *_file)
H5FD_mpio_get_eof(const H5FD_t *_file)
{
H5FD_mpio_t *file = (H5FD_mpio_t*)_file;
const H5FD_mpio_t *file = (const H5FD_mpio_t*)_file;
haddr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpio_get_eof, HADDR_UNDEF)

12
src/H5FDmpiposix.c
View File

@ -180,9 +180,9 @@ static H5FD_t *H5FD_mpiposix_open(const char *name, unsigned flags, hid_t fapl_i
static herr_t H5FD_mpiposix_close(H5FD_t *_file);
static int H5FD_mpiposix_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
static herr_t H5FD_mpiposix_query(const H5FD_t *_f1, unsigned long *flags);
static haddr_t H5FD_mpiposix_get_eoa(H5FD_t *_file);
static haddr_t H5FD_mpiposix_get_eoa(const H5FD_t *_file);
static herr_t H5FD_mpiposix_set_eoa(H5FD_t *_file, haddr_t addr);
static haddr_t H5FD_mpiposix_get_eof(H5FD_t *_file);
static haddr_t H5FD_mpiposix_get_eof(const H5FD_t *_file);
static herr_t H5FD_mpiposix_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle);
static herr_t H5FD_mpiposix_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
size_t size, void *buf);
@ -952,9 +952,9 @@ done:
*-------------------------------------------------------------------------
*/
static haddr_t
H5FD_mpiposix_get_eoa(H5FD_t *_file)
H5FD_mpiposix_get_eoa(const H5FD_t *_file)
{
H5FD_mpiposix_t *file = (H5FD_mpiposix_t*)_file;
const H5FD_mpiposix_t *file = (const H5FD_mpiposix_t*)_file;
haddr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpiposix_get_eoa, HADDR_UNDEF)
@ -1028,9 +1028,9 @@ done:
*-------------------------------------------------------------------------
*/
static haddr_t
H5FD_mpiposix_get_eof(H5FD_t *_file)
H5FD_mpiposix_get_eof(const H5FD_t *_file)
{
H5FD_mpiposix_t *file = (H5FD_mpiposix_t*)_file;
const H5FD_mpiposix_t *file = (const H5FD_mpiposix_t*)_file;
haddr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpiposix_get_eof, HADDR_UNDEF)

31
src/H5FDmulti.c
View File

@ -137,9 +137,9 @@ static H5FD_t *H5FD_multi_open(const char *name, unsigned flags,
static herr_t H5FD_multi_close(H5FD_t *_file);
static int H5FD_multi_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
static herr_t H5FD_multi_query(const H5FD_t *_f1, unsigned long *flags);
static haddr_t H5FD_multi_get_eoa(H5FD_t *_file);
static haddr_t H5FD_multi_get_eoa(const H5FD_t *_file);
static herr_t H5FD_multi_set_eoa(H5FD_t *_file, haddr_t eoa);
static haddr_t H5FD_multi_get_eof(H5FD_t *_file);
static haddr_t H5FD_multi_get_eof(const H5FD_t *_file);
static herr_t H5FD_multi_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle);
static haddr_t H5FD_multi_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size);
static herr_t H5FD_multi_free(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
@ -292,7 +292,7 @@ herr_t
H5Pset_fapl_split(hid_t fapl, const char *meta_ext, hid_t meta_plist_id,
const char *raw_ext, hid_t raw_plist_id)
{
H5FD_mem_t mt, memb_map[H5FD_MEM_NTYPES];
H5FD_mem_t memb_map[H5FD_MEM_NTYPES];
hid_t memb_fapl[H5FD_MEM_NTYPES];
const char *memb_name[H5FD_MEM_NTYPES];
char meta_name[1024], raw_name[1024];
@ -304,12 +304,12 @@ H5Pset_fapl_split(hid_t fapl, const char *meta_ext, hid_t meta_plist_id,
H5Eclear_stack(H5E_DEFAULT);
/* Initialize */
for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt=(H5FD_mem_t)(mt+1)) {
ALL_MEMBERS(mt) {
memb_map[mt] = (H5FD_MEM_DRAW==mt?mt:H5FD_MEM_SUPER);
memb_fapl[mt] = -1;
memb_name[mt] = NULL;
memb_addr[mt] = HADDR_UNDEF;
}
} END_MEMBERS;
/* The file access properties */
memb_fapl[H5FD_MEM_SUPER] = meta_plist_id;
@ -1024,7 +1024,6 @@ H5FD_multi_fapl_copy(const void *_old_fa)
{
const H5FD_multi_fapl_t *old_fa = (const H5FD_multi_fapl_t*)_old_fa;
H5FD_multi_fapl_t *new_fa = malloc(sizeof(H5FD_multi_fapl_t));
H5FD_mem_t mt;
int nerrors = 0;
static const char *func="H5FD_multi_fapl_copy"; /* Function Name for error reporting */
@ -1078,7 +1077,6 @@ static herr_t
H5FD_multi_fapl_free(void *_fa)
{
H5FD_multi_fapl_t *fa = (H5FD_multi_fapl_t*)_fa;
H5FD_mem_t mt;
static const char *func="H5FD_multi_fapl_free"; /* Function Name for error reporting */
/* Clear the error stack */
@ -1118,7 +1116,6 @@ H5FD_multi_dxpl_copy(const void *_old_dx)
{
const H5FD_multi_dxpl_t *old_dx = (const H5FD_multi_dxpl_t*)_old_dx;
H5FD_multi_dxpl_t *new_dx = malloc(sizeof(H5FD_multi_dxpl_t));
H5FD_mem_t mt;
int nerrors = 0;
static const char *func="H5FD_multi_dxpl_copy"; /* Function Name for error reporting */
@ -1166,7 +1163,6 @@ static herr_t
H5FD_multi_dxpl_free(void *_dx)
{
H5FD_multi_dxpl_t *dx = (H5FD_multi_dxpl_t*)_dx;
H5FD_mem_t mt;
static const char *func="H5FD_multi_dxpl_free"; /* Function Name for error reporting */
/* Clear the error stack */
@ -1369,23 +1365,24 @@ H5FD_multi_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
{
const H5FD_multi_t *f1 = (const H5FD_multi_t*)_f1;
const H5FD_multi_t *f2 = (const H5FD_multi_t*)_f2;
H5FD_mem_t mt;
H5FD_mem_t out_mt = H5FD_MEM_DEFAULT;
int cmp=0;
/* Clear the error stack */
H5Eclear_stack(H5E_DEFAULT);
ALL_MEMBERS(mt) {
out_mt = mt;
if (f1->memb[mt] && f2->memb[mt]) break;
if (!cmp) {
if (f1->memb[mt]) cmp = -1;
else if (f2->memb[mt]) cmp = 1;
}
} END_MEMBERS;
assert(cmp || mt<H5FD_MEM_NTYPES);
if (mt>=H5FD_MEM_NTYPES) return cmp;
assert(cmp || out_mt<H5FD_MEM_NTYPES);
if (out_mt>=H5FD_MEM_NTYPES) return cmp;
return H5FDcmp(f1->memb[mt], f2->memb[mt]);
return H5FDcmp(f1->memb[out_mt], f2->memb[out_mt]);
}
@ -1442,9 +1439,9 @@ H5FD_multi_query(const H5FD_t *_f, unsigned long *flags /* out */)
*-------------------------------------------------------------------------
*/
static haddr_t
H5FD_multi_get_eoa(H5FD_t *_file)
H5FD_multi_get_eoa(const H5FD_t *_file)
{
H5FD_multi_t *file = (H5FD_multi_t*)_file;
const H5FD_multi_t *file = (const H5FD_multi_t*)_file;
/* Clear the error stack */
H5Eclear_stack(H5E_DEFAULT);
@ -1530,9 +1527,9 @@ H5FD_multi_set_eoa(H5FD_t *_file, haddr_t eoa)
*-------------------------------------------------------------------------
*/
static haddr_t
H5FD_multi_get_eof(H5FD_t *_file)
H5FD_multi_get_eof(const H5FD_t *_file)
{
H5FD_multi_t *file = (H5FD_multi_t*)_file;
const H5FD_multi_t *file = (const H5FD_multi_t*)_file;
haddr_t eof=0, tmp;
static const char *func="H5FD_multi_eof"; /* Function Name for error reporting */

4
src/H5FDprivate.h
View File

@ -59,9 +59,9 @@ H5_DLL haddr_t H5FD_alloc(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t
H5_DLL herr_t H5FD_free(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsize_t size);
H5_DLL haddr_t H5FD_realloc(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t old_addr,
hsize_t old_size, hsize_t new_size);
H5_DLL haddr_t H5FD_get_eoa(H5FD_t *file);
H5_DLL haddr_t H5FD_get_eoa(const H5FD_t *file);
H5_DLL herr_t H5FD_set_eoa(H5FD_t *file, haddr_t addr);
H5_DLL haddr_t H5FD_get_eof(H5FD_t *file);
H5_DLL haddr_t H5FD_get_eof(const H5FD_t *file);
H5_DLL herr_t H5FD_read(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,
void *buf/*out*/);
H5_DLL herr_t H5FD_write(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,

4
src/H5FDpublic.h
View File

@ -168,9 +168,9 @@ typedef struct H5FD_class_t {
haddr_t (*alloc)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size);
herr_t (*free)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id,
haddr_t addr, hsize_t size);
haddr_t (*get_eoa)(H5FD_t *file);
haddr_t (*get_eoa)(const H5FD_t *file);
herr_t (*set_eoa)(H5FD_t *file, haddr_t addr);
haddr_t (*get_eof)(H5FD_t *file);
haddr_t (*get_eof)(const H5FD_t *file);
herr_t (*get_handle)(H5FD_t *file, hid_t fapl, void**file_handle);
herr_t (*read)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl,
haddr_t addr, size_t size, void *buffer);

12
src/H5FDsec2.c
View File

@ -145,9 +145,9 @@ static H5FD_t *H5FD_sec2_open(const char *name, unsigned flags, hid_t fapl_id,
static herr_t H5FD_sec2_close(H5FD_t *_file);
static int H5FD_sec2_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
static herr_t H5FD_sec2_query(const H5FD_t *_f1, unsigned long *flags);
static haddr_t H5FD_sec2_get_eoa(H5FD_t *_file);
static haddr_t H5FD_sec2_get_eoa(const H5FD_t *_file);
static herr_t H5FD_sec2_set_eoa(H5FD_t *_file, haddr_t addr);
static haddr_t H5FD_sec2_get_eof(H5FD_t *_file);
static haddr_t H5FD_sec2_get_eof(const H5FD_t *_file);
static herr_t H5FD_sec2_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle);
static herr_t H5FD_sec2_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
size_t size, void *buf);
@ -546,9 +546,9 @@ done:
*-------------------------------------------------------------------------
*/
static haddr_t
H5FD_sec2_get_eoa(H5FD_t *_file)
H5FD_sec2_get_eoa(const H5FD_t *_file)
{
H5FD_sec2_t *file = (H5FD_sec2_t*)_file;
const H5FD_sec2_t *file = (const H5FD_sec2_t*)_file;
haddr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_sec2_get_eoa, HADDR_UNDEF)
@ -615,9 +615,9 @@ done:
*-------------------------------------------------------------------------
*/
static haddr_t
H5FD_sec2_get_eof(H5FD_t *_file)
H5FD_sec2_get_eof(const H5FD_t *_file)
{
H5FD_sec2_t *file = (H5FD_sec2_t*)_file;
const H5FD_sec2_t *file = (const H5FD_sec2_t*)_file;
haddr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_sec2_get_eof, HADDR_UNDEF)

12
src/H5FDstdio.c
View File

@ -152,9 +152,9 @@ static H5FD_t *H5FD_stdio_open(const char *name, unsigned flags,
static herr_t H5FD_stdio_close(H5FD_t *lf);
static int H5FD_stdio_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
static herr_t H5FD_stdio_query(const H5FD_t *_f1, unsigned long *flags);
static haddr_t H5FD_stdio_get_eoa(H5FD_t *_file);
static haddr_t H5FD_stdio_get_eoa(const H5FD_t *_file);
static herr_t H5FD_stdio_set_eoa(H5FD_t *_file, haddr_t addr);
static haddr_t H5FD_stdio_get_eof(H5FD_t *_file);
static haddr_t H5FD_stdio_get_eof(const H5FD_t *_file);
static herr_t H5FD_stdio_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle);
static herr_t H5FD_stdio_read(H5FD_t *lf, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
size_t size, void *buf);
@ -543,9 +543,9 @@ H5FD_stdio_query(const H5FD_t *_f, unsigned long *flags /* out */)
*-------------------------------------------------------------------------
*/
static haddr_t
H5FD_stdio_get_eoa(H5FD_t *_file)
H5FD_stdio_get_eoa(const H5FD_t *_file)
{
H5FD_stdio_t *file = (H5FD_stdio_t*)_file;
const H5FD_stdio_t *file = (const H5FD_stdio_t *)_file;
/* Clear the error stack */
H5Eclear_stack(H5E_DEFAULT);
@ -609,9 +609,9 @@ H5FD_stdio_set_eoa(H5FD_t *_file, haddr_t addr)
*-------------------------------------------------------------------------
*/
static haddr_t
H5FD_stdio_get_eof(H5FD_t *_file)
H5FD_stdio_get_eof(const H5FD_t *_file)
{
H5FD_stdio_t *file = (H5FD_stdio_t*)_file;
const H5FD_stdio_t *file = (const H5FD_stdio_t *)_file;
/* Clear the error stack */
H5Eclear_stack(H5E_DEFAULT);

12
src/H5FDstream.c
View File

@ -157,9 +157,9 @@ static H5FD_t *H5FD_stream_open (const char *name, unsigned flags,
static herr_t H5FD_stream_flush (H5FD_t *_stream, hid_t dxpl_id, unsigned closing);
static herr_t H5FD_stream_close (H5FD_t *_stream);
static herr_t H5FD_stream_query(const H5FD_t *_f1, unsigned long *flags);
static haddr_t H5FD_stream_get_eoa (H5FD_t *_stream);
static haddr_t H5FD_stream_get_eoa (const H5FD_t *_stream);
static herr_t H5FD_stream_set_eoa (H5FD_t *_stream, haddr_t addr);
static haddr_t H5FD_stream_get_eof (H5FD_t *_stream);
static haddr_t H5FD_stream_get_eof (const H5FD_t *_stream);
static herr_t H5FD_stream_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle);
static herr_t H5FD_stream_read (H5FD_t *_stream, H5FD_mem_t type,
hid_t fapl_id, haddr_t addr,
@ -887,9 +887,9 @@ done:
*-------------------------------------------------------------------------
*/
static haddr_t
H5FD_stream_get_eoa (H5FD_t *_stream)
H5FD_stream_get_eoa (const H5FD_t *_stream)
{
H5FD_stream_t *stream = (H5FD_stream_t *) _stream;
const H5FD_stream_t *stream = (const H5FD_stream_t *) _stream;
haddr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_stream_get_eoa, HADDR_UNDEF)
@ -957,9 +957,9 @@ done:
*-------------------------------------------------------------------------
*/
static haddr_t
H5FD_stream_get_eof (H5FD_t *_stream)
H5FD_stream_get_eof (const H5FD_t *_stream)
{
H5FD_stream_t *stream = (H5FD_stream_t *) _stream;
const H5FD_stream_t *stream = (const H5FD_stream_t *) _stream;
haddr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_stream_get_eof, HADDR_UNDEF)

2
src/H5FPclient.c
View File

@ -887,7 +887,7 @@ done:
* Modifications:
*/
herr_t
H5FP_request_get_eoa(H5FD_t *file, haddr_t *eoa, unsigned *req_id, H5FP_status_t *status)
H5FP_request_get_eoa(const H5FD_t *file, haddr_t *eoa, unsigned *req_id, H5FP_status_t *status)
{
H5FP_eoa_t sap_eoa;
H5FP_request_t req;

2
src/H5FPprivate.h
View File

@ -329,7 +329,7 @@ extern haddr_t H5FP_client_alloc(H5FD_t *file, H5FD_mem_t type,
extern herr_t H5FP_request_free(H5FD_t *file, H5FD_mem_t mem_type,
haddr_t addr, hsize_t size,
unsigned *req_id, H5FP_status_t *status);
extern herr_t H5FP_request_get_eoa(H5FD_t *file, haddr_t *eoa, unsigned *req_id,
extern herr_t H5FP_request_get_eoa(const H5FD_t *file, haddr_t *eoa, unsigned *req_id,
H5FP_status_t *status);
extern herr_t H5FP_request_set_eoa(H5FD_t *file, haddr_t eoa, unsigned *req_id,
H5FP_status_t *status);

1
src/H5Pdcpl.c
View File

@ -1283,7 +1283,6 @@ H5Pset_scaleoffset(hid_t plist_id, unsigned min_bits)
H5O_pline_t pline;
H5P_genplist_t *plist; /* Property list pointer */
unsigned cd_values[1]; /* Filter parameters */
unsigned int config_flags;
herr_t ret_value=SUCCEED; /* return value */
FUNC_ENTER_API(H5Pset_scaleoffset, FAIL);

6
src/H5S.c
View File

@ -1730,7 +1730,8 @@ static herr_t
H5S_encode(H5S_t *obj, unsigned char *buf, size_t *nalloc)
{
size_t extent_size;
hssize_t select_size;
hssize_t sselect_size;
size_t select_size;
H5F_t f; /* fake file structure*/
herr_t ret_value = SUCCEED;
@ -1744,8 +1745,9 @@ H5S_encode(H5S_t *obj, unsigned char *buf, size_t *nalloc)
if((extent_size=H5O_raw_size(H5O_SDSPACE_ID, &f, obj))==0)
HGOTO_ERROR(H5E_DATASPACE, H5E_BADSIZE, FAIL, "can't find dataspace size");
if((select_size=H5S_SELECT_SERIAL_SIZE(obj))<0)
if((sselect_size=H5S_SELECT_SERIAL_SIZE(obj))<0)
HGOTO_ERROR(H5E_DATASPACE, H5E_BADSIZE, FAIL, "can't find dataspace selection size");
H5_ASSIGN_OVERFLOW(select_size,sselect_size,hssize_t,size_t);
/* Verify the size of buffer. If it's not big enough, simply return the
* right size without filling the buffer. */

2
src/H5SL.c
View File

@ -573,7 +573,7 @@ H5SL_create(H5SL_type_t type, double p, size_t max_level)
/* Set the static internal fields */
new_slist->type=type;
new_slist->p=p;
new_slist->p1=p*RAND_MAX;
new_slist->p1=(int)(p*RAND_MAX);
new_slist->max_level=max_level;
/* Set the dynamic internal fields */

5
src/H5Zshuffle.c
View File

@ -126,7 +126,10 @@ H5Z_filter_shuffle(unsigned flags, size_t cd_nelmts, const unsigned cd_values[],
unsigned char *_dest=NULL; /* Alias for destination buffer */
unsigned bytesoftype; /* Number of bytes per element */
size_t numofelements; /* Number of elements in buffer */
size_t i,j; /* Local index variables */
size_t i; /* Local index variables */
#ifdef NO_DUFFS_DEVICE
size_t j; /* Local index variable */
#endif /* NO_DUFFS_DEVICE */
size_t leftover; /* Extra bytes at end of buffer */
size_t ret_value; /* Return value */

12
test/dt_atomic.c
View File

@ -1331,7 +1331,7 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
size_t src_size, dst_size; /*type sizes */
unsigned char *buf=NULL; /*buffer for conversion */
unsigned char *saved=NULL; /*original values */
size_t i, j, k; /*counters */
size_t j, k; /*counters */
unsigned char *hw=NULL; /*hardware conv result */
unsigned char src_bits[32]; /*src value in LE order */
unsigned char dst_bits[32]; /*dest value in LE order*/
@ -2066,7 +2066,7 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
/* Print errors */
if (0==fails_this_test++)
H5_FAILED();
printf(" test %u elmt %u\n", (unsigned)i+1, (unsigned)j);
printf(" elmt %u\n", (unsigned)j);
printf(" src = ");
for (k=0; k<src_size; k++)
@ -2397,7 +2397,7 @@ test_conv_flt_1 (const char *name, hbool_t run_special, hid_t src, hid_t dst)
unsigned char *hw=NULL; /*ptr to hardware-conv'd*/
int underflow; /*underflow occurred */
int uflow=0; /*underflow debug counters*/
size_t i, j, k; /*counters */
size_t j, k; /*counters */
int endian; /*machine endianess */
size_t dst_ebias; /* Destination type's exponent bias */
size_t src_epos; /* Source type's exponent position */
@ -2777,7 +2777,7 @@ test_conv_flt_1 (const char *name, hbool_t run_special, hid_t src, hid_t dst)
if (0==fails_this_test++)
H5_FAILED();
printf(" test %u, elmt %u\n", (unsigned)i+1, (unsigned)j);
printf(" elmt %u\n", (unsigned)j);
printf(" src =");
for (k=0; k<src_size; k++)
@ -2912,7 +2912,7 @@ test_conv_int_fp(const char *name, hbool_t run_special, hid_t src, hid_t dst)
size_t src_size, dst_size; /*type sizes */
unsigned char *buf=NULL; /*buffer for conversion */
unsigned char *saved=NULL; /*original values */
size_t i, j, k; /*counters */
size_t j, k; /*counters */
unsigned char *hw=NULL; /*hardware conv result */
unsigned char src_bits[32]; /*src value in LE order */
unsigned char dst_bits[32]; /*dest value in LE order*/
@ -3687,7 +3687,7 @@ test_conv_int_fp(const char *name, hbool_t run_special, hid_t src, hid_t dst)
/* Print errors */
if (0==fails_this_test++)
H5_FAILED();
printf(" test %u elmt %u: \n", (unsigned)i+1, (unsigned)j);
printf(" elmt %u: \n", (unsigned)j);
printf(" src = ");
for (k=0; k<src_size; k++)

6
test/hyperslab.c
View File

@ -221,13 +221,13 @@ test_fill(size_t nx, size_t ny, size_t nz,
* original * fill values and add the new ones.
*/
ref_value = init_full(dst, nx, ny, nz);
for (u=dst_offset[0];
for (u=(size_t)dst_offset[0];
u<dst_offset[0]+dx;
u++) {
for (v = dst_offset[1];
for (v = (size_t)dst_offset[1];
v < dst_offset[1] + dy;
v++) {
for (w = dst_offset[2];
for (w = (size_t)dst_offset[2];
w < dst_offset[2] + dz;
w++) {
ref_value -= dst[u*ny*nz+v*nz+w];

4
tools/lib/h5diff.c
View File

@ -156,7 +156,7 @@ h5diff (const char *fname1,
const char *fname2,
const char *objname1, const char *objname2, diff_opt_t * options)
{
int nobjects1, nobjects2, i;
int nobjects1, nobjects2;
trav_info_t *info1 = NULL;
trav_info_t *info2 = NULL;
hid_t file1_id=(-1), file2_id=(-1);
@ -303,6 +303,8 @@ h5diff (const char *fname1,
#ifdef H5_HAVE_PARALLEL
if(g_Parallel)
{
int i;
if( (strlen(fname1) > 1024) || (strlen(fname2) > 1024))
{
printf("The parallel diff only supports path names up to 1024 characters\n");