[svn-r5200] Purpose:

    Code Cleanup

Description:
    Clean up compiler warnings from the last bunch of checkins

Platforms tested:
    FreeBSD 4.5 (sleipnir)

5 files changed, 25 insertions, 17 deletions

diff --git a/test/big.c b/test/big.c
index 2e2ec31..406e5c0 100644
--- a/test/big.c
+++ b/test/big.c
@@ -355,7 +355,7 @@ reader (hid_t fapl)
  *
  *-------------------------------------------------------------------------
  */
-void
+static void
 usage(void)
 {
     HDfprintf(stdout,
diff --git a/test/dtypes.c b/test/dtypes.c
index 083c581..bcc90c9 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -1112,7 +1112,7 @@ test_query(void)
     hid_t       file=-1, tid1=-1, tid2=-1;
     char        filename[1024];
     char        compnd_type[]="Compound_type", enum_type[]="Enum_type";
-    int         nmembs, index;
+    int         nmembs, indx;
     short       enum_val;
 
     TESTING("query functions of compound and enumeration types");
@@ -1187,7 +1187,7 @@ test_query(void)
         printf("Can't get member number\n");
         goto error;
     } /* end if */
-    if((index=H5Tget_member_index(tid1, "c"))!=2) {
+    if((indx=H5Tget_member_index(tid1, "c"))!=2) {
         H5_FAILED();
         printf("Can't get correct index number\n");
         goto error;
@@ -1199,7 +1199,7 @@ test_query(void)
         printf("Can't get member number\n");
         goto error;
     } /* end if */
-    if((index=H5Tget_member_index(tid2, "ORANGE"))!=3) {
+    if((indx=H5Tget_member_index(tid2, "ORANGE"))!=3) {
         H5_FAILED();
         printf("Can't get correct index number\n");
         goto error;
@@ -1247,7 +1247,7 @@ test_query(void)
         printf("Can't get member number\n");
         goto error;
     } /* end if */
-    if((index=H5Tget_member_index(tid1, "c"))!=2) {
+    if((indx=H5Tget_member_index(tid1, "c"))!=2) {
         H5_FAILED();
         printf("Can't get correct index number\n");
         goto error;
@@ -1259,7 +1259,7 @@ test_query(void)
         printf("Can't get member number\n");
         goto error;
     } /* end if */
-    if((index=H5Tget_member_index(tid2, "ORANGE"))!=3) {
+    if((indx=H5Tget_member_index(tid2, "ORANGE"))!=3) {
         H5_FAILED();
         printf("Can't get correct index number\n");
         goto error;
diff --git a/test/set_extent.c b/test/set_extent.c
index 6178472..bae973f 100644
--- a/test/set_extent.c
+++ b/test/set_extent.c
@@ -1,3 +1,13 @@
+/*
+ * Copyright (C) 2002 NCSA
+ *                    All rights reserved.
+ *
+ * Programmer:  Pedro Vicente <pvn@ncsa.uiuc.edu>
+ *              April 12, 2002
+ *
+ * Purpose:     Tests the H5Dset_extent call
+ */
+
 
 #include "hdf5.h"
 #include "h5test.h"
@@ -100,9 +110,9 @@ int main( void )
  
  
  /* Compare the read array with the original array */
- for( i = 0; i < dims_out[0]; i++ )
+ for( i = 0; i < (int)dims_out[0]; i++ )
  {
-  for( j = 0; j < dims_out[1]; j++ )
+  for( j = 0; j < (int)dims_out[1]; j++ )
   {
    if (  buf1[i][j] != data[i][j] ) {
     goto out;
@@ -138,9 +148,9 @@ int main( void )
  if (H5Dread( dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2 )<0) goto out;
  
  /* Compare the read array with the original array */
- for( i = 0; i < dims_out[0]; i++ )
+ for( i = 0; i < (int)dims_out[0]; i++ )
  {
-  for( j = 0; j < dims_out[1]; j++ )
+  for( j = 0; j < (int)dims_out[1]; j++ )
   {
    if ( i >= 70 || j >= 70 )
    {
@@ -229,9 +239,9 @@ int main( void )
  if (H5Dread( dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf1 )<0) goto out;
  
  /* Compare the read array with the original array */
- for( i = 0; i < dims_out[0]; i++ )
+ for( i = 0; i < (int)dims_out[0]; i++ )
  {
-  for( j = 0; j < dims_out[1]; j++ )
+  for( j = 0; j < (int)dims_out[1]; j++ )
   {
    if (  buf1[i][j] != data[i][j] ) {
     goto out;
@@ -260,9 +270,9 @@ int main( void )
  if (H5Dread( dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2 )<0) goto out;
  
  /* Compare the read array with the original array */
- for( i = 0; i < dims_out[0]; i++ )
+ for( i = 0; i < (int)dims_out[0]; i++ )
  {
-  for( j = 0; j < dims_out[1]; j++ )
+  for( j = 0; j < (int)dims_out[1]; j++ )
   {
    if ( i >= 70 || j >= 70 )
    {
diff --git a/test/tconfig.c b/test/tconfig.c
index 01fc2df..8ed2a31 100644
--- a/test/tconfig.c
+++ b/test/tconfig.c
@@ -202,7 +202,6 @@ void
 test_config_malloc(void)
 {
     char	*pt;
-    size_t	n;
 
     /* verify H5_MALLOC_WORKS (malloc zero byte) macros */
     pt = malloc(0);
diff --git a/test/tvlstr.c b/test/tvlstr.c
index 3c09746..7ce7e18 100644
--- a/test/tvlstr.c
+++ b/test/tvlstr.c
@@ -235,10 +235,9 @@ test_vlstrings_basic(void)
 static void test_vlstring_type(void)
 {
     hid_t               fid;           /* HDF5 File IDs                */
-    hid_t               tid_vlstr, str;
+    hid_t               tid_vlstr;
     H5T_cset_t          cset;
     H5T_str_t           pad;
-    size_t              size;
     herr_t              ret;
 
     /* Output message about test being performed */