[svn-r5200] Purpose:

    Code Cleanup

Description:
    Clean up compiler warnings from the last bunch of checkins

Platforms tested:
    FreeBSD 4.5 (sleipnir)

5 files changed, 39 insertions, 44 deletions

diff --git a/src/H5D.c b/src/H5D.c
index a19bc6c..bf46af4 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -4113,7 +4113,7 @@ herr_t H5D_set_extent( H5D_t *dset, const hsize_t *size )
  H5P_genplist_t *plist;
 	H5O_fill_t fill;
  H5O_pline_t pline;
- unsigned u;
+ int u;
  int shrink = 0;
  
  FUNC_ENTER( H5D_set_extent, FAIL );
diff --git a/src/H5Distore.c b/src/H5Distore.c
index 1ed6679..328f791 100644
--- a/src/H5Distore.c
+++ b/src/H5Distore.c
@@ -170,25 +170,22 @@ typedef struct H5F_istore_ud1_t {
 
 /* inherits B-tree like properties from H5B */
 H5B_class_t H5B_ISTORE[1] = {{
-    H5B_ISTORE_ID,				/*id			*/
-    sizeof(H5F_istore_key_t),			/*sizeof_nkey		*/
-    H5F_istore_sizeof_rkey, 			/*get_sizeof_rkey	*/
-    H5F_istore_new_node,			/*new			*/
-    H5F_istore_cmp2,				/*cmp2			*/
-    H5F_istore_cmp3,				/*cmp3			*/
-    H5F_istore_found,				/*found			*/
-    H5F_istore_insert,				/*insert		*/
-    FALSE,					/*follow min branch?	*/
-    FALSE,					/*follow max branch?	*/
-   	/*pvn*/
-    /*NULL,*/					/*remove		*/
-				H5F_istore_remove,     /*remove		*/
-    H5F_istore_iterate,				/*iterator		*/
-    H5F_istore_decode_key,			/*decode		*/
-    H5F_istore_encode_key,			/*encode		*/
-    H5F_istore_debug_key,			/*debug			*/
-				/*pvn*/
-				H5F_istore_prune_extent,	  	  /*remove chunks, upon H5Dset_extend call			*/
+    H5B_ISTORE_ID,		/*id			*/
+    sizeof(H5F_istore_key_t),	/*sizeof_nkey		*/
+    H5F_istore_sizeof_rkey, 	/*get_sizeof_rkey	*/
+    H5F_istore_new_node,	/*new			*/
+    H5F_istore_cmp2,		/*cmp2			*/
+    H5F_istore_cmp3,		/*cmp3			*/
+    H5F_istore_found,		/*found			*/
+    H5F_istore_insert,		/*insert		*/
+    FALSE,			/*follow min branch?	*/
+    FALSE,			/*follow max branch?	*/
+    H5F_istore_remove,          /*remove		*/
+    H5F_istore_iterate,		/*iterator		*/
+    H5F_istore_decode_key,	/*decode		*/
+    H5F_istore_encode_key,	/*encode		*/
+    H5F_istore_debug_key,	/*debug			*/
+    H5F_istore_prune_extent,	/*remove chunks, upon H5Dset_extend call */
 }};
 
 #define H5F_HASH_DIVISOR 8     /* Attempt to spread out the hashing */
@@ -2790,7 +2787,7 @@ static H5B_ins_t H5F_istore_remove( H5F_t *f,
                                    hbool_t *rt_key_changed  /*out*/)
 {
  H5F_istore_key_t *lt_key = (H5F_istore_key_t*)_lt_key;
- H5FD_free(f->shared->lf, H5FD_MEM_DRAW, addr, lt_key->nbytes);
+ H5FD_free(f->shared->lf, H5FD_MEM_DRAW, addr, (hsize_t)lt_key->nbytes);
  *lt_key_changed = FALSE;
  *rt_key_changed = FALSE;
  return H5B_INS_REMOVE;
diff --git a/src/H5Fistore.c b/src/H5Fistore.c
index 1ed6679..328f791 100644
--- a/src/H5Fistore.c
+++ b/src/H5Fistore.c
@@ -170,25 +170,22 @@ typedef struct H5F_istore_ud1_t {
 
 /* inherits B-tree like properties from H5B */
 H5B_class_t H5B_ISTORE[1] = {{
-    H5B_ISTORE_ID,				/*id			*/
-    sizeof(H5F_istore_key_t),			/*sizeof_nkey		*/
-    H5F_istore_sizeof_rkey, 			/*get_sizeof_rkey	*/
-    H5F_istore_new_node,			/*new			*/
-    H5F_istore_cmp2,				/*cmp2			*/
-    H5F_istore_cmp3,				/*cmp3			*/
-    H5F_istore_found,				/*found			*/
-    H5F_istore_insert,				/*insert		*/
-    FALSE,					/*follow min branch?	*/
-    FALSE,					/*follow max branch?	*/
-   	/*pvn*/
-    /*NULL,*/					/*remove		*/
-				H5F_istore_remove,     /*remove		*/
-    H5F_istore_iterate,				/*iterator		*/
-    H5F_istore_decode_key,			/*decode		*/
-    H5F_istore_encode_key,			/*encode		*/
-    H5F_istore_debug_key,			/*debug			*/
-				/*pvn*/
-				H5F_istore_prune_extent,	  	  /*remove chunks, upon H5Dset_extend call			*/
+    H5B_ISTORE_ID,		/*id			*/
+    sizeof(H5F_istore_key_t),	/*sizeof_nkey		*/
+    H5F_istore_sizeof_rkey, 	/*get_sizeof_rkey	*/
+    H5F_istore_new_node,	/*new			*/
+    H5F_istore_cmp2,		/*cmp2			*/
+    H5F_istore_cmp3,		/*cmp3			*/
+    H5F_istore_found,		/*found			*/
+    H5F_istore_insert,		/*insert		*/
+    FALSE,			/*follow min branch?	*/
+    FALSE,			/*follow max branch?	*/
+    H5F_istore_remove,          /*remove		*/
+    H5F_istore_iterate,		/*iterator		*/
+    H5F_istore_decode_key,	/*decode		*/
+    H5F_istore_encode_key,	/*encode		*/
+    H5F_istore_debug_key,	/*debug			*/
+    H5F_istore_prune_extent,	/*remove chunks, upon H5Dset_extend call */
 }};
 
 #define H5F_HASH_DIVISOR 8     /* Attempt to spread out the hashing */
@@ -2790,7 +2787,7 @@ static H5B_ins_t H5F_istore_remove( H5F_t *f,
                                    hbool_t *rt_key_changed  /*out*/)
 {
  H5F_istore_key_t *lt_key = (H5F_istore_key_t*)_lt_key;
- H5FD_free(f->shared->lf, H5FD_MEM_DRAW, addr, lt_key->nbytes);
+ H5FD_free(f->shared->lf, H5FD_MEM_DRAW, addr, (hsize_t)lt_key->nbytes);
  *lt_key_changed = FALSE;
  *rt_key_changed = FALSE;
  return H5B_INS_REMOVE;
diff --git a/src/H5Gnode.c b/src/H5Gnode.c
index 99f0211..2662165 100644
--- a/src/H5Gnode.c
+++ b/src/H5Gnode.c
@@ -94,6 +94,7 @@ H5B_class_t H5B_SNODE[1] = {{
     H5G_node_decode_key,	/*decode		*/
     H5G_node_encode_key,	/*encode		*/
     NULL,			/*debug key		*/
+    NULL,	  	        /*remove chunks, upon H5Dset_extend call */
 }};
 
 /* Interface initialization */
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index bb2edd6..a32efa4 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -2175,9 +2175,9 @@ H5T_conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
     size_t	src_base_size, dst_base_size;/*source & destination base size*/
     size_t	src_size, dst_size;     /*source & destination total size in bytes*/
     void	*conv_buf=NULL;     	/*temporary conversion buffer 	     */
-    hsize_t	conv_buf_size=0;  	/*size of conversion buffer in bytes */
+    size_t	conv_buf_size=0;  	/*size of conversion buffer in bytes */
     void	*bkg_buf=NULL;     	/*temporary background buffer 	     */
-    hsize_t	bkg_buf_size=0;	        /*size of background buffer in bytes */
+    size_t	bkg_buf_size=0;	        /*size of background buffer in bytes */
     uint8_t	dbuf[64],*dbuf_ptr=dbuf;/*temp destination buffer	     */
     int	        direction;		/*direction of traversal	     */
     hsize_t	elmtno;			/*element number counter	     */
@@ -2409,7 +2409,7 @@ H5T_conv_array(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
     hsize_t	elmtno;			/*element number counter	     */
     int         i;                      /* local index variable */
     void	*bkg_buf=NULL;     	/*temporary background buffer 	     */
-    hsize_t	bkg_buf_size=0;	        /*size of background buffer in bytes */
+    size_t	bkg_buf_size=0;	        /*size of background buffer in bytes */
 
     FUNC_ENTER (H5T_conv_array, FAIL);