[svn-r5675] Purpose:

    Code cleanup

Description:
    Removed more compiler warnings, etc.

Platforms tested:
    Linux 2.2.x (eirene) w/parallel

4 files changed, 13 insertions, 13 deletions

diff --git a/test/dtypes.c b/test/dtypes.c
index 2ac8e6c..3b0a7c5 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -3235,12 +3235,12 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
 		break;
 	    case INT_LLONG:
 		memcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
-		printf(" %29"H5_PRINTF_LL_WIDTH"d\n", *((long_long*)aligned));
+		HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"d\n", *((long_long*)aligned));
 		break;
 	    case INT_ULLONG:
 		memcpy(aligned, saved+j*sizeof(long_long),
 		       sizeof(unsigned long_long));
-		printf(" %29"H5_PRINTF_LL_WIDTH"u\n",
+		HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"u\n",
 		       *((unsigned long_long*)aligned));
 		break;
 	    case INT_OTHER:
@@ -3288,12 +3288,12 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
 		break;
 	    case INT_LLONG:
 		memcpy(aligned, buf+j*sizeof(long_long), sizeof(long_long));
-		printf(" %29"H5_PRINTF_LL_WIDTH"d\n", *((long_long*)aligned));
+		HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"d\n", *((long_long*)aligned));
 		break;
 	    case INT_ULLONG:
 		memcpy(aligned, buf+j*sizeof(long_long),
 		       sizeof(unsigned long_long));
-		printf(" %29"H5_PRINTF_LL_WIDTH"u\n",
+		HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"u\n",
 		       *((unsigned long_long*)aligned));
 		break;
 	    case INT_OTHER:
@@ -3332,10 +3332,10 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
 		printf(" %29lu\n", *((unsigned long*)hw));
 		break;
 	    case INT_LLONG:
-		printf(" %29"H5_PRINTF_LL_WIDTH"d\n", *((long_long*)hw));
+		HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"d\n", *((long_long*)hw));
 		break;
 	    case INT_ULLONG:
-		printf(" %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long_long*)hw));
+		HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long_long*)hw));
 		break;
 	    case INT_OTHER:
 		break;
@@ -3836,7 +3836,7 @@ test_conv_flt_1 (const char *name, hid_t src, hid_t dst)
 	    } else {
 		long double x;
 		memcpy(&x, (long double*)saved+j, sizeof(long double));
-		printf(" %29.20Le\n", x);
+		HDfprintf(stdout," %29.20Le\n", x);
 #endif
 	    }
 
@@ -3858,7 +3858,7 @@ test_conv_flt_1 (const char *name, hid_t src, hid_t dst)
 	    } else {
 		long double x;
 		memcpy(&x, (long double*)buf+j, sizeof(long double));
-		printf(" %29.20Le\n", x);
+		HDfprintf(stdout," %29.20Le\n", x);
 #endif
 	    }
 
@@ -3874,7 +3874,7 @@ test_conv_flt_1 (const char *name, hid_t src, hid_t dst)
 		printf(" %29.20e\n", hw_d);
 #if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE
 	    } else {
-		printf(" %29.20Le\n", hw_ld);
+		HDfprintf(stdout," %29.20Le\n", hw_ld);
 #endif
 	    }
 
diff --git a/test/enum.c b/test/enum.c
index c9d5e48..293bee2 100644
--- a/test/enum.c
+++ b/test/enum.c
@@ -375,7 +375,7 @@ static int
 test_value_dsnt_exist(void)
 {
 
-    hid_t       datatype_id;  /* identifiers */
+    hid_t       datatype_id=(-1);  /* identifiers */
     int val;
     char nam[100];
     size_t size = 100;
diff --git a/test/fillval.c b/test/fillval.c
index 34f3c39..8ddd8c2 100644
--- a/test/fillval.c
+++ b/test/fillval.c
@@ -778,7 +778,7 @@ test_compatible(void)
   }
   fspace = -1;
   if((fspace = H5Dget_space(dset2))<0) goto error;
-  dims[0] = dims[1] = -1;
+  dims[0] = dims[1] = (hsize_t)-1;
   if(H5Sget_simple_extent_dims(fspace, dims, NULL)<0) goto error;
   if(dims[0] != 8 || dims[1] != 8) {
       H5_FAILED();
diff --git a/test/h5test.c b/test/h5test.c
index 748211f..fbd1857 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -539,7 +539,7 @@ h5_fileaccess(void)
 
 	memset(memb_map, 0, sizeof memb_map);
 	memset(memb_fapl, 0, sizeof memb_fapl);
-	memset((void*)(&memb_name[0]), 0, sizeof memb_name);
+	memset(memb_name, 0, sizeof memb_name);
 	memset(memb_addr, 0, sizeof memb_addr);
 
 	assert(strlen(multi_letters)==H5FD_MEM_NTYPES);
@@ -782,7 +782,7 @@ h5_dump_info_object(MPI_Info info)
     int  	flag;
     int		i, nkeys;
 
-    printf("Dumping MPI Info Object(%d) (up to %d bytes per item):\n", info,
+    printf("Dumping MPI Info Object(%d) (up to %d bytes per item):\n", (int)info,
 	MPI_MAX_INFO_VAL);
     if (info==MPI_INFO_NULL){
 	printf("object is MPI_INFO_NULL\n");