summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2007-01-07 03:51:07 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2007-01-07 03:51:07 (GMT)
commit7fc6a486b94dcd8eff19db8816d9ab3b0bbeb440 (patch)
treebb1374a8a5b0a03b36230e9a636e4e2bd1fa21ed
parent327ea3a76678ed2f92b0eb72df36c1d02651c2be (diff)
downloadhdf5-7fc6a486b94dcd8eff19db8816d9ab3b0bbeb440.zip
hdf5-7fc6a486b94dcd8eff19db8816d9ab3b0bbeb440.tar.gz
hdf5-7fc6a486b94dcd8eff19db8816d9ab3b0bbeb440.tar.bz2
[svn-r13117] Description:
Clean up some warnings from Windows. Tested on: FreeBSD/32 6.1 (duty)
-rw-r--r--src/H5HFhuge.c4
-rw-r--r--src/H5Zscaleoffset.c8
-rw-r--r--test/links.c20
3 files changed, 16 insertions, 16 deletions
diff --git a/src/H5HFhuge.c b/src/H5HFhuge.c
index e2663cd..4a4d2c3 100644
--- a/src/H5HFhuge.c
+++ b/src/H5HFhuge.c
@@ -632,7 +632,7 @@ H5HF_huge_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
/* Retrieve the object's address & length */
obj_addr = found_rec.addr;
- obj_size = found_rec.len;
+ H5_ASSIGN_OVERFLOW(/* To: */ obj_size, /* From: */ found_rec.len, /* From: */ hsize_t, /* To: */ size_t);
filter_mask = found_rec.filter_mask;
} /* end if */
else {
@@ -649,7 +649,7 @@ H5HF_huge_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
/* Retrieve the object's address & length */
obj_addr = found_rec.addr;
- obj_size = found_rec.len;
+ H5_ASSIGN_OVERFLOW(/* To: */ obj_size, /* From: */ found_rec.len, /* From: */ hsize_t, /* To: */ size_t);
} /* end else */
} /* end else */
diff --git a/src/H5Zscaleoffset.c b/src/H5Zscaleoffset.c
index 2c55188..b561775 100644
--- a/src/H5Zscaleoffset.c
+++ b/src/H5Zscaleoffset.c
@@ -123,7 +123,7 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
*/ \
for(i = 0; i < sizeof(type); i++) \
((unsigned char *)&cd_values[H5Z_SCALEOFFSET_PARM_FILVAL])[i] = \
- (fill_val & ((type)0xff << i*8)) >> i*8; \
+ (unsigned char)((fill_val & ((type)0xff << i*8)) >> i*8); \
}
/* Set the fill value parameter in cd_values[] for unsigned integer type */
@@ -427,13 +427,13 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
{ \
if(sizeof(type)==sizeof(int)) \
for(i = 0; i < sizeof(int); i++) \
- ((unsigned char *)minval)[i] = (*(int *)&min & ((int)0xff << i*8)) >> i*8; \
+ ((unsigned char *)minval)[i] = (unsigned char)((*(int *)&min & ((int)0xff << i*8)) >> i*8); \
else if(sizeof(type)==sizeof(long)) \
for(i = 0; i < sizeof(long); i++) \
- ((unsigned char *)minval)[i] = (*(long *)&min & ((long)0xff << i*8)) >> i*8; \
+ ((unsigned char *)minval)[i] = (unsigned char)((*(long *)&min & ((long)0xff << i*8)) >> i*8); \
else if(sizeof(type)==sizeof(long_long)) \
for(i = 0; i < sizeof(long_long); i++) \
- ((unsigned char *)minval)[i] = (*(long_long *)&min & ((long_long)0xff << i*8)) >> i*8;\
+ ((unsigned char *)minval)[i] = (unsigned char)((*(long_long *)&min & ((long_long)0xff << i*8)) >> i*8);\
else \
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")\
}
diff --git a/test/links.c b/test/links.c
index bdf2fd2..1fd6e15 100644
--- a/test/links.c
+++ b/test/links.c
@@ -5566,8 +5566,8 @@ corder_transition(hid_t fapl)
unsigned nlinks; /* Number of link messages in group's header */
hsize_t name_count; /* # of records in name index */
hsize_t corder_count; /* # of records in creation order index */
- off_t empty_size; /* Size of empty file */
- off_t file_size; /* Size of file after operating on it */
+ h5_stat_size_t empty_size; /* Size of empty file */
+ h5_stat_size_t file_size; /* Size of file after operating on it */
char objname[NAME_BUF_SIZE]; /* Object name */
char filename[NAME_BUF_SIZE];/* File name */
unsigned u; /* Local index variable */
@@ -5797,8 +5797,8 @@ corder_delete(hid_t fapl)
hsize_t name_count; /* # of records in name index */
hsize_t corder_count; /* # of records in creation order index */
hbool_t reopen_file; /* Whether to re-open the file before deleting group */
- off_t empty_size; /* Size of empty file */
- off_t file_size; /* Size of file after operating on it */
+ h5_stat_size_t empty_size; /* Size of empty file */
+ h5_stat_size_t file_size; /* Size of file after operating on it */
char objname[NAME_BUF_SIZE]; /* Object name */
char filename[NAME_BUF_SIZE];/* File name */
unsigned u; /* Local index variable */
@@ -7116,7 +7116,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order,
herr_t ret; /* Generic return value */
/* Iterate over links in group */
- iter_info->nskipped = skip = 0;
+ iter_info->nskipped = (unsigned)(skip = 0);
iter_info->order = order;
iter_info->stop = -1;
iter_info->ncalled = 0;
@@ -7146,7 +7146,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order,
/* Skip over some links in group */
- iter_info->nskipped = skip = max_links / 2;
+ iter_info->nskipped = (unsigned)(skip = max_links / 2);
iter_info->order = order;
iter_info->stop = -1;
iter_info->ncalled = 0;
@@ -7208,7 +7208,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order,
/* Iterate over links in group, stopping in the middle */
- iter_info->nskipped = skip = 0;
+ iter_info->nskipped = (unsigned)(skip = 0);
iter_info->order = order;
iter_info->stop = 3;
iter_info->ncalled = 0;
@@ -7564,7 +7564,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order,
herr_t ret; /* Generic return value */
/* Iterate over links in group */
- iter_info->nskipped = skip = 0;
+ iter_info->nskipped = (unsigned)(skip = 0);
iter_info->order = order;
iter_info->stop = -1;
iter_info->ncalled = 0;
@@ -7594,7 +7594,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order,
/* Skip over some links in group */
- iter_info->nskipped = skip = max_links / 2;
+ iter_info->nskipped = (unsigned)(skip = max_links / 2);
iter_info->order = order;
iter_info->stop = -1;
iter_info->ncalled = 0;
@@ -7656,7 +7656,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order,
/* Iterate over links in group, stopping in the middle */
- iter_info->nskipped = skip = 0;
+ iter_info->nskipped = (unsigned)(skip = 0);
iter_info->order = order;
iter_info->stop = 3;
iter_info->ncalled = 0;