[svn-r7002] Purpose:

    Code cleanup

Description:
    Clean up warnings about unused stuff...

Platforms tested:
    FreeBSD 4.8 (sleipnir)
    h5committest

2 files changed, 13 insertions, 7 deletions

diff --git a/tools/h5diff/h5diff.c b/tools/h5diff/h5diff.c
index 984dce4..da6c649 100644
--- a/tools/h5diff/h5diff.c
+++ b/tools/h5diff/h5diff.c
@@ -77,7 +77,9 @@ static int array_diff( void *buf1, void *buf2, hsize_t tot_cnt, int rank, hsize_
  *-------------------------------------------------------------------------
  */
 
+#ifdef NOT_YET
 static void list( const char *filename, int nobjects, info_t *info );
+#endif /* NOT_YET */
 static hid_t fixtype( hid_t f_type );
 static int h5diff_can_diff( hid_t type_id );
 static void print_datatype(hid_t type);
@@ -184,8 +186,8 @@ int main(int argc, const char *argv[])
  options_t  options = {0,0,0,0,0,0,0};
  void       *edata;
  hid_t      (*func)(void*);
- const char *file1_name;
- const char *file2_name;
+ const char *file1_name = NULL;
+ const char *file2_name = NULL;
  const char *obj1_name  = NULL;
  const char *obj2_name  = NULL;
  int        nfound=0, ret;
@@ -490,6 +492,7 @@ int check_f_input( const char *str )
  *
  *-------------------------------------------------------------------------
  */
+#ifdef NOT_YET
 static 
 void list( const char *filename, int nobjects, info_t *info )
 {
@@ -519,6 +522,7 @@ void list( const char *filename, int nobjects, info_t *info )
  }
 
 }
+#endif /* NOT_YET */
 
 
 /*-------------------------------------------------------------------------
@@ -2778,6 +2782,7 @@ get_class(H5T_class_t tclass)
  *
  *-------------------------------------------------------------------------
  */
+#if defined (H5DIFF_DEBUG)
 static 
 void print_sizes( const char *obj1, const char *obj2,
                   hid_t f_type1, hid_t f_type2,
@@ -2820,5 +2825,6 @@ void print_sizes( const char *obj1, const char *obj2,
  printf("size on memory %u\n", m_size2 );
  printf("\n");
 }
+#endif /* H5DIFF_DEBUG */
 
 
diff --git a/tools/h5import/h5import.c b/tools/h5import/h5import.c
index 8046ddf..20dc785 100755
--- a/tools/h5import/h5import.c
+++ b/tools/h5import/h5import.c
@@ -28,7 +28,7 @@ int main(int argc, char *argv[])
   int    token;
   int    i;
   int    state = 0;
-  struct Input *in;
+  struct Input *in=NULL;
 
   const char *err1 = "Invalid number of arguments:  %d.\n";
   const char *err2 = "Error in state table.\n";
@@ -1851,7 +1851,7 @@ setDefaultValues(struct Input *in, int count)
 hid_t 
 createOutputDataType(struct Input in)
 {
-  hid_t new_type;
+  hid_t new_type = (-1);
   const char *err1 = "Invalid value for output class.\n";
   
   switch (in.outputClass)
@@ -2093,7 +2093,7 @@ createOutputDataType(struct Input in)
 hid_t 
 createInputDataType(struct Input in)
 {
-  hid_t new_type;
+  hid_t new_type = (-1);
   const char *err1 = "Invalid value for input class.\n";
 
   switch (in.inputClass)
@@ -2172,7 +2172,7 @@ process(struct Options *opt)
 {
   struct  Input *in;
   hid_t   file_id, group_id, handle;  
-  hid_t   dataset, dataspace;   
+  hid_t   dataset, dataspace = (-1);   
   FILE *strm, *extfile;
   hid_t intype, outtype;
   hid_t proplist;  
@@ -2285,7 +2285,7 @@ process(struct Options *opt)
         return (-1);    
       }
       HDfclose(extfile);
-      H5Pset_external (proplist, in->externFilename, 0, numOfElements * in->inputSize / 8);
+      H5Pset_external (proplist, in->externFilename, (off_t)0, numOfElements * in->inputSize / 8);
     }
     
     /* create dataspace */