diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 1998-01-28 20:24:49 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 1998-01-28 20:24:49 (GMT) |
commit | 55ac27633ba1984d4296159bf06f562d0adaec61 (patch) | |
tree | 96a3cd0deec4a113b915b8c527fd4d410074718c /src/H5Odtype.c | |
parent | 9287018553d4bc83c1d7bb7691bb3a501604b942 (diff) | |
download | hdf5-55ac27633ba1984d4296159bf06f562d0adaec61.zip hdf5-55ac27633ba1984d4296159bf06f562d0adaec61.tar.gz hdf5-55ac27633ba1984d4296159bf06f562d0adaec61.tar.bz2 |
[svn-r188] Changed hbool_t from an enum to 'int' and removed BTRUE/BFALSE/BFAIL from code.
Changed interface to the H5P..hyperslab functions to 'int' instead of 'size_t'.
Cleaned up lots of warnings on IRIX 6.2 platform. Minor other tweaks to get
to a mostly clean build on the SGI. It still whines about 'long long' being
non-standard and some "pointless comparison of unsigned with 0" but those
aren't big problems.
Diffstat (limited to 'src/H5Odtype.c')
-rw-r--r-- | src/H5Odtype.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Odtype.c b/src/H5Odtype.c index 4315717..3e23374 100644 --- a/src/H5Odtype.c +++ b/src/H5Odtype.c @@ -86,7 +86,7 @@ H5O_dtype_decode_helper(const uint8 **pp, H5T_t *dt) /* decode */ UINT32DECODE(*pp, flags); - dt->type = flags & 0xff; + dt->type = (H5T_class_t)(flags & 0xff); flags >>= 8; UINT32DECODE(*pp, dt->size); @@ -147,8 +147,8 @@ H5O_dtype_decode_helper(const uint8 **pp, H5T_t *dt) dt->u.compnd.memb = H5MM_xcalloc(dt->u.compnd.nalloc, sizeof(H5T_member_t)); for (i = 0; i < dt->u.compnd.nmembs; i++) { - dt->u.compnd.memb[i].name = H5MM_xstrdup(*pp); - *pp += ((strlen(*pp) + 8) / 8) * 8; /*multiple of 8 w/ null terminator */ + dt->u.compnd.memb[i].name = H5MM_xstrdup((const char *)*pp); + *pp += ((HDstrlen((const char *)*pp) + 8) / 8) * 8; /*multiple of 8 w/ null terminator */ UINT32DECODE(*pp, dt->u.compnd.memb[i].offset); dt->u.compnd.memb[i].ndims = *(*pp)++; assert(dt->u.compnd.memb[i].ndims <= 4); @@ -204,7 +204,7 @@ H5O_dtype_encode_helper(uint8 **pp, const H5T_t *dt) { uintn flags = 0; uintn perm_word; - char *hdr = *pp; + char *hdr = (char *)*pp; intn i, j, n; FUNC_ENTER(H5O_dtype_encode_helper, FAIL); |