[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)

1 files changed, 12 insertions, 12 deletions

diff --git a/tools/h5dump/h5dumptst.c b/tools/h5dump/h5dumptst.c
index 24f5f21..7d63e9f 100644
--- a/tools/h5dump/h5dumptst.c
+++ b/tools/h5dump/h5dumptst.c
@@ -1444,7 +1444,7 @@ static void test_objref(void)
                *rbuf,       /* buffer read from disk */
                *tbuf;       /* temp. buffer read from disk */
     uint32_t   *tu32;      /* Temporary pointer to uint32 data */
-    intn        i;          /* counting variables */
+    int        i;          /* counting variables */
     const char *write_comment="Foo!"; /* Comments for group */
 
     /* Allocate write & read buffers */
@@ -1566,7 +1566,7 @@ static void test_datareg(void)
     uint8_t    *dwbuf,      /* Buffer for writing numeric data to disk */
                *drbuf;      /* Buffer for reading numeric data from disk */
     uint8_t    *tu8;        /* Temporary pointer to uint8 data */
-    intn        i;          /* counting variables */
+    int        i;          /* counting variables */
 
     /* Allocate write & read buffers */
     wbuf=calloc(sizeof(hdset_reg_ref_t), SPACE1_DIM1);
@@ -1947,7 +1947,7 @@ static void test_vldatatypes2(void)
     hid_t		sid1;       /* Dataspace ID			*/
     hid_t		tid1, tid2; /* Datatype IDs         */
     hsize_t		dims1[] = {SPACE1_DIM1};
-    uintn       i,j,k;      /* counting variables */
+    unsigned       i,j,k;      /* counting variables */
     herr_t		ret;		/* Generic return value		*/
 
     /* Allocate and initialize VL data to write */
@@ -2020,7 +2020,7 @@ static void test_vldatatypes3(void)
     hid_t		sid1;       /* Dataspace ID			*/
     hid_t		tid1, tid2; /* Datatype IDs         */
     hsize_t		dims1[] = {SPACE1_DIM1};
-    uintn       i,j;        /* counting variables */
+    unsigned       i,j;        /* counting variables */
     herr_t		ret;		/* Generic return value		*/
 
     /* Allocate and initialize VL data to write */
@@ -2089,7 +2089,7 @@ static void test_vldatatypes4(void)
     hid_t		sid1;       /* Dataspace ID			*/
     hid_t		tid1, tid2; /* Datatype IDs         */
     hsize_t		dims1[] = {SPACE1_DIM1};
-    uintn       i,j;        /* counting variables */
+    unsigned       i,j;        /* counting variables */
     herr_t		ret;		/* Generic return value		*/
 
     /* Allocate and initialize VL data to write */
@@ -2153,7 +2153,7 @@ static void test_array1(void)
     hid_t		tid1;       /* Datatype ID			*/
     hsize_t		sdims1[] = {SPACE1_DIM1};
     hsize_t		tdims1[] = {ARRAY1_DIM1};
-    intn        i,j;        /* counting variables */
+    int        i,j;        /* counting variables */
     herr_t		ret;		/* Generic return value		*/
 
     /* Allocate and initialize array data to write */
@@ -2197,7 +2197,7 @@ static void test_array2(void)
     hid_t		tid;        /* Datatype ID			*/
     hsize_t		sdims1[] = {SPACE1_DIM1};
     hsize_t		tdims2[] = {ARRAY2_DIM1,ARRAY2_DIM2,ARRAY2_DIM3};
-    intn        i,j,k,l;    /* counting variables */
+    int        i,j,k,l;    /* counting variables */
     herr_t		ret;		/* Generic return value		*/
 
     /* Allocate and initialize array data to write */
@@ -2245,7 +2245,7 @@ static void test_array3(void)
     hsize_t		sdims1[] = {SPACE1_DIM1};
     hsize_t		tdims1[] = {ARRAY1_DIM1};
     hsize_t		tdims2[] = {ARRAY3_DIM1,ARRAY3_DIM2};
-    intn        i,j,k,l;    /* counting variables */
+    int        i,j,k,l;    /* counting variables */
     herr_t		ret;		/* Generic return value		*/
 
     /* Allocate and initialize array data to write */
@@ -2301,7 +2301,7 @@ static void test_array4(void)
     hid_t		tid2;       /* Compound Datatype ID			*/
     hsize_t		sdims1[] = {SPACE1_DIM1};
     hsize_t		tdims1[] = {ARRAY1_DIM1};
-    intn        i,j;        /* counting variables */
+    int        i,j;        /* counting variables */
     herr_t		ret;		/* Generic return value		*/
 
     /* Initialize array data to write */
@@ -2368,7 +2368,7 @@ static void test_array5(void)
     hid_t		tid3;       /* Nested Array Datatype ID	*/
     hsize_t		sdims1[] = {SPACE1_DIM1};
     hsize_t		tdims1[] = {ARRAY1_DIM1};
-    intn        i,j,k;      /* counting variables */
+    int        i,j,k;      /* counting variables */
     herr_t		ret;		/* Generic return value		*/
 
     /* Initialize array data to write */
@@ -2438,7 +2438,7 @@ static void test_array6(void)
     hid_t		tid2;       /* VL Datatype ID       */
     hsize_t		sdims1[] = {SPACE1_DIM1};
     hsize_t		tdims1[] = {ARRAY1_DIM1};
-    intn        i,j,k;      /* counting variables */
+    int        i,j,k;      /* counting variables */
     herr_t		ret;		/* Generic return value		*/
 
     /* Initialize array data to write */
@@ -2499,7 +2499,7 @@ static void test_array7(void)
     hid_t		tid3;       /* Nested Array Datatype ID   */
     hsize_t		sdims1[] = {SPACE1_DIM1};
     hsize_t		tdims1[] = {ARRAY1_DIM1};
-    intn        i,j,k,l;    /* Index variables */
+    int        i,j,k,l;    /* Index variables */
     herr_t		ret;		/* Generic return value		*/
 
     /* Initialize array data to write */