OESS-29 Fix shared MPI builds, more HD prefix

1 files changed, 54 insertions, 54 deletions

diff --git a/test/fillval.c b/test/fillval.c
index 5b95de9..dac0e09 100644
--- a/test/fillval.c
+++ b/test/fillval.c
@@ -542,8 +542,8 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
         if(H5Pget_fill_value(dcpl, H5T_NATIVE_SHORT, &rd_s) < 0) goto error;
         if(rd_s != fill_s) {
 	   H5_FAILED();
-	   printf("    %d: Got a different fill value than what was set.",__LINE__);
-	   printf("    Got %d, set %d\n", rd_s, fill_s);
+	   HDprintf("    %d: Got a different fill value than what was set.",__LINE__);
+	   HDprintf("    Got %d, set %d\n", rd_s, fill_s);
 	   goto error;
         }
 #endif
@@ -557,8 +557,8 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
         if(H5Pget_fill_value(dcpl, H5T_NATIVE_LONG, &rd_l) < 0) goto error;
         if(rd_l!=fill_l) {
 	   H5_FAILED();
-	   printf("    %d: Got a different fill value than what was set.",__LINE__);
-	   printf("    Got %ld, set %ld\n", rd_l, fill_l);
+	   HDprintf("    %d: Got a different fill value than what was set.",__LINE__);
+	   HDprintf("    Got %ld, set %ld\n", rd_l, fill_l);
 	   goto error;
         }
 #endif
@@ -572,8 +572,8 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
         if(H5Pget_fill_value(dcpl, H5T_NATIVE_LONG, &rd_l) < 0) goto error;
         if(rd_l != fill_l) {
 	   H5_FAILED();
-	   printf("    %d: Got a different fill value than what was set.",__LINE__);
-	   printf("    Got %ld, set %ld\n", rd_l, fill_l);
+	   HDprintf("    %d: Got a different fill value than what was set.",__LINE__);
+	   HDprintf("    Got %ld, set %ld\n", rd_l, fill_l);
 	   goto error;
         }
 #endif
@@ -582,12 +582,12 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
         if(alloc_time != H5D_ALLOC_TIME_LATE) {
             H5_FAILED();
             puts("    Got non-H5D_ALLOC_TIME_LATE space allocation time.");
-            printf("    Got %d\n", alloc_time);
+            HDprintf("    Got %d\n", alloc_time);
         }
         if(fill_time != H5D_FILL_TIME_ALLOC) {
             H5_FAILED();
             puts("    Got non-H5D_FILL_TIME_ALLOC fill value write time.");
-            printf("    Got %d\n", fill_time);
+            HDprintf("    Got %d\n", fill_time);
         }
         if(H5Dclose(dset3) < 0) goto error;
         if(H5Pclose(dcpl) < 0) goto error;
@@ -598,7 +598,7 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
         if(layout == H5D_CONTIGUOUS && allocation != H5D_SPACE_STATUS_NOT_ALLOCATED) {
             H5_FAILED();
             puts("    Got allocated space instead of unallocated.");
-            printf("    Got %d\n", allocation);
+            HDprintf("    Got %d\n", allocation);
             goto error;
         }
         if((dcpl = H5Dget_create_plist(dset4)) < 0) goto error;
@@ -607,12 +607,12 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
         if(alloc_time != H5D_ALLOC_TIME_LATE) {
 	   H5_FAILED();
 	   puts("    Got non-H5D_ALLOC_TIME_LATE space allocation time.");
-	   printf("    Got %d\n", alloc_time);
+	   HDprintf("    Got %d\n", alloc_time);
         }
         if(fill_time != H5D_FILL_TIME_NEVER) {
 	   H5_FAILED();
 	   puts("    Got non-H5D_FILL_TIME_NEVER fill value write time.");
-    	   printf("    Got %d\n", fill_time);
+    	   HDprintf("    Got %d\n", fill_time);
         }
         if(H5Dclose(dset4) < 0) goto error;
         if(H5Pclose(dcpl) < 0) goto error;
@@ -624,7 +624,7 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
         if(!H5_FLT_ABS_EQUAL(rd_c.a, 0) || !H5_DBL_ABS_EQUAL(rd_c.y, fill_ctype.y) || rd_c.x != 0 || rd_c.z != '\0') {
            H5_FAILED();
            puts("    Got wrong fill value");
-           printf("    Got rd_c.a=%f, rd_c.y=%f and rd_c.x=%d, rd_c.z=%c\n",
+           HDprintf("    Got rd_c.a=%f, rd_c.y=%f and rd_c.x=%d, rd_c.z=%c\n",
                   (double)rd_c.a, rd_c.y, rd_c.x, rd_c.z);
         }
         if(H5Dclose(dset9) < 0) goto error;
@@ -639,21 +639,21 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
     if(H5Dget_space_status(dset5, &allocation) < 0) goto error;
     if(layout == H5D_CONTIGUOUS && allocation != H5D_SPACE_STATUS_ALLOCATED) {
         H5_FAILED();
-        printf("    %d: Got unallocated space instead of allocated.\n",__LINE__);
-        printf("    Got %d\n", allocation);
+        HDprintf("    %d: Got unallocated space instead of allocated.\n",__LINE__);
+        HDprintf("    Got %d\n", allocation);
         goto error;
     }
     if(H5Pget_alloc_time(dcpl, &alloc_time) < 0) goto error;
     if(alloc_time != H5D_ALLOC_TIME_EARLY) {
         H5_FAILED();
         puts("    Got non-H5D_ALLOC_TIME_EARLY space allocation time.");
-        printf("    Got %d\n", alloc_time);
+        HDprintf("    Got %d\n", alloc_time);
     }
     if(H5Pget_fill_time(dcpl, &fill_time) < 0) goto error;
     if(fill_time != H5D_FILL_TIME_NEVER) {
         H5_FAILED();
         puts("    Got non-H5D_FILL_TIME_NEVER fill value write time.");
-        printf("    Got %d\n", fill_time);
+        HDprintf("    Got %d\n", fill_time);
     }
     if(H5Dclose(dset5) < 0) goto error;
     if(H5Pclose(dcpl) < 0) goto error;
@@ -664,28 +664,28 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
     if(H5Dget_space_status(dset6, &allocation) < 0) goto error;
     if(layout == H5D_CONTIGUOUS && allocation != H5D_SPACE_STATUS_ALLOCATED) {
         H5_FAILED();
-        printf("    %d: Got unallocated space instead of allocated.\n",__LINE__);
-        printf("    Got %d\n", allocation);
+        HDprintf("    %d: Got unallocated space instead of allocated.\n",__LINE__);
+        HDprintf("    Got %d\n", allocation);
         goto error;
     }
     if(H5Pget_fill_value(dcpl, H5T_NATIVE_LONG, &rd_l) < 0) goto error;
     if(rd_l != fill_l) {
         H5_FAILED();
-	printf("    %d: Got a different fill value than what was set.",__LINE__);
-        printf("    Got %ld, set %ld\n", rd_l, fill_l);
+	HDprintf("    %d: Got a different fill value than what was set.",__LINE__);
+        HDprintf("    Got %ld, set %ld\n", rd_l, fill_l);
         goto error;
     }
     if(H5Pget_alloc_time(dcpl, &alloc_time) < 0) goto error;
     if(alloc_time != H5D_ALLOC_TIME_EARLY) {
         H5_FAILED();
         puts("    Got non-H5D_ALLOC_TIME_EARLY space allocation time.");
-        printf("    Got %d\n", alloc_time);
+        HDprintf("    Got %d\n", alloc_time);
     }
     if(H5Pget_fill_time(dcpl, &fill_time) < 0) goto error;
     if(fill_time != H5D_FILL_TIME_ALLOC) {
         H5_FAILED();
         puts("    Got non-H5D_FILL_TIME_ALLOC fill value write time.");
-        printf("    Got %d\n", fill_time);
+        HDprintf("    Got %d\n", fill_time);
     }
     if(H5Dclose(dset6) < 0) goto error;
     if(H5Pclose(dcpl) < 0) goto error;
@@ -697,7 +697,7 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
     if(!H5_FLT_ABS_EQUAL(rd_c.a, 0) || !H5_DBL_ABS_EQUAL(rd_c.y, fill_ctype.y) || rd_c.x != 0 || rd_c.z != '\0') {
         H5_FAILED();
         puts("    Got wrong fill value");
-        printf("    Got rd_c.a=%f, rd_c.y=%f and rd_c.x=%d, rd_c.z=%c\n",
+        HDprintf("    Got rd_c.a=%f, rd_c.y=%f and rd_c.x=%d, rd_c.z=%c\n",
 		(double)rd_c.a, rd_c.y, rd_c.x, rd_c.z);
     }
     if(H5Dclose(dset8) < 0) goto error;
@@ -926,8 +926,8 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
         goto error;
     if(layout == H5D_CONTIGUOUS && allocation != H5D_SPACE_STATUS_ALLOCATED) {
         H5_FAILED();
-        printf("    %d: Got unallocated space instead of allocated.\n",__LINE__);
-        printf("    Got %d\n", allocation);
+        HDprintf("    %d: Got unallocated space instead of allocated.\n",__LINE__);
+        HDprintf("    Got %d\n", allocation);
         goto error;
     }
     HDfree(buf);
@@ -954,7 +954,7 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
                 if(val_rd!=should_be) {
                     H5_FAILED();
                     HDfprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__);
-                    printf("    Elmt={%ld,%ld,%ld,%ld,%ld}, read: %u, "
+                    HDprintf("    Elmt={%ld,%ld,%ld,%ld,%ld}, read: %u, "
                            "should be: %u\n",
                            (long)hs_offset[0], (long)hs_offset[1],
                            (long)hs_offset[2], (long)hs_offset[3],
@@ -967,7 +967,7 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
 	        if(val_rd!=should_be) {
 	            H5_FAILED();
                     HDfprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__);
-	            printf("    Elmt={%ld,%ld,%ld,%ld,%ld}, read: %u, "
+	            HDprintf("    Elmt={%ld,%ld,%ld,%ld,%ld}, read: %u, "
 		           "should be: %u\n",
 		           (long)hs_offset[0], (long)hs_offset[1],
 		           (long)hs_offset[2], (long)hs_offset[3],
@@ -998,7 +998,7 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
 		    !H5_DBL_ABS_EQUAL(rd_c.y, should_be_c.y) || rd_c.z != should_be_c.z)  {
                     H5_FAILED();
                     HDfprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__);
-                    printf("    Elmt={%ld,%ld,%ld,%ld,%ld}, read: %f,%d,%f,%c "
+                    HDprintf("    Elmt={%ld,%ld,%ld,%ld,%ld}, read: %f,%d,%f,%c "
                            "should be: %f,%d,%f,%c\n",
                            (long)hs_offset[0], (long)hs_offset[1],
                            (long)hs_offset[2], (long)hs_offset[3],
@@ -1017,7 +1017,7 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
 		    !H5_DBL_ABS_EQUAL(rd_c.y, should_be_c.y) || rd_c.z != should_be_c.z)  {
                     H5_FAILED();
                     HDfprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__);
-                    printf("    Elmt={%ld,%ld,%ld,%ld,%ld}, read: %f,%d,%f,%c "
+                    HDprintf("    Elmt={%ld,%ld,%ld,%ld,%ld}, read: %f,%d,%f,%c "
                            "should be: %f,%d,%f,%c\n",
                            (long)hs_offset[0], (long)hs_offset[1],
                            (long)hs_offset[2], (long)hs_offset[3],
@@ -1992,7 +1992,7 @@ test_compatible(void)
     TESTING("contiguous dataset compatibility with v. 1.4");
 
   if((file = H5Fopen(testfile, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) {
-      printf("    Could not open file %s. Try set $srcdir to point at the "
+      HDprintf("    Could not open file %s. Try set $srcdir to point at the "
               "source directory of test\n", testfile);
       goto error;
   }
@@ -2002,8 +2002,8 @@ test_compatible(void)
   if(H5Pfill_value_defined(dcpl1, &status) < 0) goto error;
   if(status != H5D_FILL_VALUE_UNDEFINED) {
       H5_FAILED();
-      printf("    %d: Got a different fill value than what was set.",__LINE__);
-      printf("    Got status=%ld, suppose to be H5D_FILL_VALUE_UNDEFINED\n",
+      HDprintf("    %d: Got a different fill value than what was set.",__LINE__);
+      HDprintf("    Got status=%ld, suppose to be H5D_FILL_VALUE_UNDEFINED\n",
             (long)status);
       goto error;
   }
@@ -2012,7 +2012,7 @@ test_compatible(void)
   if(dims[0] != 8 || dims[1] != 8) {
       H5_FAILED();
       puts("    Got a different dimension size than what was set.");
-      printf("    Got dims[0]=%ld, dims[1]=%ld, set 8x8\n", (long)dims[0], (long)dims[1]);
+      HDprintf("    Got dims[0]=%ld, dims[1]=%ld, set 8x8\n", (long)dims[0], (long)dims[1]);
       goto error;
   }
   if((mspace = H5Screate_simple(2, one, NULL)) < 0) goto error;
@@ -2023,7 +2023,7 @@ test_compatible(void)
   if(val_rd != 0) {
       H5_FAILED();
       puts("    Got a different value than what was set.");
-      printf("    Got %ld, set 0\n", (long)val_rd);
+      HDprintf("    Got %ld, set 0\n", (long)val_rd);
       goto error;
   }
   if(H5Pclose(dcpl1) < 0) goto error;
@@ -2037,16 +2037,16 @@ test_compatible(void)
   if(H5Pfill_value_defined(dcpl2, &status) < 0) goto error;
   if(status != H5D_FILL_VALUE_USER_DEFINED) {
       H5_FAILED();
-      printf("    %d: Got a different fill value than what was set.",__LINE__);
-      printf("    Got status=%ld, suppose to be H5D_FILL_VALUE_USER_DEFINED\n",
+      HDprintf("    %d: Got a different fill value than what was set.",__LINE__);
+      HDprintf("    Got status=%ld, suppose to be H5D_FILL_VALUE_USER_DEFINED\n",
             (long)status);
       goto error;
   }
   if(H5Pget_fill_value(dcpl2, H5T_NATIVE_INT, &rd_fill) < 0) goto error;
   if(rd_fill != fill_val) {
       H5_FAILED();
-      printf("    %d: Got a different fill value than what was set.",__LINE__);
-      printf("    Got %ld, set %ld\n", (long)rd_fill, (long)fill_val);
+      HDprintf("    %d: Got a different fill value than what was set.",__LINE__);
+      HDprintf("    Got %ld, set %ld\n", (long)rd_fill, (long)fill_val);
       goto error;
   }
   fspace = -1;
@@ -2056,7 +2056,7 @@ test_compatible(void)
   if(dims[0] != 8 || dims[1] != 8) {
       H5_FAILED();
       puts("    Got a different dimension size than what was set.");
-      printf("    Got dims[0]=%ld, dims[1]=%ld, set 8x8\n", (long)dims[0], (long)dims[1]);
+      HDprintf("    Got dims[0]=%ld, dims[1]=%ld, set 8x8\n", (long)dims[0], (long)dims[1]);
       goto error;
   }
   if((mspace=H5Screate_simple(2, one, NULL)) < 0) goto error;
@@ -2067,7 +2067,7 @@ test_compatible(void)
   if(val_rd != fill_val) {
       H5_FAILED();
       puts("    Got a different value than what was set.");
-      printf("    Got %ld, set %ld\n", (long)val_rd, (long)fill_val);
+      HDprintf("    Got %ld, set %ld\n", (long)val_rd, (long)fill_val);
       goto error;
   }
   if(H5Pclose(dcpl2) < 0) goto error;
@@ -2185,7 +2185,7 @@ test_partalloc_cases(hid_t file, hid_t dcpl, const char *dname, H5D_fill_time_t
                 (r_values[3] != fillval)) {
             H5_FAILED();
             HDfprintf(stdout, "%u: Allocated chunk value read was not correct.\n", (unsigned)__LINE__);
-            printf("    {%ld,%ld,%ld,%ld} should be {%ld,%ld,%ld,%ld}\n",
+            HDprintf("    {%ld,%ld,%ld,%ld} should be {%ld,%ld,%ld,%ld}\n",
                     (long)r_values[0], (long)r_values[1],
                     (long)r_values[2], (long)r_values[3],
                     (long)w_values[0], (long)fillval,
@@ -2199,7 +2199,7 @@ test_partalloc_cases(hid_t file, hid_t dcpl, const char *dname, H5D_fill_time_t
                 (f_values[3] != fillval)) {
             H5_FAILED();
             HDfprintf(stdout, "%u: Unallocated chunk value read was not correct.\n", (unsigned)__LINE__);
-            printf("    {%ld,%ld,%ld,%ld} should be {%ld,%ld,%ld,%ld}\n",
+            HDprintf("    {%ld,%ld,%ld,%ld} should be {%ld,%ld,%ld,%ld}\n",
                     (long)f_values[0], (long)f_values[1],
                     (long)f_values[2], (long)f_values[3],
                     (long)fillval, (long)fillval,
@@ -2262,81 +2262,81 @@ test_partalloc(hid_t fapl, const char *base_name)
     /* I. Test H5D_ALLOC_TIME_LATE space allocation cases */
     if(H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_LATE) < 0) goto error;
 #ifdef DEBUG
-    fprintf( stdout, "\nALLOC_TIME_LATE\n" );
+    HDfprintf( stdout, "\nALLOC_TIME_LATE\n" );
 #endif
 
     /* case for H5D_FILL_TIME_ALLOC as fill write time and fill value to be default */
     if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) goto error;
 #ifdef DEBUG
-    fprintf( stdout, "   FILL_TIME_ALLOC\n" );
+    HDfprintf( stdout, "   FILL_TIME_ALLOC\n" );
 #endif
     nerrors += test_partalloc_cases(file, dcpl, "dset1", H5D_FILL_TIME_ALLOC);
 	        
     /* case for H5D_FILL_TIME_NEVER as fill write time and fill value to be default */
     if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_NEVER) < 0) goto error;
 #ifdef DEBUG
-    fprintf( stdout, "   FILL_TIME_NEVER\n" );
+    HDfprintf( stdout, "   FILL_TIME_NEVER\n" );
 #endif
     nerrors += test_partalloc_cases(file, dcpl, "dset2", H5D_FILL_TIME_NEVER );
 
     /* case for H5D_FILL_TIME_IFSET as fill write time and fill value to be default */
     if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_IFSET) < 0) goto error;
 #ifdef DEBUG
-    fprintf( stdout, "   FILL_TIME_IFSET\n" );
+    HDfprintf( stdout, "   FILL_TIME_IFSET\n" );
 #endif
     nerrors += test_partalloc_cases(file, dcpl, "dset3", H5D_FILL_TIME_IFSET );
 
     /* II.  Test H5D_ALLOC_TIME_INCR space allocation cases */
     if(H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_INCR) < 0) goto error;
 #ifdef DEBUG
-    fprintf( stdout, "\nALLOC_TIME_INCR\n" );
+    HDfprintf( stdout, "\nALLOC_TIME_INCR\n" );
 #endif
 
     /* case for H5D_FILL_TIME_ALLOC as fill write time and fill value to be default */
     if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) goto error;
 #ifdef DEBUG
-    fprintf( stdout, "   FILL_TIME_ALLOC\n" );
+    HDfprintf( stdout, "   FILL_TIME_ALLOC\n" );
 #endif
     nerrors += test_partalloc_cases(file, dcpl, "dset4", H5D_FILL_TIME_ALLOC );
 
     /* case for H5D_FILL_TIME_NEVER as fill write time and fill value to be default */
     if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_NEVER) < 0) goto error;
 #ifdef DEBUG
-    fprintf( stdout, "   FILL_TIME_NEVER\n" );
+    HDfprintf( stdout, "   FILL_TIME_NEVER\n" );
 #endif
     nerrors += test_partalloc_cases(file, dcpl, "dset5", H5D_FILL_TIME_NEVER );
 
     /* case for H5D_FILL_TIME_IFSET as fill write time and fill value to be default */
     if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_IFSET) < 0) goto error;
 #ifdef DEBUG
-    fprintf( stdout, "   FILL_TIME_IFSET\n" );
+    HDfprintf( stdout, "   FILL_TIME_IFSET\n" );
 #endif
     nerrors += test_partalloc_cases(file, dcpl, "dset6", H5D_FILL_TIME_IFSET );
 
     /* III.  Test H5D_ALLOC_TIME_EARLY space allocation cases */
     if(H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY) < 0) goto error;
 #ifdef DEBUG
-    fprintf( stdout, "\nALLOC_TIME_EARLY\n" );
+    HDfprintf( stdout, "\nALLOC_TIME_EARLY\n" );
 #endif
 
     /* case for H5D_FILL_TIME_ALLOC as fill write time and fill value to be default */
     if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) goto error;
 #ifdef DEBUG
-    fprintf( stdout, "   FILL_TIME_ALLOC\n" );
+    HDfprintf( stdout, "   FILL_TIME_ALLOC\n" );
 #endif
     nerrors += test_partalloc_cases(file, dcpl, "dset7", H5D_FILL_TIME_ALLOC );
 
     /* case for H5D_FILL_TIME_NEVER as fill write time and fill value to be default */
     if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_NEVER) < 0) goto error;
 #ifdef DEBUG
-    fprintf( stdout, "   FILL_TIME_NEVER\n" );
+    HDfprintf( stdout, "   FILL_TIME_NEVER\n" );
 #endif
     nerrors += test_partalloc_cases(file, dcpl, "dset8", H5D_FILL_TIME_NEVER );
 
     /* case for H5D_FILL_TIME_IFSET as fill write time and fill value to be default */
     if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_IFSET) < 0) goto error;
 #ifdef DEBUG
-    fprintf( stdout, "   FILL_TIME_IFSET\n" );
+    HDfprintf( stdout, "   FILL_TIME_IFSET\n" );
 #endif
     nerrors += test_partalloc_cases(file, dcpl, "dset9", H5D_FILL_TIME_IFSET );