[svn-r13917] Description:

    Code & warning cleanups

Tested on:
    Mac OS X/32 10.4.10 (amazon)
    Linux/32 2.6 (chicago)
    Linux/64 2.6 (chicago2)

4 files changed, 16 insertions, 15 deletions

diff --git a/src/H5MMpublic.h b/src/H5MMpublic.h
index ee730ec..bfcb807 100644
--- a/src/H5MMpublic.h
+++ b/src/H5MMpublic.h
@@ -33,8 +33,8 @@
 #include "H5public.h"
 
 /* These typedefs are currently used for VL datatype allocation/freeing */
-typedef void *(* H5MM_allocate_t)(size_t size,void *info);
-typedef void (* H5MM_free_t)(void *mem, void *free_info);
+typedef void *(*H5MM_allocate_t)(size_t size, void *alloc_info);
+typedef void (*H5MM_free_t)(void *mem, void *free_info);
 
 #ifdef __cplusplus
 extern "C" {
@@ -43,4 +43,5 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-#endif
+#endif /* _H5MMpublic_H */
+
diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h
index fd3bc39..6b68bf1 100644
--- a/src/H5Tpkg.h
+++ b/src/H5Tpkg.h
@@ -1340,7 +1340,6 @@ H5_DLL size_t H5T_get_member_offset(const H5T_t *dt, unsigned membno);
 H5_DLL size_t H5T_get_member_size(const H5T_t *dt, unsigned membno);
 H5_DLL htri_t H5T_is_packed(const H5T_t *dt);
 H5_DLL H5T_subset_t H5T_conv_struct_subset(const H5T_cdata_t *cdata);
-H5_DLL H5T_subset_t H5T_path_compound_subset(const H5T_path_t *p);
 
 #endif /* _H5Tpkg_H */
 
diff --git a/src/H5Tprivate.h b/src/H5Tprivate.h
index 0ac6047..608284e 100644
--- a/src/H5Tprivate.h
+++ b/src/H5Tprivate.h
@@ -102,6 +102,7 @@ H5_DLL H5T_path_t *H5T_path_find(const H5T_t *src, const H5T_t *dst,
 				  const char *name, H5T_conv_t func, hid_t dxpl_id, hbool_t is_api);
 H5_DLL hbool_t H5T_path_noop(const H5T_path_t *p);
 H5_DLL H5T_bkg_t H5T_path_bkg(const H5T_path_t *p);
+H5_DLL H5T_subset_t H5T_path_compound_subset(const H5T_path_t *p);
 H5_DLL herr_t H5T_convert(H5T_path_t *tpath, hid_t src_id, hid_t dst_id,
 			   size_t nelmts, size_t buf_stride, size_t bkg_stride,
                            void *buf, void *bkg, hid_t dset_xfer_plist);
diff --git a/test/fillval.c b/test/fillval.c
index ebc3e68..86c0669 100644
--- a/test/fillval.c
+++ b/test/fillval.c
@@ -743,7 +743,7 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
 		&val_rd)<0) goto error;
 	    if (fill_time!=H5D_FILL_TIME_NEVER && val_rd!=fillval) {
 	        H5_FAILED();
-	        puts("    Value read was not a fill value.");
+                HDfprintf(stdout, "%u: Value read was not a fill value.\n", (unsigned)__LINE__);
 	        HDfprintf(stdout,"    Elmt={%Hu,%Hu,%Hu,%Hu,%Hu}, read: %u, "
 		       "Fill value: %u\n",
 		       hs_offset[0], hs_offset[1],
@@ -759,7 +759,7 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
 		rd_c.x!=fill_c.x || rd_c.y!=fill_c.y ||
 		rd_c.z!=fill_c.z)) {
                 H5_FAILED();
-                puts("    Value read was not a fill value.");
+                HDfprintf(stdout, "%u: Value read was not a fill value.\n", (unsigned)__LINE__);
                 HDfprintf(stdout,"    Elmt={%Hu,%Hu,%Hu,%Hu,%Hu}, read: %f, %d, %f, %c"
                        "Fill value: %f, %d, %f, %c\n",
                        hs_offset[0], hs_offset[1],
@@ -799,7 +799,7 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
             for(u = 0; u < nelmts; u++) {
                 if(buf[u] != fillval) {
                     H5_FAILED();
-                    puts("    Value read was not a fill value.");
+                    HDfprintf(stdout, "%u: Value read was not a fill value.\n", (unsigned)__LINE__);
                     HDfprintf(stdout,"    Elmt={%Hu, %Hu, %Hu, %Hu, %Hu}, read: %u, "
                            "Fill value: %u\n",
                            hs_offset[0], hs_offset[1],
@@ -826,7 +826,7 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
                 if(buf_c[u].a != fill_c.a || buf_c[u].x != fill_c.x ||
                         buf_c[u].y != fill_c.y || buf_c[u].z != fill_c.z) {
                     H5_FAILED();
-                    puts("    Value read was not a fill value.");
+                    HDfprintf(stdout, "%u: Value read was not a fill value.\n", (unsigned)__LINE__);
                     HDfprintf(stdout,"    Elmt={%Hu, %Hu, %Hu, %Hu, %Hu}, read: %f, %d, %f, %c"
                             "Fill value: %f, %d, %f, %c\n",
                             hs_offset[0], hs_offset[1],
@@ -896,7 +896,7 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
                 should_be = odd ? fillval : 9999;
                 if (val_rd!=should_be) {
                     H5_FAILED();
-                    puts("    Value read was not correct.");
+                    HDfprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__);
                     printf("    Elmt={%ld,%ld,%ld,%ld,%ld}, read: %u, "
                            "should be: %u\n",
                            (long)hs_offset[0], (long)hs_offset[1],
@@ -909,7 +909,7 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
 	        should_be = 9999;
 	        if (val_rd!=should_be) {
 	            H5_FAILED();
-	            puts("    Value read was not correct.");
+                    HDfprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__);
 	            printf("    Elmt={%ld,%ld,%ld,%ld,%ld}, read: %u, "
 		           "should be: %u\n",
 		           (long)hs_offset[0], (long)hs_offset[1],
@@ -940,7 +940,7 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
 		if( rd_c.a!=should_be_c.a || rd_c.x!=should_be_c.x ||
 		    rd_c.y!=should_be_c.y || rd_c.z!=should_be_c.z)  {
                     H5_FAILED();
-                    puts("    Value read was not correct.");
+                    HDfprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__);
                     printf("    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],
@@ -959,7 +959,7 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval,
                 if( rd_c.a!=should_be_c.a || rd_c.x!=should_be_c.x ||
                     rd_c.y!=should_be_c.y || rd_c.z!=should_be_c.z)  {
                     H5_FAILED();
-                    puts("    Value read was not correct.");
+                    HDfprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__);
                     printf("    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],
@@ -1285,7 +1285,7 @@ test_extend(hid_t fapl, const char *base_name, H5D_layout_t layout)
 		    &val_rd)<0) goto error;
 	if (val_rd!=fillval) {
 	    H5_FAILED();
-	    puts("    Value read was not a fill value.");
+            HDfprintf(stdout, "%u: Value read was not a fill value.\n", (unsigned)__LINE__);
 	    HDfprintf(stdout,"    Elmt={%Hu,%Hu,%Hu,%Hu,%Hu}, read: %u, "
 		   "Fill value: %u\n",
 		   hs_offset[0], hs_offset[1],
@@ -1330,7 +1330,7 @@ test_extend(hid_t fapl, const char *base_name, H5D_layout_t layout)
 
 	if (val_rd!=should_be) {
 	    H5_FAILED();
-	    puts("    Value read was not correct.");
+            HDfprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__);
 	    HDfprintf(stdout,"    Elmt={%Hu,%Hu,%Hu,%Hu,%Hu}, read: %u, "
 		   "should be: %u\n",
 		   hs_offset[0], hs_offset[1],
@@ -1366,7 +1366,7 @@ test_extend(hid_t fapl, const char *base_name, H5D_layout_t layout)
 
 	if (val_rd!=should_be) {
 	    H5_FAILED();
-	    puts("    Value read was not correct.");
+	    HDfprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__);
 	    HDfprintf(stdout,"    Elmt={%Hu,%Hu,%Hu,%Hu,%Hu}, read: %u, "
 		   "should be: %u\n",
 		   hs_offset[0], hs_offset[1],