[svn-r4360] 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).

    (Merged from the same changes to development branch)

Solution:
    Changed the uintn & intn's to unsigned and int's respectively.

Platforms tested:
    FreeBSD 4.4 (hawkwind)

1 files changed, 16 insertions, 16 deletions

diff --git a/src/H5HG.c b/src/H5HG.c
index f752f00..e5585ef 100644
--- a/src/H5HG.c
+++ b/src/H5HG.c
@@ -39,7 +39,7 @@
 #define PABLO_MASK	H5HG_mask
 
 typedef struct H5HG_obj_t {
-    intn		nrefs;		/*reference count		*/
+    int		nrefs;		/*reference count		*/
     size_t		size;		/*total size of object		*/
     uint8_t		*begin;		/*ptr to object into heap->chunk*/
 } H5HG_obj_t;
@@ -51,7 +51,7 @@ struct H5HG_heap_t {
     hbool_t		dirty;		/*does heap need to be saved?	*/
     size_t		size;		/*total size of collection	*/
     uint8_t		*chunk;		/*the collection, incl. header	*/
-    intn		nalloc;		/*numb object slots allocated	*/
+    int		nalloc;		/*numb object slots allocated	*/
     H5HG_obj_t	*obj;		/*array of object descriptions	*/
 };
 
@@ -71,7 +71,7 @@ static const H5AC_class_t H5AC_GHEAP[1] = {{
 }};
 
 /* Interface initialization */
-static intn interface_initialize_g = 0;
+static int interface_initialize_g = 0;
 #define INTERFACE_INIT NULL
 
 /* Declare a free list to manage the H5HG_t struct */
@@ -236,7 +236,7 @@ H5HG_load (H5F_t *f, haddr_t addr, const void UNUSED *udata1,
     H5HG_heap_t	*heap = NULL;
     H5HG_heap_t	*ret_value = NULL;
     uint8_t	*p = NULL;
-    intn	i;
+    int	i;
     size_t	nalloc, need;
     
     FUNC_ENTER (H5HG_load, NULL);
@@ -307,7 +307,7 @@ H5HG_load (H5F_t *f, haddr_t addr, const void UNUSED *udata1,
 	HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL,
 		     "memory allocation failed");
     }
-    heap->nalloc = (intn)nalloc;
+    heap->nalloc = (int)nalloc;
     while (p<heap->chunk+heap->size) {
 	if (p+H5HG_SIZEOF_OBJHDR(f)>heap->chunk+heap->size) {
 	    /*
@@ -319,7 +319,7 @@ H5HG_load (H5F_t *f, haddr_t addr, const void UNUSED *udata1,
 	    heap->obj[0].begin = p;
 	    p += heap->obj[0].size;
 	} else {
-	    intn idx;
+	    int idx;
 	    uint8_t *begin = p;
 	    UINT16DECODE (p, idx);
 	    assert (idx<heap->nalloc);
@@ -464,7 +464,7 @@ H5HG_flush (H5F_t *f, hbool_t destroy, haddr_t addr, H5HG_heap_t *heap)
  *
  *-------------------------------------------------------------------------
  */
-static intn
+static int
 H5HG_alloc (H5F_t *f, H5HG_heap_t *heap, int cwfsno, size_t size)
 {
     int		idx;
@@ -567,7 +567,7 @@ herr_t
 H5HG_insert (H5F_t *f, size_t size, void *obj, H5HG_t *hobj/*out*/)
 {
     size_t	need;		/*total space needed for object		*/
-    intn	cwfsno, idx;
+    int	cwfsno, idx;
     H5HG_heap_t	*heap = NULL;
     
     FUNC_ENTER (H5HG_insert, FAIL);
@@ -665,7 +665,7 @@ H5HG_peek (H5F_t *f, H5HG_t *hobj)
 {
     H5HG_heap_t	*heap = NULL;
     void	*retval = NULL;
-    intn	i;
+    int	i;
     
     FUNC_ENTER (H5HG_peek, NULL);
 
@@ -724,7 +724,7 @@ void *
 H5HG_read (H5F_t *f, H5HG_t *hobj, void *object/*out*/)
 {
     H5HG_heap_t	*heap = NULL;
-    intn	i;
+    int	i;
     size_t	size;
     uint8_t	*p = NULL;
     
@@ -788,8 +788,8 @@ H5HG_read (H5F_t *f, H5HG_t *hobj, void *object/*out*/)
  *
  *-------------------------------------------------------------------------
  */
-intn
-H5HG_link (H5F_t *f, H5HG_t *hobj, intn adjust)
+int
+H5HG_link (H5F_t *f, H5HG_t *hobj, int adjust)
 {
     H5HG_heap_t *heap = NULL;
     
@@ -844,7 +844,7 @@ H5HG_remove (H5F_t *f, H5HG_t *hobj)
     uint8_t	*p=NULL, *obj_start=NULL;
     H5HG_heap_t	*heap = NULL;
     size_t	need;
-    intn	i;
+    int	i;
     
     FUNC_ENTER (H5HG_remove, FAIL);
 
@@ -943,11 +943,11 @@ H5HG_remove (H5F_t *f, H5HG_t *hobj)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HG_debug(H5F_t *f, haddr_t addr, FILE *stream, intn indent,
-	  intn fwidth)
+H5HG_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent,
+	  int fwidth)
 {
     int			i, nused, maxobj;
-    uintn		j, k;
+    unsigned		j, k;
     H5HG_heap_t		*h = NULL;
     char		buf[64];
     size_t		size;