[svn-r1759] Corrected a few more compiler warnings.

4 files changed, 24 insertions, 24 deletions

diff --git a/src/H5D.c b/src/H5D.c
index 2ed2565..1501ce3 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -2870,7 +2870,7 @@ herr_t
 H5Dvlen_get_buf_size(hid_t dataset_id, hid_t type_id, hid_t space_id,
         hsize_t *size)
 {
-    H5T_vlen_bufsize_t vlen_bufsize = {0, 0, 0, 0, 0, 0};
+    H5T_vlen_bufsize_t vlen_bufsize = {0, 0, 0, 0, 0, 0, 0};
     char bogus;         /* bogus value to pass to H5Diterate() */
     herr_t ret_value=FAIL;
 
diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c
index fab72f6..d04c9ab 100644
--- a/src/H5FDfamily.c
+++ b/src/H5FDfamily.c
@@ -642,7 +642,7 @@ static haddr_t
 H5FD_family_get_eof(H5FD_t *_file)
 {
     H5FD_family_t	*file = (H5FD_family_t*)_file;
-    haddr_t		eof;
+    haddr_t		eof=0;
     int			i;
 
     /*
diff --git a/src/H5Sall.c b/src/H5Sall.c
index 5800509..525e9e2 100644
--- a/src/H5Sall.c
+++ b/src/H5Sall.c
@@ -556,7 +556,7 @@ H5S_all_read(H5F_t *f, const H5O_layout_t *layout, const H5O_pline_t *pline,
 	     const H5S_t *mem_space, hid_t dxpl_id, void *buf/*out*/,
 	     hbool_t *must_convert/*out*/)
 {
-    H5S_hyper_node_t *file_node,*mem_node;     /* Hyperslab node */
+    H5S_hyper_node_t *file_node=NULL,*mem_node=NULL;     /* Hyperslab node */
     hsize_t	mem_size,file_size;
     hssize_t	file_off,mem_off;
     hsize_t	size[H5S_MAX_RANK];
@@ -662,7 +662,7 @@ H5S_all_write(H5F_t *f, const struct H5O_layout_t *layout,
 	      const H5S_t *mem_space, hid_t dxpl_id, const void *buf,
 	      hbool_t *must_convert/*out*/)
 {
-    H5S_hyper_node_t *file_node,*mem_node;     /* Hyperslab node */
+    H5S_hyper_node_t *file_node=NULL,*mem_node=NULL;     /* Hyperslab node */
     hsize_t	mem_size,file_size;
     hssize_t	file_off,mem_off;
     hsize_t	size[H5S_MAX_RANK];
@@ -972,7 +972,7 @@ H5S_all_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t op
     hsize_t nelemts;            /* Number of elements to iterate through */
     void *tmp_buf;              /* temporary location of the element in the buffer */
     intn rank;              /* Dataspace rank */
-    intn index;             /* Index to increment */
+    intn indx;              /* Index to increment */
     herr_t ret_value=0;     /* return value */
 
     FUNC_ENTER (H5S_all_select_iterate, 0);
@@ -1007,10 +1007,10 @@ H5S_all_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t op
         nelemts--;
 
         /* Advance the coordinate (currently in C memory order) */
-        index=rank-1; /* Leave the byte offset in the element alone */
-        while(index>=0 && ++mem_offset[index]==mem_size[index]) {
-            mem_offset[index]=0;
-            index--;
+        indx=rank-1; /* Leave the byte offset in the element alone */
+        while(indx>=0 && ++mem_offset[indx]==mem_size[indx]) {
+            mem_offset[indx]=0;
+            indx--;
           } /* end while */
       } /* end while */
 
diff --git a/tools/h5dump.c b/tools/h5dump.c
index fd4fcaa..13acbc9 100644
--- a/tools/h5dump.c
+++ b/tools/h5dump.c
@@ -1288,21 +1288,21 @@ dump_data (hid_t obj_id, int obj_data) {
  *
  *-----------------------------------------------------------------------*/
 int
-main(int argc, char *argv[]) {
-hid_t fid, gid, dsetid, typeid;
-hid_t plist=H5P_DEFAULT;
-const char *fname = NULL;
-int i, index, curr_arg, display_bb=0, display_all=1, newwidth= 0;
-int nopts=0, *opts;
-char *buf, name[128], name1[128];
-H5G_stat_t statbuf;
-void UNUSED *op_data;
-void *edata;
-hid_t (*func)(void*);
-
-/* Disable error reporting */
-H5Eget_auto (&func, &edata);
-H5Eset_auto (NULL, NULL);
+main(int argc, char *argv[])
+{
+    hid_t fid, gid, dsetid, typeid;
+    hid_t plist=H5P_DEFAULT;
+    const char *fname = NULL;
+    int i, index, curr_arg, display_bb=0, display_all=1, newwidth= 0;
+    int nopts=0, *opts;
+    char *buf, name[128], name1[128];
+    H5G_stat_t statbuf;
+    void *edata;
+    hid_t (*func)(void*);
+
+    /* Disable error reporting */
+    H5Eget_auto (&func, &edata);
+    H5Eset_auto (NULL, NULL);
 
     if (argc < 2 ) {
         usage();