[svn-r4978] Purpose:

    Code cleanup
Description:
    Cleanup compiler warnings found by the SGI compiler and gcc 3.0
Platforms tested:
    FreeBSD 4.5 w/gcc 3.0 (hack) && IRIX64 (modi4)

7 files changed, 6 insertions, 16 deletions

diff --git a/test/h5test.c b/test/h5test.c
index da4c02f..7a1fad5 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -472,7 +472,7 @@ h5_fileaccess(void)
         if ((val = HDstrtok(NULL, " \t\n\r")))
             log_flags = HDstrtol(val, NULL, 0);
 
-        if (H5Pset_fapl_log(fapl, NULL, log_flags, 0) < 0)
+        if (H5Pset_fapl_log(fapl, NULL, (unsigned)log_flags, 0) < 0)
 	    return -1;
 #endif /* H5_WANT_H5_V1_4_COMPAT */
     } else {
diff --git a/test/set_extend.c b/test/set_extend.c
index 29ff9a5..a076483 100644
--- a/test/set_extend.c
+++ b/test/set_extend.c
@@ -29,10 +29,12 @@ int main( void )
   hsize_t dims_out[2];
   hsize_t maxdims[2] = {H5S_UNLIMITED, H5S_UNLIMITED};
   int     data1[3][3] = { {1, 2, 3}, {4, 5, 6}, {7, 8, 9} }; 
+#if 0
   int     buf1[3][3];
+#endif
   int     buf2[2][2];
   herr_t  status; 
-  int     i, j;
+  hsize_t i, j;
 
   TESTING("extend dataset");
   
diff --git a/test/titerate.c b/test/titerate.c
index b50913d..50c26ee 100644
--- a/test/titerate.c
+++ b/test/titerate.c
@@ -70,7 +70,7 @@ herr_t aiter_cb(hid_t loc_id, const char *name, void *op_data);
 ****************************************************************/
 int iter_strcmp(const void *s1, const void *s2)
 {
-    return(strcmp(*(const char **)s1,*(const char **)s2));
+    return(strcmp(*(const char * const *)s1,*(const char * const *)s2));
 }
 
 /****************************************************************
diff --git a/test/tselect.c b/test/tselect.c
index f98f967..e26ae64 100644
--- a/test/tselect.c
+++ b/test/tselect.c
@@ -1048,7 +1048,7 @@ test_select_hyper_stride(void)
         tbuf2=rbuf+loc2[i];
         if(*tbuf!=*tbuf2) {
             printf("%d: hyperslab values don't match!, loc1[%d]=%d, loc2[%d]=%d\n",__LINE__,i,(int)loc1[i],i,(int)loc2[i]);
-            printf("wbuf=%p, tbuf=%p, rbuf=%p, tbuf2=%p\n",wbuf,tbuf,rbuf,tbuf2);
+            printf("wbuf=%p, tbuf=%p, rbuf=%p, tbuf2=%p\n",(void *)wbuf,(void *)tbuf,(void *)rbuf,(void *)tbuf2);
             printf("*tbuf=%u, *tbuf2=%u\n",(unsigned)*tbuf,(unsigned)*tbuf2);
             num_errs++;
         } /* end if */
diff --git a/test/ttsafe_acreate.c b/test/ttsafe_acreate.c
index 7aa8bde..13cfc20 100644
--- a/test/ttsafe_acreate.c
+++ b/test/ttsafe_acreate.c
@@ -44,10 +44,6 @@ static int dummy;	/* just to create a non-empty object file */
 #define DATASETNAME	"IntData"
 #define NUM_THREADS	16
 
-/* Global variables */
-extern int num_errs;
-extern int Verbosity;
-
 void *tts_acreate_thread(void *);
 
 typedef struct acreate_data_struct {
diff --git a/test/ttsafe_cancel.c b/test/ttsafe_cancel.c
index 80981f5..2d2ce3f 100644
--- a/test/ttsafe_cancel.c
+++ b/test/ttsafe_cancel.c
@@ -38,10 +38,6 @@ static int dummy;	/* just to create a non-empty object file */
 #define FILENAME	"ttsafe_cancel.h5"
 #define DATASETNAME	"commonname"
 
-/* Global variables */
-extern int num_errs;
-extern int Verbosity;
-
 void *tts_cancel_thread(void *);
 void tts_cancel_barrier(void);
 herr_t tts_cancel_callback(void *, hid_t, hsize_t, hssize_t *, void *);
diff --git a/test/ttsafe_dcreate.c b/test/ttsafe_dcreate.c
index aa77e36..ae4fdbc 100644
--- a/test/ttsafe_dcreate.c
+++ b/test/ttsafe_dcreate.c
@@ -35,10 +35,6 @@ static int dummy;	/* just to create a non-empty object file */
 #define DATASETNAME_LENGTH	10
 #define NUM_THREAD		16
 
-/* Global variables */
-extern int num_errs;
-extern int Verbosity;
-
 void *tts_dcreate_creator(void *);
 
 typedef struct thread_info {