diff options
author | Robb Matzke <matzke@llnl.gov> | 1998-04-07 15:34:16 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1998-04-07 15:34:16 (GMT) |
commit | 68fa66bf8130d6a6e607e233da8cc61a154bf172 (patch) | |
tree | b5a0e0120492c7bb9f935ab74f4cef97d6bbcbee /src/H5Flow.c | |
parent | 92571bbe1d77c74ddefeeba6ac0b2097593c058d (diff) | |
download | hdf5-68fa66bf8130d6a6e607e233da8cc61a154bf172.zip hdf5-68fa66bf8130d6a6e607e233da8cc61a154bf172.tar.gz hdf5-68fa66bf8130d6a6e607e233da8cc61a154bf172.tar.bz2 |
[svn-r337] Changes since 19980403
----------------------
./configure.in
Moved setting of compiler warning switches earlier in the file.
Turned on more warning switches to gcc.
./config/linux
Prints a warning if the gcc version is less than 2.8.1 since
that version has problems with register allocation for `long
long'.
./html/Datatypes.html
Documented sharing of data types between datasets.
./src/H5G.c
./src/H5Gpublic.h
Implemented H5Gmove(), H5Glink() and H5Gunlink() for hard
links. Still have soft links to do.
./src/H5AC.c
./src/H5ACprivate.h
./src/H5D.c
./src/H5E.c
./src/H5Eprivate.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/H5Fstdio.c
./src/H5G.c
./src/H5Gent.c
./src/H5Gnode.c
./src/H5Gpkg.h
./src/H5Gprivate.h
./src/H5HG.c
./src/H5HL.c
./src/H5HLprivate.h
./src/H5I.c
./src/H5Iprivate.h
./src/H5MM.c
./src/H5MMprivate.h
./src/H5O.c
./src/H5Oefl.c
./src/H5Oprivate.h
./src/H5Osdspace.c
./src/H5Oshared.c
./src/H5Ostab.c
./src/H5P.c
./src/H5S.c
./src/H5Ssimp.c
./src/H5T.c
./src/H5Tconv.c
./src/H5Tprivate.h
./src/H5Tpublic.h
./src/H5V.c
./src/H5Vprivate.h
./src/H5detect.c
./src/h5ls.c
./test/cmpd_dset.c
./test/dsets.c
./test/external.c
./test/hyperslab.c
./test/iopipe.c
./test/istore.c
./test/shtype.c
./test/tstab.c
Fixed comparisons between signed and unsigned values. Fixed
warnings about unused function arguments.
Diffstat (limited to 'src/H5Flow.c')
-rw-r--r-- | src/H5Flow.c | 54 |
1 files changed, 42 insertions, 12 deletions
diff --git a/src/H5Flow.c b/src/H5Flow.c index 545659a..f29b7d3 100644 --- a/src/H5Flow.c +++ b/src/H5Flow.c @@ -587,7 +587,7 @@ H5F_addr_undef(haddr_t *addr /*out */ ) { assert(addr); - addr->offset = -1; + addr->offset = (uint64)(-1); } /*------------------------------------------------------------------------- @@ -676,7 +676,7 @@ H5F_addr_zerop(const haddr_t *addr) void H5F_addr_encode(H5F_t *f, uint8 **pp, const haddr_t *addr) { - int i; + uint i; haddr_t tmp; assert(f); @@ -685,14 +685,14 @@ H5F_addr_encode(H5F_t *f, uint8 **pp, const haddr_t *addr) if (addr_defined(addr)) { tmp = *addr; - for (i = 0; i < H5F_SIZEOF_ADDR(f); i++) { + for (i=0; i<H5F_SIZEOF_ADDR(f); i++) { *(*pp)++ = (uint8)(tmp.offset & 0xff); tmp.offset >>= 8; } assert("overflow" && 0 == tmp.offset); } else { - for (i = 0; i < H5F_SIZEOF_ADDR(f); i++) { + for (i=0; i<H5F_SIZEOF_ADDR(f); i++) { *(*pp)++ = 0xff; } } @@ -720,7 +720,7 @@ H5F_addr_encode(H5F_t *f, uint8 **pp, const haddr_t *addr) void H5F_addr_decode(H5F_t *f, const uint8 **pp, haddr_t *addr/*out*/) { - int i; + uint i; haddr_t tmp; uint8 c; hbool_t all_zero = TRUE; @@ -731,12 +731,11 @@ H5F_addr_decode(H5F_t *f, const uint8 **pp, haddr_t *addr/*out*/) addr->offset = 0; - for (i = 0; i < H5F_SIZEOF_ADDR(f); i++) { + for (i=0; i<H5F_SIZEOF_ADDR(f); i++) { c = *(*pp)++; - if (c != 0xff) - all_zero = FALSE; + if (c != 0xff) all_zero = FALSE; - if (i < sizeof(addr->offset)) { + if (i<sizeof(addr->offset)) { tmp.offset = c; tmp.offset <<= i * 8; /*use tmp to get casting right */ addr->offset |= tmp.offset; @@ -744,8 +743,7 @@ H5F_addr_decode(H5F_t *f, const uint8 **pp, haddr_t *addr/*out*/) assert(0 == **pp); /*overflow */ } } - if (all_zero) - H5F_addr_undef(addr); + if (all_zero) H5F_addr_undef(addr); } /*------------------------------------------------------------------------- @@ -830,12 +828,44 @@ H5F_addr_pow2(uintn n, haddr_t *addr /*out */ ) *------------------------------------------------------------------------- */ void -H5F_addr_inc(haddr_t *addr /*in,out */ , size_t inc) +H5F_addr_inc(haddr_t *addr/*in,out */, size_t inc) { assert(addr && addr_defined(addr)); assert(addr->offset <= addr->offset + inc); + addr->offset += inc; } + + +/*------------------------------------------------------------------------- + * Function: H5F_addr_adj + * + * Purpose: Adjusts an address by adding or subtracting some amount. + * + * Return: void + * + * Programmer: Robb Matzke + * Monday, April 6, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +void +H5F_addr_adj(haddr_t *addr/*in,out */, ssize_t adj) +{ +#ifndef NDEBUG + assert(addr && addr_defined(addr)); + if (adj>=0) { + assert(addr->offset <= addr->offset + adj); + } else { + assert (addr->offset > addr->offset + adj); + } +#endif + + addr->offset += adj; +} + /*------------------------------------------------------------------------- * Function: H5F_addr_add |