summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2000-11-13 17:03:59 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2000-11-13 17:03:59 (GMT)
commit6c603f3e77454df4f3dc24e0ca1327d9017bbf67 (patch)
treefc6d2068753e3ee98da47e0b173e2f256a11afd2
parent8ea1fc564f3686d14f30ccf00a0d7079473d3830 (diff)
downloadhdf5-6c603f3e77454df4f3dc24e0ca1327d9017bbf67.zip
hdf5-6c603f3e77454df4f3dc24e0ca1327d9017bbf67.tar.gz
hdf5-6c603f3e77454df4f3dc24e0ca1327d9017bbf67.tar.bz2
[svn-r2875] Purpose:
Code cleanup Description: Eliminated some warnings on O2K platform. Platforms tested: SGI O2K (modi4)
-rw-r--r--src/H5Odtype.c1
-rw-r--r--test/h5test.c2
-rw-r--r--tools/h5tools.c6
-rw-r--r--tools/talign.c6
4 files changed, 7 insertions, 8 deletions
diff --git a/src/H5Odtype.c b/src/H5Odtype.c
index 6d77194..5acec69 100644
--- a/src/H5Odtype.c
+++ b/src/H5Odtype.c
@@ -416,7 +416,6 @@ H5O_dtype_decode_helper(H5F_t *f, const uint8_t **pp, H5T_t *dt)
default:
HRETURN_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
"unknown datatype class found");
- break;
}
FUNC_LEAVE(SUCCEED);
diff --git a/test/h5test.c b/test/h5test.c
index 98e4aec..bfd18df 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -378,7 +378,7 @@ h5_fileaccess(void)
if ((val = strtok(NULL, " \t\n\r")))
verbosity = strtol(val, NULL, 0);
- if (H5Pset_fapl_log(fapl, NULL, verbosity) < 0)
+ if (H5Pset_fapl_log(fapl, NULL, (int)verbosity) < 0)
return -1;
} else {
/* Unknown driver */
diff --git a/tools/h5tools.c b/tools/h5tools.c
index 34a00a5..d826283 100644
--- a/tools/h5tools.c
+++ b/tools/h5tools.c
@@ -247,7 +247,7 @@ h5dump_str_append(h5dump_str_t *str/*in,out*/, const char *fmt, ...)
while (1) {
size_t avail = str->nalloc - str->len;
- size_t nchars = HDvsnprintf(str->s+str->len, avail, fmt, ap);
+ size_t nchars = (size_t)HDvsnprintf(str->s+str->len, avail, fmt, ap);
if (nchars < avail) {
/* success */
@@ -1533,8 +1533,8 @@ h5dump_simple_dset(FILE *stream, const h5dump_t *info, hid_t dset,
return -1;
/* Print the data */
- flags = ((elmtno == 0 ? START_OF_DATA : 0) |
- ((elmtno + hs_nelmts) >= p_nelmts ? END_OF_DATA : 0));
+ flags = (((elmtno == 0) ? START_OF_DATA : 0) |
+ (((elmtno + hs_nelmts) >= p_nelmts) ? END_OF_DATA : 0));
h5dump_simple_data(stream, info, dset, &ctx, flags, hs_nelmts,
p_type, sm_buf);
diff --git a/tools/talign.c b/tools/talign.c
index f36eccf..7bf0659 100644
--- a/tools/talign.c
+++ b/tools/talign.c
@@ -126,21 +126,21 @@ int main(void)
|| fnok[0] != fptr[2] || fnok[1] != fptr[3]) {
result = 1;
printf("%14s (%2d) %6s = %s\n",
- mname = H5Tget_member_name(fix, 0), H5Tget_member_offset(fix,0),
+ mname = H5Tget_member_name(fix, 0), (int)H5Tget_member_offset(fix,0),
string5, (char *)(data + H5Tget_member_offset(fix, 0)));
free(mname);
fptr = (float *)(data + H5Tget_member_offset(fix, 1));
printf("Data comparison:\n"
"%14s (%2d) %6f = %f\n"
" %6f = %f\n",
- mname = H5Tget_member_name(fix, 1), H5Tget_member_offset(fix,1),
+ mname = H5Tget_member_name(fix, 1), (int)H5Tget_member_offset(fix,1),
fok[0], fptr[0],
fok[1], fptr[1]);
free(mname);
fptr = (float *)(data + H5Tget_member_offset(fix, 2));
printf("%14s (%2d) %6f = %f\n"
" %6f = %6f\n",
- mname = H5Tget_member_name(fix, 2), H5Tget_member_offset(fix,2),
+ mname = H5Tget_member_name(fix, 2), (int)H5Tget_member_offset(fix,2),
fnok[0], fptr[0],
fnok[1], fptr[1]);
free(mname);