mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r18564] Description:

Browse Source 
Clean up compiler warnings.

Tested on:
    Mac OS X/32 10.6.3 (amazon) w/debug
    (too simple to require h5committest)
This commit is contained in:
Quincey Koziol 2010-04-15 13:00:20 -05:00
parent 833db1dd16
commit 2bacd3d4d7
5 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/H5Adeprec.c
View File

@ -334,6 +334,19 @@ H5Aget_num_attrs(hid_t loc_id)
HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't get location for object") HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't get location for object")
break; break;
case H5I_UNINIT:
case H5I_BADID:
case H5I_FILE:
case H5I_DATASPACE:
case H5I_ATTR:
case H5I_REFERENCE:
case H5I_VFL:
case H5I_GENPROP_CLS:
case H5I_GENPROP_LST:
case H5I_ERROR_CLASS:
case H5I_ERROR_MSG:
case H5I_ERROR_STACK:
case H5I_NTYPES:
default: default:
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "inappropriate attribute target") HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "inappropriate attribute target")
} /*lint !e788 All appropriate cases are covered */ } /*lint !e788 All appropriate cases are covered */

6
src/H5Dbtree.c
View File

@ -122,7 +122,7 @@ static H5B_ins_t H5D_btree_remove( H5F_t *f, hid_t dxpl_id, haddr_t addr,
static herr_t H5D_btree_decode_key(const H5B_shared_t *shared, const uint8_t *raw, static herr_t H5D_btree_decode_key(const H5B_shared_t *shared, const uint8_t *raw,
void *_key); void *_key);
static herr_t H5D_btree_encode_key(const H5B_shared_t *shared, uint8_t *raw, static herr_t H5D_btree_encode_key(const H5B_shared_t *shared, uint8_t *raw,
void *_key); const void *_key);
static herr_t H5D_btree_debug_key(FILE *stream, int indent, int fwidth, static herr_t H5D_btree_debug_key(FILE *stream, int indent, int fwidth,
const void *key, const void *udata); const void *key, const void *udata);
@ -706,9 +706,9 @@ H5D_btree_decode_key(const H5B_shared_t *shared, const uint8_t *raw, void *_key)
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
static herr_t static herr_t
H5D_btree_encode_key(const H5B_shared_t *shared, uint8_t *raw, void *_key) H5D_btree_encode_key(const H5B_shared_t *shared, uint8_t *raw, const void *_key)
{ {
H5D_btree_key_t *key = (H5D_btree_key_t *) _key; const H5D_btree_key_t *key = (const H5D_btree_key_t *)_key;
size_t ndims; size_t ndims;
unsigned u; unsigned u;

18
src/H5Defl.c
View File

@ -269,16 +269,16 @@ H5D_efl_read(const H5O_efl_t *efl, haddr_t addr, size_t size, uint8_t *buf)
} }
/* Read the data */ /* Read the data */
while (size) { while(size) {
HDassert(buf); HDassert(buf);
if (u>=efl->nused) if(u>=efl->nused)
HGOTO_ERROR (H5E_EFL, H5E_OVERFLOW, FAIL, "read past logical end of file") HGOTO_ERROR(H5E_EFL, H5E_OVERFLOW, FAIL, "read past logical end of file")
if (H5F_OVERFLOW_HSIZET2OFFT (efl->slot[u].offset+skip)) if(H5F_OVERFLOW_HSIZET2OFFT (efl->slot[u].offset + skip))
HGOTO_ERROR (H5E_EFL, H5E_OVERFLOW, FAIL, "external file address overflowed") HGOTO_ERROR(H5E_EFL, H5E_OVERFLOW, FAIL, "external file address overflowed")
if ((fd=HDopen (efl->slot[u].name, O_RDONLY, 0))<0) if((fd = HDopen(efl->slot[u].name, O_RDONLY, 0)) < 0)
HGOTO_ERROR (H5E_EFL, H5E_CANTOPENFILE, FAIL, "unable to open external raw data file") HGOTO_ERROR(H5E_EFL, H5E_CANTOPENFILE, FAIL, "unable to open external raw data file")
if (HDlseek (fd, (off_t)(efl->slot[u].offset+skip), SEEK_SET)<0) if(HDlseek(fd, (off_t)(efl->slot[u].offset + skip), SEEK_SET) < 0)
HGOTO_ERROR (H5E_EFL, H5E_SEEKERROR, FAIL, "unable to seek in external raw data file") HGOTO_ERROR(H5E_EFL, H5E_SEEKERROR, FAIL, "unable to seek in external raw data file")
#ifndef NDEBUG #ifndef NDEBUG
tempto_read = MIN(efl->slot[u].size-skip,(hsize_t)size); tempto_read = MIN(efl->slot[u].size-skip,(hsize_t)size);
H5_CHECK_OVERFLOW(tempto_read,hsize_t,size_t); H5_CHECK_OVERFLOW(tempto_read,hsize_t,size_t);

4
src/H5MP.c
View File

@ -451,9 +451,9 @@ H5MP_close(H5MP_pool_t *mp)
/* Free the page appropriately */ /* Free the page appropriately */
if(page->fac_alloc) if(page->fac_alloc)
page = H5FL_FAC_FREE(mp->page_fac, page); page = (H5MP_page_t *)H5FL_FAC_FREE(mp->page_fac, page);
else else
page = H5MM_xfree(page); page = (H5MP_page_t *)H5MM_xfree(page);
page = next_page; page = next_page;
} /* end while */ } /* end while */

2
src/H5trace.c
View File

@ -684,6 +684,7 @@ H5_trace (const double *returning, const char *func, const char *type, ...)
case H5F_FILE_SPACE_VFD: case H5F_FILE_SPACE_VFD:
fprintf(out, "H5F_FILE_SPACE_VFD"); fprintf(out, "H5F_FILE_SPACE_VFD");
break; break;
case H5F_FILE_SPACE_NTYPES:
default: default:
fprintf(out, "%ld", (long)fs_type); fprintf(out, "%ld", (long)fs_type);
break; break;
@ -726,6 +727,7 @@ H5_trace (const double *returning, const char *func, const char *type, ...)
case H5FD_MEM_OHDR: case H5FD_MEM_OHDR:
fprintf(out, "H5FD_MEM_OHDR"); fprintf(out, "H5FD_MEM_OHDR");
break; break;
case H5FD_MEM_NTYPES:
default: default:
fprintf(out, "%ld", (long)mem_type); fprintf(out, "%ld", (long)mem_type);
break; break;