[svn-r10736] Purpose:

    Code cleanup

Description:
    Clean up some compiler warnings

Platforms tested:
    FreeBSD 4.11 (sleipnir)
    h5committest

4 files changed, 6 insertions, 15 deletions

diff --git a/tools/gifconv/readhdf.c b/tools/gifconv/readhdf.c
index 4b05ad9..2720d4d 100644
--- a/tools/gifconv/readhdf.c
+++ b/tools/gifconv/readhdf.c
@@ -86,7 +86,7 @@ int ReadHDF(BYTE** data, BYTE palette[256][3], hsize_t *image_size,
         return -1;
     }
     if (H5Tget_size(dtype) != 1) {
-        fprintf(stderr , "Data is %d bytes per pixel. Cannot convert to GIF\n",H5Tget_size(dtype));
+        fprintf(stderr , "Data is %d bytes per pixel. Cannot convert to GIF\n",(int)H5Tget_size(dtype));
         return -1;
     }
 
@@ -141,7 +141,7 @@ int ReadHDF(BYTE** data, BYTE palette[256][3], hsize_t *image_size,
             return -1;
         }
         if (H5Tget_size(pal_dtype) != 1) {
-            fprintf(stderr , "Palette data is %d bytes per pixel. Cannot convert to GIF\n",H5Tget_size(pal_dtype));
+            fprintf(stderr , "Palette data is %d bytes per pixel. Cannot convert to GIF\n",(int)H5Tget_size(pal_dtype));
             return -1;
         }
 
diff --git a/tools/gifconv/writehdf.c b/tools/gifconv/writehdf.c
index 7df7f29..d343aae 100644
--- a/tools/gifconv/writehdf.c
+++ b/tools/gifconv/writehdf.c
@@ -25,7 +25,6 @@ static int write_text_attribute(hid_t dataset_id , const char *attr_name,
                                 const char *attr_value, const size_t attr_len)
 {
     /* variables for the attributes */
-    hsize_t attr_dims;     /* dimensions for the attribute */
     hsize_t attr_size;     /* dimensions for the attribute */
     hid_t attr_dataspace_id;    /* dataspaces needed for the various attributes */
     hid_t attr_attr_id;	        /* attribute id */
@@ -35,8 +34,6 @@ static int write_text_attribute(hid_t dataset_id , const char *attr_name,
     if (!attr_name || !attr_value)
         return -1;
 
-    attr_dims = 1;
-
     /* figure out size of the data */
     attr_size = (hsize_t)attr_len;
 
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index a13232d..d9380d0 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -487,7 +487,9 @@ diff_match (hid_t file1_id,
 	{
 	    if (table->objs[i].flags[0] && table->objs[i].flags[1])
 	    {
+#ifdef H5_HAVE_PARALLEL
 		int workerFound = 0;
+#endif /* H5_HAVE_PARALLEL */
 		options->cmn_objs = 1;
 		if(!g_Parallel)
 		{
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index 32fea3d..c611715 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -312,10 +312,9 @@ h5tools_str_prefix(h5tools_str_t *str/*in,out*/, const h5dump_t *info,
                    hsize_t elmtno, int ndims, hsize_t min_idx[],
                    hsize_t max_idx[], h5tools_context_t *ctx)
 {
-    hsize_t p_prod[H5S_MAX_RANK], p_idx[H5S_MAX_RANK];
-    hsize_t n, i = 0;
+    hsize_t p_prod[H5S_MAX_RANK];
+    hsize_t i = 0;
     hsize_t curr_pos=elmtno;
-   
 
     h5tools_str_reset(str);
 
@@ -327,13 +326,6 @@ h5tools_str_prefix(h5tools_str_t *str/*in,out*/, const h5dump_t *info,
         for (i = ndims - 1, p_prod[ndims - 1] = 1; i > 0; --i)
             p_prod[i - 1] = (max_idx[i] - min_idx[i]) * p_prod[i];
 
-        /* Calculate the index values from the element number. */
-        for (i = 0, n = elmtno; i < (hsize_t)ndims; i++) {
-            p_idx[i] = n / p_prod[i] + min_idx[i];
-            n %= p_prod[i];
-        }
-        
-        
         for ( i = 0; i < (hsize_t)ndims; i++)
         {
          ctx->pos[i] = curr_pos/ctx->acc[i];