diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-08-30 20:03:37 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-08-30 20:03:37 (GMT) |
| commit | a4069db8f48121ca11d0465b260d9cd81152581b (patch) | |
| tree | 37348ad7d71058a6f449255073d631db8c33794a /test/cmpd_dset.c | |
| parent | 1374654210854d005546459e48c482c5ea01cba2 (diff) | |
| download | hdf5-a4069db8f48121ca11d0465b260d9cd81152581b.zip hdf5-a4069db8f48121ca11d0465b260d9cd81152581b.tar.gz hdf5-a4069db8f48121ca11d0465b260d9cd81152581b.tar.bz2 | |
[svn-r14131] Description:
Move H5Giterate() and H5G_iterate_t to deprecated symbols section,
replacing them with H5Literate and H5L_iterate_t respectively.
Tested on:
FreeBSD/32 6.2 (duty)
FreeBSD/64 6.2 (liberty)
Linux/32 2.6 (kagiso)
Linux/64 2.6 (smirom)
AIX/32 5.3 (copper)
Solaris/32 5.10 (linew)
Mac OS X/32 10.4.10 (amazon)
Diffstat (limited to 'test/cmpd_dset.c')
| -rw-r--r-- | test/cmpd_dset.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c index 0902cd3..53f9746 100644 --- a/test/cmpd_dset.c +++ b/test/cmpd_dset.c @@ -118,13 +118,8 @@ typedef struct { long_long r, s, t; } stype4; -#if 1 -# define NX 100u -# define NY 2000u -#else -# define NX 12u -# define NY 9u -#endif +#define NX 100u +#define NY 2000u /*------------------------------------------------------------------------- @@ -1254,19 +1249,19 @@ error: *------------------------------------------------------------------------- */ static int -compare_data(unsigned char *src_data, unsigned char *dst_data, hbool_t src_subset) +compare_data(void *src_data, void *dst_data, hbool_t src_subset) { stype1 *s_ptr; stype2 *d_ptr; int i; - for (i=0; i<(int)NX*NY; i++) { + for(i = 0; i < (int)(NX * NY); i++) { if(src_subset) { s_ptr = ((stype1*)src_data) + i; - d_ptr = ((stype2*)dst_data) + i; + d_ptr = ((stype2*)dst_data) + i; } else { s_ptr = ((stype2*)src_data) + i; - d_ptr = ((stype1*)dst_data) + i; + d_ptr = ((stype1*)dst_data) + i; } if (s_ptr->a != d_ptr->a || @@ -1469,7 +1464,7 @@ test_hdf5_src_subset(char *filename, hid_t fapl) if(H5Dread(dataset, dst_tid, H5S_ALL, H5S_ALL, dxpl, rbuf)<0) goto error; - if(compare_data(orig, rbuf, TRUE)<0) + if(compare_data(orig, rbuf, TRUE) < 0) goto error; if(H5Dclose(dataset) < 0) @@ -1482,7 +1477,7 @@ test_hdf5_src_subset(char *filename, hid_t fapl) if(H5Dread(dataset, dst_tid, H5S_ALL, H5S_ALL, dxpl, rbuf)<0) goto error; - if(compare_data(orig, rbuf, TRUE)<0) + if(compare_data(orig, rbuf, TRUE) < 0) goto error; if(H5Dclose(dataset) < 0) @@ -1673,7 +1668,7 @@ test_hdf5_dst_subset(char *filename, hid_t fapl) if(H5Dread(dataset, dst_tid, H5S_ALL, H5S_ALL, dxpl, rbuf)<0) goto error; - if(compare_data(orig, rbuf, FALSE)<0) + if(compare_data(orig, rbuf, FALSE) < 0) goto error; if(H5Dclose(dataset) < 0) @@ -1686,7 +1681,7 @@ test_hdf5_dst_subset(char *filename, hid_t fapl) if(H5Dread(dataset, dst_tid, H5S_ALL, H5S_ALL, dxpl, rbuf)<0) goto error; - if(compare_data(orig, rbuf, FALSE)<0) + if(compare_data(orig, rbuf, FALSE) < 0) goto error; if(H5Dclose(dataset) < 0) |