summaryrefslogtreecommitdiffstats
path: root/src/H5T.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>1998-01-28 20:24:49 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>1998-01-28 20:24:49 (GMT)
commit55ac27633ba1984d4296159bf06f562d0adaec61 (patch)
tree96a3cd0deec4a113b915b8c527fd4d410074718c /src/H5T.c
parent9287018553d4bc83c1d7bb7691bb3a501604b942 (diff)
downloadhdf5-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/H5T.c')
-rw-r--r--src/H5T.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/H5T.c b/src/H5T.c
index 29d4df8..df1bd0f 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -440,7 +440,7 @@ H5Tequal(hid_t type1_id, hid_t type2_id)
NULL == (dt2 = H5A_object(type2_id))) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
}
- ret_value = (0 == H5T_cmp(dt1, dt2));
+ ret_value = (0 == H5T_cmp(dt1, dt2)) ? TRUE : FALSE;
FUNC_LEAVE(ret_value);
}
@@ -1044,9 +1044,9 @@ H5Tget_pad(hid_t type_id, H5T_pad_t *lsb /*out */ , H5T_pad_t *msb /*out */ )
}
/* Get values */
if (lsb)
- *lsb = dt->u.atomic.lsb_pad;
+ *lsb = (H5T_pad_t)dt->u.atomic.lsb_pad;
if (msb)
- *msb = dt->u.atomic.msb_pad;
+ *msb = (H5T_pad_t)dt->u.atomic.msb_pad;
FUNC_LEAVE(SUCCEED);
}
@@ -1267,15 +1267,15 @@ H5Tset_fields(hid_t type_id, size_t spos, size_t epos, size_t esize,
if (dt->locked) {
HRETURN_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "data type is read-only");
}
- if (epos < 0 || epos + esize > dt->u.atomic.prec) {
+ if (epos + esize > dt->u.atomic.prec) {
HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
"exponent bit field size/location is invalid");
}
- if (mpos < 0 || mpos + msize > dt->u.atomic.prec) {
+ if (mpos + msize > dt->u.atomic.prec) {
HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
"mantissa bit field size/location is invalid");
}
- if (spos < 0 || spos >= dt->u.atomic.prec) {
+ if (spos >= dt->u.atomic.prec) {
HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
"sign location is not valid");
}
@@ -1498,7 +1498,7 @@ H5Tget_inpad(hid_t type_id)
"not a floating-point data type");
}
/* pad */
- pad = dt->u.atomic.u.f.pad;
+ pad = (H5T_pad_t)dt->u.atomic.u.f.pad;
FUNC_LEAVE(pad);
}
@@ -2722,7 +2722,7 @@ H5T_sort_by_offset(H5T_t *dt)
H5T_member_t tmp = dt->u.compnd.memb[j];
dt->u.compnd.memb[j] = dt->u.compnd.memb[j+1];
dt->u.compnd.memb[j+1] = tmp;
- swapped = 1;
+ swapped = TRUE;
}
}
}