[svn-r5219] Purpose:

    Code cleanup

Description:
    Clean up warnings from gcc 3.1

Platforms tested:
    FreeBSD 4.5 (sleipnir)

13 files changed, 18 insertions, 17 deletions

diff --git a/src/H5D.c b/src/H5D.c
index 3a0d024..e1ded37 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -2308,7 +2308,7 @@ printf("%s: check 1.0, nelmts=%d, H5S_get_select_npoints(file_space)=%d\n",FUNC,
     if(H5P_get(dc_plist, H5D_CRT_DATA_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't retrieve data pipeline");
     if(H5P_fill_value_defined(dc_plist, &fill_status)<0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't tell if fill value defined");
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't tell if fill value defined");
     if((fill_status==H5D_FILL_VALUE_DEFAULT || fill_status==H5D_FILL_VALUE_USER_DEFINED) && H5P_get(dc_plist, H5D_CRT_FILL_VALUE_NAME, &fill) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL,"can't retrieve fill value");
     if(H5P_get(dc_plist, H5D_CRT_FILL_TIME_NAME, &fill_time) < 0)
@@ -3387,6 +3387,7 @@ H5D_init_storage(H5D_t *dset, const H5S_t *space)
                 if ((buf=H5FL_BLK_ALLOC(fill_conv,bufsize,0))==NULL)
                     HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for fill buffer");
 
+                /* Fill the buffer with the fill value */
                 H5V_array_fill(buf, fill.buf, fill.size, ptsperbuf);
                 
                 /* Start at the beginning of the dataset */
diff --git a/src/H5Distore.c b/src/H5Distore.c
index da816af..d2cb490 100644
--- a/src/H5Distore.c
+++ b/src/H5Distore.c
@@ -665,7 +665,7 @@ H5F_istore_new_node(H5F_t *f, H5B_ins_t op,
  */
 static herr_t
 H5F_istore_found(H5F_t UNUSED *f, haddr_t addr, const void *_lt_key,
-		 void *_udata, const void * UNUSED _rt_key)
+		 void *_udata, const void UNUSED *_rt_key)
 {
     H5F_istore_ud1_t	   *udata = (H5F_istore_ud1_t *) _udata;
     const H5F_istore_key_t *lt_key = (const H5F_istore_key_t *) _lt_key;
diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c
index 3f40b22..7c1bfab 100644
--- a/src/H5FDfamily.c
+++ b/src/H5FDfamily.c
@@ -670,7 +670,7 @@ H5FD_family_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_family_query(const H5FD_t * UNUSED _f, unsigned long *flags /* out */)
+H5FD_family_query(const H5FD_t UNUSED * _f, unsigned long *flags /* out */)
 {
     herr_t ret_value=SUCCEED;
 
diff --git a/src/H5FDlog.c b/src/H5FDlog.c
index 63f2dec..0e4a094 100644
--- a/src/H5FDlog.c
+++ b/src/H5FDlog.c
@@ -755,7 +755,7 @@ H5FD_log_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_log_query(const H5FD_t * UNUSED _f, unsigned long *flags /* out */)
+H5FD_log_query(const H5FD_t UNUSED * _f, unsigned long *flags /* out */)
 {
     herr_t ret_value=SUCCEED;
 
diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c
index 026f27a..986906d 100644
--- a/src/H5FDsec2.c
+++ b/src/H5FDsec2.c
@@ -431,7 +431,7 @@ H5FD_sec2_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_sec2_query(const H5FD_t * UNUSED _f, unsigned long *flags /* out */)
+H5FD_sec2_query(const H5FD_t UNUSED * _f, unsigned long *flags /* out */)
 {
     herr_t ret_value=SUCCEED;
 
diff --git a/src/H5Fistore.c b/src/H5Fistore.c
index da816af..d2cb490 100644
--- a/src/H5Fistore.c
+++ b/src/H5Fistore.c
@@ -665,7 +665,7 @@ H5F_istore_new_node(H5F_t *f, H5B_ins_t op,
  */
 static herr_t
 H5F_istore_found(H5F_t UNUSED *f, haddr_t addr, const void *_lt_key,
-		 void *_udata, const void * UNUSED _rt_key)
+		 void *_udata, const void UNUSED *_rt_key)
 {
     H5F_istore_ud1_t	   *udata = (H5F_istore_ud1_t *) _udata;
     const H5F_istore_key_t *lt_key = (const H5F_istore_key_t *) _lt_key;
diff --git a/src/H5Gnode.c b/src/H5Gnode.c
index 2662165..d4b3df2 100644
--- a/src/H5Gnode.c
+++ b/src/H5Gnode.c
@@ -130,7 +130,7 @@ H5FL_BLK_DEFINE_STATIC(symbol_node);
  *-------------------------------------------------------------------------
  */
 static size_t
-H5G_node_sizeof_rkey(H5F_t *f, const void * UNUSED udata)
+H5G_node_sizeof_rkey(H5F_t *f, const void UNUSED * udata)
 {
     return H5F_SIZEOF_SIZE(f);	/*the name offset */
 }
@@ -627,8 +627,8 @@ H5G_node_cmp3(H5F_t *f, void *_lt_key, void *_udata, void *_rt_key)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5G_node_found(H5F_t *f, haddr_t addr, const void * UNUSED _lt_key,
-	       void *_udata, const void * UNUSED _rt_key)
+H5G_node_found(H5F_t *f, haddr_t addr, const void UNUSED *_lt_key,
+	       void *_udata, const void UNUSED *_rt_key)
 {
     H5G_bt_ud1_t	*bt_udata = (H5G_bt_ud1_t *) _udata;
     H5G_node_t		*sn = NULL;
diff --git a/src/H5Oshared.c b/src/H5Oshared.c
index 01dd480..1b8b423 100644
--- a/src/H5Oshared.c
+++ b/src/H5Oshared.c
@@ -178,7 +178,7 @@ H5O_shared_encode (H5F_t *f, uint8_t *buf/*out*/, const void *_mesg)
  *-------------------------------------------------------------------------
  */
 static size_t
-H5O_shared_size (H5F_t *f, const void * UNUSED _mesg)
+H5O_shared_size (H5F_t *f, const void UNUSED *_mesg)
 {
     size_t	size;
     
diff --git a/src/H5Ostab.c b/src/H5Ostab.c
index 0a9d46b..cec6c6f 100644
--- a/src/H5Ostab.c
+++ b/src/H5Ostab.c
@@ -233,7 +233,7 @@ H5O_stab_copy(const void *_mesg, void *_dest)
  *-------------------------------------------------------------------------
  */
 static size_t
-H5O_stab_size(H5F_t *f, const void * UNUSED _mesg)
+H5O_stab_size(H5F_t *f, const void UNUSED *_mesg)
 {
     FUNC_ENTER(H5O_stab_size, 0);
     FUNC_LEAVE(2 * H5F_SIZEOF_ADDR(f));
diff --git a/src/H5Sall.c b/src/H5Sall.c
index 1afba52..a511cb8 100644
--- a/src/H5Sall.c
+++ b/src/H5Sall.c
@@ -817,7 +817,7 @@ H5S_all_select_serialize (const H5S_t *space, uint8_t *buf)
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5S_all_select_deserialize (H5S_t *space, const uint8_t * UNUSED buf)
+H5S_all_select_deserialize (H5S_t *space, const uint8_t UNUSED *buf)
 {
     herr_t ret_value=FAIL;  /* return value */
 
diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index d5a35fa..30a1331 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -6278,7 +6278,7 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_hyper_select_iterate_mem_opt(H5S_sel_iter_t * UNUSED iter, void *buf, hid_t type_id, H5S_t *space, H5D_operator_t op,
+H5S_hyper_select_iterate_mem_opt(H5S_sel_iter_t UNUSED *iter, void *buf, hid_t type_id, H5S_t *space, H5D_operator_t op,
         void *op_data)
 {
     H5S_hyper_dim_t *diminfo;               /* Alias for dataspace's diminfo information */
diff --git a/src/H5Snone.c b/src/H5Snone.c
index ed92f13..c440eea 100644
--- a/src/H5Snone.c
+++ b/src/H5Snone.c
@@ -83,7 +83,7 @@ H5S_none_select_serialize (const H5S_t *space, uint8_t *buf)
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5S_none_select_deserialize (H5S_t *space, const uint8_t * UNUSED buf)
+H5S_none_select_deserialize (H5S_t *space, const uint8_t UNUSED *buf)
 {
     herr_t ret_value=FAIL;  /* return value */
 
@@ -207,7 +207,7 @@ done:
 --------------------------------------------------------------------------*/
 herr_t
 H5S_none_select_iterate(void * UNUSED buf, hid_t UNUSED type_id, H5S_t * UNUSED space, H5D_operator_t UNUSED op,
-        void * UNUSED operator_data)
+        void UNUSED *operator_data)
 {
     herr_t ret_value=SUCCEED;      /* return value */
 
diff --git a/src/H5T.c b/src/H5T.c
index c74cb29..684181a 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -1926,7 +1926,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static int
-H5T_unlock_cb (void *_dt, hid_t UNUSED id,  const void * UNUSED key)
+H5T_unlock_cb (void *_dt, hid_t UNUSED id,  const void UNUSED *key)
 {
     H5T_t	*dt = (H5T_t *)_dt;
     
@@ -4099,7 +4099,7 @@ H5Tget_member_index(hid_t type_id, const char *name)
     int         ret_value = FAIL;
     int         nmembs, i;
 
-    FUNC_ENTER(H5Tget_member_index, NULL);
+    FUNC_ENTER(H5Tget_member_index, FAIL);
     H5TRACE2("Is","is",type_id,name);
 
     /* Check arguments */