summaryrefslogtreecommitdiffstats
path: root/test/tselect.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2001-08-14 22:09:56 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2001-08-14 22:09:56 (GMT)
commite87fc517b8fc391cf18c268ce0b195eb7398a4a7 (patch)
tree494d1d87f71f87f320707989b7f12eec0f1d3805 /test/tselect.c
parenteef2829d1655e42225b2400c6e3d123be26e08a8 (diff)
downloadhdf5-e87fc517b8fc391cf18c268ce0b195eb7398a4a7.zip
hdf5-e87fc517b8fc391cf18c268ce0b195eb7398a4a7.tar.gz
hdf5-e87fc517b8fc391cf18c268ce0b195eb7398a4a7.tar.bz2
[svn-r4355] Purpose:
Code cleanup (sorta) Description: When the first versions of the HDF5 library were designed, I remembered vividly the difficulties of porting code from a 32-bit platform to a 16-bit platform and asked that people use intn & uintn instead of int & unsigned int, respectively. However, in hindsight, this was overkill and unnecessary since we weren't going to be porting the HDF5 library to 16-bit architectures. Currently, the extra uintn & intn typedefs are causing problems for users who'd like to include both the HDF5 and HDF4 header files in one source module (like Kent's h4toh5 library). Solution: Changed the uintn & intn's to unsigned and int's respectively. Platforms tested: FreeBSD 4.4 (hawkwind)
Diffstat (limited to 'test/tselect.c')
-rw-r--r--test/tselect.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/test/tselect.c b/test/tselect.c
index a2cd91e..22743da 100644
--- a/test/tselect.c
+++ b/test/tselect.c
@@ -142,7 +142,7 @@ test_select_hyper(hid_t xfer_plist)
uint8_t *wbuf, /* buffer to write to disk */
*rbuf, /* buffer read from disk */
*tbuf; /* temporary buffer pointer */
- intn i,j; /* Counters */
+ int i,j; /* Counters */
herr_t ret; /* Generic return value */
H5S_class_t ext_type; /* Extent type */
@@ -246,7 +246,7 @@ test_select_hyper(hid_t xfer_plist)
struct pnt_iter {
hssize_t coord[POINT1_NPOINTS*2][SPACE2_RANK]; /* Coordinates for point selection */
uint8_t *buf; /* Buffer the points are in */
- intn offset; /* Which point we are looking at */
+ int offset; /* Which point we are looking at */
};
/****************************************************************
@@ -296,7 +296,7 @@ test_select_point(hid_t xfer_plist)
uint8_t *wbuf, /* buffer to write to disk */
*rbuf, /* buffer read from disk */
*tbuf; /* temporary buffer pointer */
- intn i,j; /* Counters */
+ int i,j; /* Counters */
struct pnt_iter pi; /* Custom Pointer iterator struct */
herr_t ret; /* Generic return value */
@@ -572,7 +572,7 @@ test_select_all(hid_t xfer_plist)
uint8_t *wbuf, /* buffer to write to disk */
*rbuf, /* buffer read from disk */
*tbuf; /* temporary buffer pointer */
- intn i,j,k; /* Counters */
+ int i,j,k; /* Counters */
herr_t ret; /* Generic return value */
H5S_class_t ext_type; /* Extent type */
@@ -656,7 +656,7 @@ test_select_all_hyper(hid_t xfer_plist)
uint8_t *wbuf, /* buffer to write to disk */
*rbuf, /* buffer read from disk */
*tbuf; /* temporary buffer pointer */
- intn i,j; /* Counters */
+ int i,j; /* Counters */
herr_t ret; /* Generic return value */
H5S_class_t ext_type; /* Extent type */
@@ -796,7 +796,7 @@ test_select_combo(void)
*rbuf, /* buffer read from disk */
*tbuf, /* temporary buffer pointer */
*tbuf2; /* temporary buffer pointer */
- intn i,j; /* Counters */
+ int i,j; /* Counters */
herr_t ret; /* Generic return value */
/* Output message about test being performed */
@@ -962,7 +962,7 @@ test_select_hyper_stride(void)
216,217,218,242,243,244, /* Block #11 */
220,221,222,246,247,248, /* Block #12 */
};
- intn i,j; /* Counters */
+ int i,j; /* Counters */
herr_t ret; /* Generic return value */
/* Output message about test being performed */
@@ -1090,7 +1090,7 @@ test_select_hyper_contig(void)
uint16_t *wbuf, /* buffer to write to disk */
*rbuf, /* buffer read from disk */
*tbuf; /* temporary buffer pointer */
- intn i,j; /* Counters */
+ int i,j; /* Counters */
herr_t ret; /* Generic return value */
/* Output message about test being performed */
@@ -1223,7 +1223,7 @@ test_select_hyper_copy(void)
*rbuf, /* 1st buffer read from disk */
*rbuf2, /* 2nd buffer read from disk */
*tbuf; /* temporary buffer pointer */
- intn i,j; /* Counters */
+ int i,j; /* Counters */
herr_t ret; /* Generic return value */
/* Output message about test being performed */
@@ -1381,7 +1381,7 @@ test_select_point_copy(void)
*rbuf, /* 1st buffer read from disk */
*rbuf2, /* 2nd buffer read from disk */
*tbuf; /* temporary buffer pointer */
- intn i,j; /* Counters */
+ int i,j; /* Counters */
herr_t ret; /* Generic return value */
/* Output message about test being performed */
@@ -1554,7 +1554,7 @@ test_select_hyper_offset(void)
*rbuf, /* buffer read from disk */
*tbuf, /* temporary buffer pointer */
*tbuf2; /* temporary buffer pointer */
- intn i,j; /* Counters */
+ int i,j; /* Counters */
herr_t ret; /* Generic return value */
htri_t valid; /* Generic boolean return value */
H5S_class_t ext_type; /* Extent type */
@@ -1715,7 +1715,7 @@ test_select_point_offset(void)
*rbuf, /* buffer read from disk */
*tbuf, /* temporary buffer pointer */
*tbuf2; /* temporary buffer pointer */
- intn i,j; /* Counters */
+ int i,j; /* Counters */
herr_t ret; /* Generic return value */
htri_t valid; /* Generic boolean return value */
@@ -1894,7 +1894,7 @@ test_select_hyper_union(void)
*rbuf, /* buffer read from disk */
*tbuf, /* temporary buffer pointer */
*tbuf2; /* temporary buffer pointer */
- intn i,j; /* Counters */
+ int i,j; /* Counters */
herr_t ret; /* Generic return value */
hsize_t npoints; /* Number of elements in selection */
@@ -2355,7 +2355,7 @@ test_select_hyper_union(void)
/* Compare data read with data written out */
for(i=0,tbuf2=rbuf; i<SPACE2_DIM1; i++) {
tbuf=wbuf+(i*SPACE2_DIM2)+begin[i];
- for(j=0; j<(intn)len[i]; j++, tbuf++, tbuf2++) {
+ for(j=0; j<(int)len[i]; j++, tbuf++, tbuf2++) {
if(*tbuf!=*tbuf2) {
printf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n",__LINE__,i,j,(int)*tbuf,(int)*tbuf2);
num_errs++;
@@ -2597,7 +2597,7 @@ test_select_hyper_union_3d(void)
*rbuf, /* buffer read from disk */
*tbuf, /* temporary buffer pointer */
*tbuf2; /* temporary buffer pointer */
- intn i,j,k; /* Counters */
+ int i,j,k; /* Counters */
herr_t ret; /* Generic return value */
hsize_t npoints; /* Number of elements in selection */
@@ -2682,9 +2682,9 @@ test_select_hyper_union_3d(void)
CHECK(ret, FAIL, "H5Dread");
/* Compare data read with data written out */
- for(i=0,tbuf2=rbuf; i<(intn)(sizeof(rows)/sizeof(struct row_list)); i++) {
+ for(i=0,tbuf2=rbuf; i<(int)(sizeof(rows)/sizeof(struct row_list)); i++) {
tbuf=wbuf+(rows[i].z*SPACE4_DIM3*SPACE4_DIM2)+(rows[i].y*SPACE4_DIM3)+rows[i].x;
- for(j=0; j<(intn)rows[i].l; j++, tbuf++, tbuf2++) {
+ for(j=0; j<(int)rows[i].l; j++, tbuf++, tbuf2++) {
if(*tbuf!=*tbuf2) {
printf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n",__LINE__,i,j,(int)*tbuf,(int)*tbuf2);
num_errs++;
@@ -2763,7 +2763,7 @@ test_select_hyper_union_random_5d(hid_t read_plist)
int *wbuf, /* buffer to write to disk */
*rbuf, /* buffer read from disk */
*tbuf; /* temporary buffer pointer */
- intn i,j,k,l,m; /* Counters */
+ int i,j,k,l,m; /* Counters */
herr_t ret; /* Generic return value */
hssize_t npoints, /* Number of elements in file selection */
npoints2; /* Number of elements in memory selection */
@@ -2854,7 +2854,7 @@ printf("random I/O, before H5Dread()\n");
{
hsize_t blocks[15][2][SPACE5_RANK];
hssize_t nblocks;
- intn k;
+ int k;
nblocks=H5Sget_select_hyper_nblocks(sid1);
printf("nblocks=%d\n",(int)nblocks);