summaryrefslogtreecommitdiffstats
path: root/src/H5Oefl.c
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1998-04-08 21:43:02 (GMT)
committerRobb Matzke <matzke@llnl.gov>1998-04-08 21:43:02 (GMT)
commitc01750fa740943c0083711b353278143c79d50a3 (patch)
treefd475b7c7a3639c05b30625b43547850d687b948 /src/H5Oefl.c
parent68fa66bf8130d6a6e607e233da8cc61a154bf172 (diff)
downloadhdf5-c01750fa740943c0083711b353278143c79d50a3.zip
hdf5-c01750fa740943c0083711b353278143c79d50a3.tar.gz
hdf5-c01750fa740943c0083711b353278143c79d50a3.tar.bz2
[svn-r338] Changes since 19980407
---------------------- ./src/H5B.c ./src/H5D.c ./src/H5Dprivate.h ./src/H5Dpublic.h ./src/H5F.c ./src/H5Farray.c ./src/H5Fcore.c ./src/H5Ffamily.c ./src/H5Fistore.c ./src/H5Flow.c ./src/H5Fprivate.h ./src/H5Fpublic.h ./src/H5Fsec2.c ./src/H5Fsplit.c ./src/H5Fstdio.c ./src/H5G.c ./src/H5Gent.c ./src/H5Gnode.c ./src/H5HG.c ./src/H5HL.c ./src/H5MF.c ./src/H5MFprivate.h ./src/H5O.c ./src/H5Ocont.c ./src/H5Odtype.c ./src/H5Oefl.c ./src/H5Olayout.c ./src/H5Oname.c ./src/H5Oprivate.h ./src/H5Osdspace.c ./src/H5Oshared.c ./src/H5Ostab.c ./src/H5P.c ./src/H5Ppublic.h ./src/H5S.c ./src/H5Sprivate.h ./src/H5Spublic.h ./src/H5Ssimp.c ./src/H5Tconv.c ./src/H5Tpkg.h ./src/H5V.c ./src/H5Vprivate.h ./src/H5private.h ./src/H5public.h ./src/h5ls.c ./test/cmpd_dset.c ./test/dsets.c ./test/extend.c ./test/external.c ./test/hyperslab.c ./test/iopipe.c ./test/istore.c ./test/shtype.c ./test/tfile.c ./test/th5s.c Anything having to do with the size of a dataset now uses the types `hsize_t' and `hssize_t' which must be the same size and at least as large as `size_t'. This isn't fully tested yet, so hsize_t and hssize_t are defined as size_t and ssize_t in H5public.h. Setting them to larger values will trip up gcc versions less than 2.8.1 on x86 platforms. Documented unused function formals with `__unused__' before the formal name. This also has the effect of supressing warning messages for gcc since it's defined to be `__attribute__((unused))' in the H5private.h file. ./src/debug.c ./src/h5ls.c If the file name contains a `%' then the file is opened as a file family with H5P_DEFAULT for the file member access property list. ./src/h5ls.c The group name is optional, defaulting to `/'. ./src/hdf5.h Added some missing public header files.
Diffstat (limited to 'src/H5Oefl.c')
-rw-r--r--src/H5Oefl.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/H5Oefl.c b/src/H5Oefl.c
index 948435a..ba598b7 100644
--- a/src/H5Oefl.c
+++ b/src/H5Oefl.c
@@ -59,7 +59,7 @@ static hbool_t interface_initialize_g = FALSE;
*-------------------------------------------------------------------------
*/
static void *
-H5O_efl_decode(H5F_t *f, const uint8 *p, H5HG_t *hobj)
+H5O_efl_decode(H5F_t *f, const uint8 *p, H5HG_t __unused__ *hobj)
{
H5O_efl_t *mesg = NULL;
int i;
@@ -324,11 +324,11 @@ H5O_efl_reset(void *_mesg)
*
*-------------------------------------------------------------------------
*/
-size_t
+hsize_t
H5O_efl_total_size (H5O_efl_t *efl)
{
int i;
- size_t ret_value = 0, tmp;
+ hsize_t ret_value = 0, tmp;
FUNC_ENTER (H5O_efl_total_size, 0);
@@ -369,8 +369,8 @@ H5O_efl_total_size (H5O_efl_t *efl)
*-------------------------------------------------------------------------
*/
herr_t
-H5O_efl_read (H5F_t *f __attribute__((unused)), const H5O_efl_t *efl,
- haddr_t *addr, size_t size, uint8 *buf)
+H5O_efl_read (H5F_t __unused__ *f, const H5O_efl_t *efl, haddr_t *addr,
+ hsize_t size, uint8 *buf)
{
int i, fd=-1;
size_t to_read, cur, skip=0;
@@ -382,6 +382,7 @@ H5O_efl_read (H5F_t *f __attribute__((unused)), const H5O_efl_t *efl,
/* Check args */
assert (efl && efl->nused>0);
assert (addr && H5F_addr_defined (addr));
+ assert (size < MAX_SIZET);
assert (buf || 0==size);
/* Find the first efl member from which to read */
@@ -454,8 +455,8 @@ H5O_efl_read (H5F_t *f __attribute__((unused)), const H5O_efl_t *efl,
*-------------------------------------------------------------------------
*/
herr_t
-H5O_efl_write (H5F_t *f __attribute__((unused)), const H5O_efl_t *efl,
- haddr_t *addr, size_t size, const uint8 *buf)
+H5O_efl_write (H5F_t __unused__ *f, const H5O_efl_t *efl, haddr_t *addr,
+ hsize_t size, const uint8 *buf)
{
int i, fd=-1;
size_t to_write, cur, skip=0;
@@ -466,6 +467,7 @@ H5O_efl_write (H5F_t *f __attribute__((unused)), const H5O_efl_t *efl,
/* Check args */
assert (efl && efl->nused>0);
assert (addr && H5F_addr_defined (addr));
+ assert (size < MAX_SIZET);
assert (buf || 0==size);
/* Find the first efl member in which to write */
@@ -538,8 +540,8 @@ H5O_efl_write (H5F_t *f __attribute__((unused)), const H5O_efl_t *efl,
*-------------------------------------------------------------------------
*/
static herr_t
-H5O_efl_debug(H5F_t *f, const void *_mesg, FILE * stream, intn indent,
- intn fwidth)
+H5O_efl_debug(H5F_t __unused__ *f, const void *_mesg, FILE * stream,
+ intn indent, intn fwidth)
{
const H5O_efl_t *mesg = (const H5O_efl_t *) _mesg;
char buf[64];