[svn-r5452]

Purpose:
eliminating the compiler warnings in Windows


Solution:
I am eliminating the compiler warnings in Windows.
the last 2 were:

1)
if((oid_list = H5MM_malloc(oid_count*sizeof(hid_t)))==NULL)
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
"memory allocation failed");

D:\disk_w\hdf5\src\H5F.c(2590) : warning C4047: '=' : 'int ' differs in levels
of indirection from 'void *'

on the HGOTO_ERROR call , I replaced the NULL with FAIL

2)
*((float*)d) = *((double*)s);
D:\disk_w\hdf5\src\H5Tconv.c(6426) : warning C4244: '=' : conversion from 'double ' to 'float ', possible loss of data

I added the type cast
*((float*)d) = (float) *((double*)s);

we have now 0 errors 0 warnings on Windows !








Platforms tested:
    w2000, linux
This commit is contained in:
Pedro Vicente Nunes 2002-05-22 15:01:29 -05:00
parent d11c3a233f
commit b4ad5aae56
3 changed files with 3 additions and 3 deletions

View File

@ -2590,7 +2590,7 @@ H5F_close(H5F_t *f)
do {
/* Allocate space for the IDs of objects still currently open */
if((oid_list = H5MM_malloc(oid_count*sizeof(hid_t)))==NULL)
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed");
/* Get the list of IDs of open objects */
if(H5F_get_obj_ids(f, H5F_OBJ_DATASET|H5F_OBJ_GROUP|H5F_OBJ_DATATYPE, oid_list) < 0)

View File

@ -2481,7 +2481,7 @@ herr_t
H5FDflush(H5FD_t *file, unsigned closing)
{
FUNC_ENTER(H5FDflush, FAIL);
H5TRACE1("e","x",file);
H5TRACE2("e","xIu",file,closing);
/* Check args */
if (!file || !file->cls) {

View File

@ -6423,7 +6423,7 @@ H5T_conv_double_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*((float*)d) = -FLT_MAX;
}
} else {
*((float*)d) = *((double*)s);
*((float*)d) = (float) *((double*)s);
}
/* Unalign destination */