[svn-r8383] Purpose:

    Code cleanup

Description:
    Clean up lots of warnings based on those reported from the SGI compilers
as well as gcc.

Platforms tested:
    SGI O3900, IRIX64 6.5 (Cheryl's SGI machine)
    FreeBSD 4.9 (sleipnir) w/ & w/o parallel
    h5committest

1 files changed, 20 insertions, 16 deletions

diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c
index c74f5a4..7763bd2 100644
--- a/tools/h5repack/h5repack_copy.c
+++ b/tools/h5repack/h5repack_copy.c
@@ -141,23 +141,25 @@ int do_copy_objects(hid_t fidin,
                     trav_table_t *travt,
                     pack_opt_t *options) /* repack options */
 {
- hid_t     grp_in;       /* group ID */ 
- hid_t     grp_out;      /* group ID */ 
- hid_t     dset_in;      /* read dataset ID */ 
- hid_t     dset_out;     /* write dataset ID */ 
- hid_t     type_in;      /* named type ID */ 
- hid_t     type_out;     /* named type ID */ 
- hid_t     dcpl_id;      /* dataset creation property list ID */ 
- hid_t     space_id;     /* space ID */ 
- hid_t     ftype_id;     /* file data type ID */ 
- hid_t     mtype_id;     /* memory data type ID */
+ hid_t     grp_in=-1;       /* group ID */ 
+ hid_t     grp_out=-1;      /* group ID */ 
+ hid_t     dset_in=-1;      /* read dataset ID */ 
+ hid_t     dset_out=-1;     /* write dataset ID */ 
+ hid_t     type_in=-1;      /* named type ID */ 
+ hid_t     type_out=-1;     /* named type ID */ 
+ hid_t     dcpl_id=-1;      /* dataset creation property list ID */ 
+ hid_t     space_id=-1;     /* space ID */ 
+ hid_t     ftype_id=-1;     /* file data type ID */ 
+ hid_t     mtype_id=-1;     /* memory data type ID */
  size_t    msize;        /* memory size of memory type */
  void      *buf=NULL;    /* data buffer */
  hsize_t   nelmts;       /* number of elements in dataset */
  int       rank;         /* rank of dataset */
  hsize_t   dims[H5S_MAX_RANK];/* dimensions of dataset */
  hsize_t   dsize_in;     /* input dataset size before filter */
+#ifdef LATER
  hsize_t   dsize_out;    /* output dataset size after filter */
+#endif /* LATER */
  int       i, j;
 
 /*-------------------------------------------------------------------------
@@ -308,12 +310,14 @@ int do_copy_objects(hid_t fidin,
     if (copy_attr(dset_in,dset_out,options)<0) 
      goto error;
 
+#ifdef LATER
     /*-------------------------------------------------------------------------
      * store the storage sizes
      *-------------------------------------------------------------------------
      */
     
     dsize_out=H5Dget_storage_size(dset_out);
+#endif /* LATER */
 
     /*close */
     if (H5Dclose(dset_out)<0) 
@@ -482,13 +486,13 @@ int copy_attr(hid_t loc_in,
               pack_opt_t *options
               )
 {
- hid_t      attr_id;      /* attr ID */ 
- hid_t      attr_out;     /* attr ID */ 
- hid_t      space_id;     /* space ID */ 
- hid_t      ftype_id;     /* file data type ID */ 
- hid_t      mtype_id;     /* memory data type ID */
+ hid_t      attr_id=-1;      /* attr ID */ 
+ hid_t      attr_out=-1;     /* attr ID */ 
+ hid_t      space_id=-1;     /* space ID */ 
+ hid_t      ftype_id=-1;     /* file data type ID */ 
+ hid_t      mtype_id=-1;     /* memory data type ID */
  size_t     msize;        /* memory size of type */
- void       *buf;         /* data buffer */
+ void       *buf=NULL;         /* data buffer */
  hsize_t    nelmts;       /* number of elements in dataset */
  int        rank;         /* rank of dataset */
  hsize_t    dims[H5S_MAX_RANK];/* dimensions of dataset */