[svn-r6398] Purpose:

    Code cleanup

Description:
    Clean up some compiler warnings

Platforms tested:
    FreeBSD 4.7 (sleipnir)

25 files changed, 50 insertions, 47 deletions

diff --git a/src/H5Distore.c b/src/H5Distore.c
index 7a2efa1..352a1d5 100644
--- a/src/H5Distore.c
+++ b/src/H5Distore.c
@@ -387,7 +387,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static int
-H5F_istore_cmp2(H5F_t UNUSED *f, hid_t dxpl_id, void *_lt_key, void *_udata,
+H5F_istore_cmp2(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_lt_key, void *_udata,
 		void *_rt_key)
 {
     H5F_istore_key_t	*lt_key = (H5F_istore_key_t *) _lt_key;
@@ -440,7 +440,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static int
-H5F_istore_cmp3(H5F_t UNUSED *f, hid_t dxpl_id, void *_lt_key, void *_udata,
+H5F_istore_cmp3(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_lt_key, void *_udata,
 		void *_rt_key)
 {
     H5F_istore_key_t	*lt_key = (H5F_istore_key_t *) _lt_key;
@@ -574,7 +574,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5F_istore_found(H5F_t UNUSED *f, hid_t dxpl_id, haddr_t addr, const void *_lt_key,
+H5F_istore_found(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, haddr_t addr, const void *_lt_key,
 		 void *_udata, const void UNUSED *_rt_key)
 {
     H5F_istore_ud1_t	   *udata = (H5F_istore_ud1_t *) _udata;
@@ -773,7 +773,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static H5B_iterate_t 
-H5F_istore_iter_allocated (H5F_t UNUSED *f, hid_t dxpl_id, void *_lt_key, haddr_t UNUSED addr,
+H5F_istore_iter_allocated (H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_lt_key, haddr_t UNUSED addr,
 		    void UNUSED *_rt_key, void *_udata)
 {
     H5F_istore_ud1_t	*bt_udata = (H5F_istore_ud1_t *)_udata;
@@ -809,7 +809,7 @@ H5F_istore_iter_allocated (H5F_t UNUSED *f, hid_t dxpl_id, void *_lt_key, haddr_
  *-------------------------------------------------------------------------
  */
 static H5B_iterate_t
-H5F_istore_iter_dump (H5F_t UNUSED *f, hid_t dxpl_id, void *_lt_key, haddr_t UNUSED addr,
+H5F_istore_iter_dump (H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_lt_key, haddr_t UNUSED addr,
 		    void UNUSED *_rt_key, void *_udata)
 {
     H5F_istore_ud1_t	*bt_udata = (H5F_istore_ud1_t *)_udata;
diff --git a/src/H5FDcore.c b/src/H5FDcore.c
index 9ea8ada..a57dc4d 100644
--- a/src/H5FDcore.c
+++ b/src/H5FDcore.c
@@ -753,7 +753,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_core_flush(H5FD_t *_file, hid_t dxpl_id, unsigned UNUSED closing)
+H5FD_core_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned UNUSED closing)
 {
     H5FD_core_t	*file = (H5FD_core_t*)_file;
     herr_t      ret_value=SUCCEED;       /* Return value */
diff --git a/src/H5FDfphdf5.c b/src/H5FDfphdf5.c
index 2eddc55..63df283 100644
--- a/src/H5FDfphdf5.c
+++ b/src/H5FDfphdf5.c
@@ -1741,7 +1741,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_fphdf5_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing)
+H5FD_fphdf5_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned closing)
 {
 #if 0
     H5FP_fphdf5_t		*file = (H5FP_fphdf5_t*)_file;
diff --git a/src/H5FDlog.c b/src/H5FDlog.c
index ecf98ce..584f4af 100644
--- a/src/H5FDlog.c
+++ b/src/H5FDlog.c
@@ -820,7 +820,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static haddr_t
-H5FD_log_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
+H5FD_log_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t UNUSED dxpl_id, hsize_t size)
 {
     H5FD_log_t	*file = (H5FD_log_t*)_file;
     haddr_t		addr;
@@ -1296,7 +1296,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_log_flush(H5FD_t *_file, hid_t dxpl_id, unsigned UNUSED closing)
+H5FD_log_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned UNUSED closing)
 {
     H5FD_log_t	*file = (H5FD_log_t*)_file;
     herr_t      ret_value=SUCCEED;       /* Return value */
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index 6f49e24..197dca5 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -1853,7 +1853,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_mpio_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing)
+H5FD_mpio_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned closing)
 {
     H5FD_mpio_t		*file = (H5FD_mpio_t*)_file;
     int			mpi_code;	/* mpi return code */
diff --git a/src/H5FDmpiposix.c b/src/H5FDmpiposix.c
index ee566e7..ae92477 100644
--- a/src/H5FDmpiposix.c
+++ b/src/H5FDmpiposix.c
@@ -1266,7 +1266,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_mpiposix_flush(H5FD_t *_file, hid_t dxpl_id, unsigned UNUSED closing)
+H5FD_mpiposix_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned UNUSED closing)
 {
     H5FD_mpiposix_t	*file = (H5FD_mpiposix_t*)_file;
 #ifdef WIN32
diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c
index 5b82cb4..12ff45c 100644
--- a/src/H5FDsec2.c
+++ b/src/H5FDsec2.c
@@ -780,7 +780,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_sec2_flush(H5FD_t *_file, hid_t dxpl_id, unsigned UNUSED closing)
+H5FD_sec2_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned UNUSED closing)
 {
     H5FD_sec2_t	*file = (H5FD_sec2_t*)_file;
 #ifdef WIN32
diff --git a/src/H5FDstdio.c b/src/H5FDstdio.c
index 3b9aa41..89cc8ea 100644
--- a/src/H5FDstdio.c
+++ b/src/H5FDstdio.c
@@ -836,6 +836,9 @@ H5FD_stdio_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing)
     H5FD_stdio_t	*file = (H5FD_stdio_t*)_file;
     static const char *func="H5FD_stdio_flush";  /* Function Name for error reporting */
 
+    /* Shut compiler up */
+    dxpl_id=dxpl_id;
+
     /* Clear the error stack */
     H5Eclear();
 
diff --git a/src/H5FDstream.c b/src/H5FDstream.c
index 680d969..e010d69 100644
--- a/src/H5FDstream.c
+++ b/src/H5FDstream.c
@@ -693,7 +693,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_stream_flush (H5FD_t *_stream, hid_t dxpl_id, unsigned UNUSED closing)
+H5FD_stream_flush (H5FD_t *_stream, hid_t UNUSED dxpl_id, unsigned UNUSED closing)
 {
   H5FD_stream_t *stream = (H5FD_stream_t *) _stream;
   size_t size;
diff --git a/src/H5Fistore.c b/src/H5Fistore.c
index 7a2efa1..352a1d5 100644
--- a/src/H5Fistore.c
+++ b/src/H5Fistore.c
@@ -387,7 +387,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static int
-H5F_istore_cmp2(H5F_t UNUSED *f, hid_t dxpl_id, void *_lt_key, void *_udata,
+H5F_istore_cmp2(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_lt_key, void *_udata,
 		void *_rt_key)
 {
     H5F_istore_key_t	*lt_key = (H5F_istore_key_t *) _lt_key;
@@ -440,7 +440,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static int
-H5F_istore_cmp3(H5F_t UNUSED *f, hid_t dxpl_id, void *_lt_key, void *_udata,
+H5F_istore_cmp3(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_lt_key, void *_udata,
 		void *_rt_key)
 {
     H5F_istore_key_t	*lt_key = (H5F_istore_key_t *) _lt_key;
@@ -574,7 +574,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5F_istore_found(H5F_t UNUSED *f, hid_t dxpl_id, haddr_t addr, const void *_lt_key,
+H5F_istore_found(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, haddr_t addr, const void *_lt_key,
 		 void *_udata, const void UNUSED *_rt_key)
 {
     H5F_istore_ud1_t	   *udata = (H5F_istore_ud1_t *) _udata;
@@ -773,7 +773,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static H5B_iterate_t 
-H5F_istore_iter_allocated (H5F_t UNUSED *f, hid_t dxpl_id, void *_lt_key, haddr_t UNUSED addr,
+H5F_istore_iter_allocated (H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_lt_key, haddr_t UNUSED addr,
 		    void UNUSED *_rt_key, void *_udata)
 {
     H5F_istore_ud1_t	*bt_udata = (H5F_istore_ud1_t *)_udata;
@@ -809,7 +809,7 @@ H5F_istore_iter_allocated (H5F_t UNUSED *f, hid_t dxpl_id, void *_lt_key, haddr_
  *-------------------------------------------------------------------------
  */
 static H5B_iterate_t
-H5F_istore_iter_dump (H5F_t UNUSED *f, hid_t dxpl_id, void *_lt_key, haddr_t UNUSED addr,
+H5F_istore_iter_dump (H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_lt_key, haddr_t UNUSED addr,
 		    void UNUSED *_rt_key, void *_udata)
 {
     H5F_istore_ud1_t	*bt_udata = (H5F_istore_ud1_t *)_udata;
diff --git a/src/H5Obogus.c b/src/H5Obogus.c
index 9609834..17c4da1 100644
--- a/src/H5Obogus.c
+++ b/src/H5Obogus.c
@@ -198,7 +198,7 @@ H5O_bogus_size(H5F_t UNUSED *f, const void UNUSED *mesg)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_bogus_debug(H5F_t UNUSED *f, hid_t dxpl_id, const void *_mesg, FILE *stream,
+H5O_bogus_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *stream,
 	       int indent, int fwidth)
 {
     const H5O_bogus_t	*mesg = (const H5O_bogus_t *)_mesg;
diff --git a/src/H5Ocont.c b/src/H5Ocont.c
index 673cc75..d7979c1 100644
--- a/src/H5Ocont.c
+++ b/src/H5Ocont.c
@@ -69,7 +69,7 @@ static int             interface_initialize_g = 0;
  *-------------------------------------------------------------------------
  */
 static void *
-H5O_cont_decode(H5F_t *f, hid_t dxpl_id, const uint8_t *p, H5O_shared_t UNUSED *sh)
+H5O_cont_decode(H5F_t *f, hid_t UNUSED dxpl_id, const uint8_t *p, H5O_shared_t UNUSED *sh)
 {
     H5O_cont_t             *cont = NULL;
     void                   *ret_value;
@@ -148,7 +148,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_cont_debug(H5F_t UNUSED *f, hid_t dxpl_id, const void *_mesg, FILE * stream,
+H5O_cont_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE * stream,
 	       int indent, int fwidth)
 {
     const H5O_cont_t       *cont = (const H5O_cont_t *) _mesg;
diff --git a/src/H5Odtype.c b/src/H5Odtype.c
index 8ec160e..3736d12 100644
--- a/src/H5Odtype.c
+++ b/src/H5Odtype.c
@@ -783,7 +783,7 @@ done:
     function using malloc() and is returned to the caller.
 --------------------------------------------------------------------------*/
 static void *
-H5O_dtype_decode(H5F_t *f, hid_t dxpl_id, const uint8_t *p,
+H5O_dtype_decode(H5F_t *f, hid_t UNUSED dxpl_id, const uint8_t *p,
 		 H5O_shared_t UNUSED *sh)
 {
     H5T_t		   *dt = NULL;
diff --git a/src/H5Oefl.c b/src/H5Oefl.c
index 67202f3..4af7828 100644
--- a/src/H5Oefl.c
+++ b/src/H5Oefl.c
@@ -582,7 +582,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_efl_debug(H5F_t UNUSED *f, hid_t dxpl_id, const void *_mesg, FILE * stream,
+H5O_efl_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE * stream,
 	      int indent, int fwidth)
 {
     const H5O_efl_t	   *mesg = (const H5O_efl_t *) _mesg;
diff --git a/src/H5Ofill.c b/src/H5Ofill.c
index 1314433..3172538 100644
--- a/src/H5Ofill.c
+++ b/src/H5Ofill.c
@@ -100,7 +100,7 @@ H5FL_DEFINE(H5O_fill_t);
  *-------------------------------------------------------------------------
  */
 static void *
-H5O_fill_new_decode(H5F_t UNUSED *f, hid_t dxpl_id, const uint8_t *p,
+H5O_fill_new_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const uint8_t *p,
 		H5O_shared_t UNUSED *sh)
 {
     H5O_fill_new_t	*mesg=NULL;
@@ -170,7 +170,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static void *
-H5O_fill_decode(H5F_t UNUSED *f, hid_t dxpl_id, const uint8_t *p,
+H5O_fill_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const uint8_t *p,
                 H5O_shared_t UNUSED *sh)
 {
     H5O_fill_t  *mesg=NULL;
@@ -664,7 +664,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_fill_new_debug(H5F_t UNUSED *f, hid_t dxpl_id, const void *_mesg, FILE *stream,
+H5O_fill_new_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *stream,
 	       int indent, int fwidth)
 {
     const H5O_fill_new_t	*mesg = (const H5O_fill_new_t *)_mesg;
@@ -708,7 +708,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_fill_debug(H5F_t UNUSED *f, hid_t dxpl_id, const void *_mesg, FILE *stream,
+H5O_fill_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *stream,
 	       int indent, int fwidth)
 {
     const H5O_fill_t	*mesg = (const H5O_fill_t *)_mesg;
diff --git a/src/H5Olayout.c b/src/H5Olayout.c
index 1b353c1..49cf7f6 100644
--- a/src/H5Olayout.c
+++ b/src/H5Olayout.c
@@ -78,7 +78,7 @@ H5FL_DEFINE(H5O_layout_t);
  *-------------------------------------------------------------------------
  */
 static void *
-H5O_layout_decode(H5F_t *f, hid_t dxpl_id, const uint8_t *p, H5O_shared_t UNUSED *sh)
+H5O_layout_decode(H5F_t *f, hid_t UNUSED dxpl_id, const uint8_t *p, H5O_shared_t UNUSED *sh)
 {
     H5O_layout_t           *mesg = NULL;
     int                    version;
@@ -445,7 +445,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_layout_debug(H5F_t UNUSED *f, hid_t dxpl_id, const void *_mesg, FILE * stream,
+H5O_layout_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE * stream,
 		 int indent, int fwidth)
 {
     const H5O_layout_t     *mesg = (const H5O_layout_t *) _mesg;
diff --git a/src/H5Omtime.c b/src/H5Omtime.c
index 15caf80..438a555 100644
--- a/src/H5Omtime.c
+++ b/src/H5Omtime.c
@@ -99,7 +99,7 @@ H5FL_DEFINE(time_t);
  *-------------------------------------------------------------------------
  */
 static void *
-H5O_mtime_new_decode(H5F_t UNUSED *f, hid_t dxpl_id, const uint8_t *p,
+H5O_mtime_new_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const uint8_t *p,
 		 H5O_shared_t UNUSED *sh)
 {
     time_t	*mesg, the_time;
@@ -156,7 +156,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static void *
-H5O_mtime_decode(H5F_t UNUSED *f, hid_t dxpl_id, const uint8_t *p,
+H5O_mtime_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const uint8_t *p,
 		 H5O_shared_t UNUSED *sh)
 {
     time_t	*mesg, the_time;
@@ -537,7 +537,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_mtime_debug(H5F_t UNUSED *f, hid_t dxpl_id, const void *_mesg, FILE *stream,
+H5O_mtime_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *stream,
 		int indent, int fwidth)
 {
     const time_t	*mesg = (const time_t *)_mesg;
diff --git a/src/H5Oname.c b/src/H5Oname.c
index c5c47fb..aafe50f 100644
--- a/src/H5Oname.c
+++ b/src/H5Oname.c
@@ -70,7 +70,7 @@ static int interface_initialize_g = 0;
  *-------------------------------------------------------------------------
  */
 static void *
-H5O_name_decode(H5F_t UNUSED *f, hid_t dxpl_id, const uint8_t *p,
+H5O_name_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const uint8_t *p,
 		H5O_shared_t UNUSED *sh)
 {
     H5O_name_t          *mesg;
@@ -273,7 +273,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_name_debug(H5F_t UNUSED *f, hid_t dxpl_id, const void *_mesg, FILE *stream,
+H5O_name_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *stream,
 	       int indent, int fwidth)
 {
     const H5O_name_t	*mesg = (const H5O_name_t *)_mesg;
diff --git a/src/H5Opline.c b/src/H5Opline.c
index d6284b0..e934591 100644
--- a/src/H5Opline.c
+++ b/src/H5Opline.c
@@ -67,7 +67,7 @@ H5FL_DEFINE(H5O_pline_t);
  *-------------------------------------------------------------------------
  */
 static void *
-H5O_pline_decode(H5F_t UNUSED *f, hid_t dxpl_id, const uint8_t *p,
+H5O_pline_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const uint8_t *p,
 		H5O_shared_t UNUSED *sh)
 {
     H5O_pline_t		*pline = NULL;
@@ -437,7 +437,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_pline_debug (H5F_t UNUSED *f, hid_t dxpl_id, const void *mesg, FILE *stream,
+H5O_pline_debug (H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *mesg, FILE *stream,
 		int indent, int fwidth)
 {
     const H5O_pline_t	*pline = (const H5O_pline_t *)mesg;
diff --git a/src/H5Oplist.c b/src/H5Oplist.c
index 7c36136..2f4246f 100644
--- a/src/H5Oplist.c
+++ b/src/H5Oplist.c
@@ -131,7 +131,7 @@ H5FL_EXTERN(H5P_genplist_t);
  * Modifications:
  */
 static void *
-H5O_plist_decode(H5F_t UNUSED *f, hid_t dxpl_id, const uint8_t *p, H5O_shared_t UNUSED *sh)
+H5O_plist_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const uint8_t *p, H5O_shared_t UNUSED *sh)
 {
     H5P_genplist_t *new_plist = NULL;
     H5P_genclass_t *pclass; /* property list class to modify        */
@@ -483,7 +483,7 @@ done:
  * Modifications:
  */
 static herr_t
-H5O_plist_debug(H5F_t UNUSED *f, hid_t dxpl_id, const void *mesg, FILE *stream,
+H5O_plist_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *mesg, FILE *stream,
                 int indent, int fwidth)
 {
     const H5P_genplist_t *plist = (const H5P_genplist_t *)mesg;
diff --git a/src/H5Osdspace.c b/src/H5Osdspace.c
index ada1850..2778826 100644
--- a/src/H5Osdspace.c
+++ b/src/H5Osdspace.c
@@ -90,7 +90,7 @@ H5FL_ARR_EXTERN(hsize_t);
         Added a version number and reformatted the message for aligment.
 --------------------------------------------------------------------------*/
 static void *
-H5O_sdspace_decode(H5F_t *f, hid_t dxpl_id, const uint8_t *p, H5O_shared_t UNUSED *sh)
+H5O_sdspace_decode(H5F_t *f, hid_t UNUSED dxpl_id, const uint8_t *p, H5O_shared_t UNUSED *sh)
 {
     H5S_simple_t	*sdim = NULL;/* New simple dimensionality structure */
     void		*ret_value;
@@ -414,7 +414,7 @@ done:
     parameter.
 --------------------------------------------------------------------------*/
 static herr_t
-H5O_sdspace_debug(H5F_t UNUSED *f, hid_t dxpl_id, const void *mesg,
+H5O_sdspace_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *mesg,
 		  FILE * stream, int indent, int fwidth)
 {
     const H5S_simple_t	   *sdim = (const H5S_simple_t *) mesg;
diff --git a/src/H5Oshared.c b/src/H5Oshared.c
index cb68ddb..e9e844e 100644
--- a/src/H5Oshared.c
+++ b/src/H5Oshared.c
@@ -66,7 +66,7 @@ static int interface_initialize_g = 0;
  *-------------------------------------------------------------------------
  */
 static void *
-H5O_shared_decode (H5F_t *f, hid_t dxpl_id, const uint8_t *buf, H5O_shared_t UNUSED *sh)
+H5O_shared_decode (H5F_t *f, hid_t UNUSED dxpl_id, const uint8_t *buf, H5O_shared_t UNUSED *sh)
 {
     H5O_shared_t	*mesg=NULL;
     unsigned		flags, version;
diff --git a/src/H5Ostab.c b/src/H5Ostab.c
index 24bba2e..d90b517 100644
--- a/src/H5Ostab.c
+++ b/src/H5Ostab.c
@@ -75,7 +75,7 @@ H5FL_DEFINE_STATIC(H5O_stab_t);
  *-------------------------------------------------------------------------
  */
 static void *
-H5O_stab_decode(H5F_t *f, hid_t dxpl_id, const uint8_t *p, H5O_shared_t UNUSED *sh)
+H5O_stab_decode(H5F_t *f, hid_t UNUSED dxpl_id, const uint8_t *p, H5O_shared_t UNUSED *sh)
 {
     H5O_stab_t          *stab=NULL;
     void                *ret_value;     /* Return value */
@@ -315,7 +315,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_stab_debug(H5F_t UNUSED *f, hid_t dxpl_id, const void *_mesg, FILE * stream,
+H5O_stab_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE * stream,
 	       int indent, int fwidth)
 {
     const H5O_stab_t       *stab = (const H5O_stab_t *) _mesg;
diff --git a/src/H5Tvlen.c b/src/H5Tvlen.c
index fbb0d0a..7ec053b 100644
--- a/src/H5Tvlen.c
+++ b/src/H5Tvlen.c
@@ -309,7 +309,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T_vlen_seq_mem_read(H5F_t UNUSED *f, hid_t dxpl_id, void *vl_addr, void *buf, size_t len)
+H5T_vlen_seq_mem_read(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *vl_addr, void *buf, size_t len)
 {
     hvl_t *vl=(hvl_t *)vl_addr;   /* Pointer to the user's hvl_t information */
     herr_t ret_value=SUCCEED;   /* Return value */
@@ -446,7 +446,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5T_vlen_str_mem_read(H5F_t UNUSED *f, hid_t dxpl_id, void *vl_addr, void *buf, size_t len)
+H5T_vlen_str_mem_read(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *vl_addr, void *buf, size_t len)
 {
     char *s=*(char **)vl_addr;   /* Pointer to the user's hvl_t information */
     herr_t ret_value=SUCCEED;   /* Return value */
@@ -459,7 +459,7 @@ H5T_vlen_str_mem_read(H5F_t UNUSED *f, hid_t dxpl_id, void *vl_addr, void *buf,
 
     if(s && buf && len>0)
         HDmemcpy(buf,s,len);
-    if(!s && len==-1)
+    if(!s && len==(size_t)-1)
         buf = NULL;
 
 done:
diff --git a/src/H5Zadler32.c b/src/H5Zadler32.c
index 53ce12d..9f380e5 100644
--- a/src/H5Zadler32.c
+++ b/src/H5Zadler32.c
@@ -72,7 +72,7 @@ static unsigned int H5Z_filter_adler32_compute(unsigned char *buf, size_t len)
  *-------------------------------------------------------------------------
  */
 size_t
-H5Z_filter_adler32 (unsigned flags, size_t cd_nelmts, const unsigned cd_values[], 
+H5Z_filter_adler32 (unsigned flags, size_t UNUSED cd_nelmts, const unsigned UNUSED cd_values[], 
                      size_t nbytes, size_t *buf_size, void **buf)
 {
     size_t	ret_value = 0;