Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)

* commit '3211e907f4f9349ba7510d70cfbcc6ee36d99c58':
  Remove vestiges of H5_DEBUG_BUILD macro, switching it to the more standard H5CX_DEBUG form.
  Minor warning cleanup while working on VOL issues.

3 files changed, 12 insertions, 15 deletions

diff --git a/test/objcopy.c b/test/objcopy.c
index e88d508..3fbb7b8 100644
--- a/test/objcopy.c
+++ b/test/objcopy.c
@@ -145,7 +145,6 @@ const char *FILENAME[] = {
 #define NAME_LINK_EXTERN_DANGLE "/g_links/external_link_to_nowhere"
 #define NAME_LINK_EXTERN_DANGLE2        "/g_links2/external_link_to_nowhere"
 #define NAME_OLD_FORMAT        "/dset1"
-#define NAME_DSET_NULL      "DSET_NULL"
 
 #define NAME_BUF_SIZE   1024
 #define ATTR_NAME_LEN 80
diff --git a/test/ohdr.c b/test/ohdr.c
index d0f6966..e91c6a8 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -735,40 +735,40 @@ error:
 #define STR_EARLIEST "earliest"
 #define STR_V18 "v18"
 #define STR_LATEST "latest"
-static char *version_string(H5F_libver_t libver)
+static char *
+version_string(H5F_libver_t libver)
 {
     char *str = NULL;
 
     str = (char *) HDmalloc(20);
-    if (str == NULL)
-    {
-        fprintf(stderr, "Allocation failed\n");
-        exit(1);
+    if (str == NULL) {
+        HDfprintf(stderr, "Allocation failed\n");
+        HDexit(1);
     }
 
     switch(libver) {
       case H5F_LIBVER_EARLIEST:
-          strcpy(str, STR_EARLIEST);
+          HDstrcpy(str, STR_EARLIEST);
           break;
 
       case H5F_LIBVER_V18:
-          strcpy(str, STR_V18);
+          HDstrcpy(str, STR_V18);
           break;
 
       case H5F_LIBVER_V110:
           HDassert(H5F_LIBVER_LATEST == H5F_LIBVER_V110);
-          strcpy(str, STR_LATEST);
+          HDstrcpy(str, STR_LATEST);
           break;
 
       case H5F_LIBVER_ERROR:
       case H5F_LIBVER_NBOUNDS:
       default:
-          sprintf(str, "%ld", (long)libver);
+          HDsprintf(str, "%ld", (long)libver);
           break;
     } /* end switch */
 
     /* Return the formed version bound string */
-    return(str);
+    return str;
 } /* end of version_string */
 
 
diff --git a/test/tfile.c b/test/tfile.c
index 80c1e11..677fd06 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -181,8 +181,6 @@ static void test_libver_bounds_datatype(hid_t fapl);
 static void test_libver_bounds_datatype_check(hid_t fapl, hid_t tid);
 static void test_libver_bounds_attributes(hid_t fapl);
 
-#define FILE8            "tfile8.h5"    /* Test file */
-
 #define DSET_NULL    "DSET_NULL"
 #define DSET        "DSET"
 #define DSETA        "DSETA"
@@ -6935,7 +6933,7 @@ test_libver_macros2(void)
 **
 ****************************************************************/
 static void
-test_incr_filesize(const char *env_h5_drvr)
+test_incr_filesize(void)
 {
     hid_t    fid;                       /* File opened with read-write permission */
     h5_stat_size_t filesize;            /* Size of file when empty */
@@ -7337,7 +7335,7 @@ test_file(void)
     test_libver_bounds_low_high();
     test_libver_macros();                       /* Test the macros for library version comparison */
     test_libver_macros2();                      /* Test the macros for library version comparison */
-    test_incr_filesize(env_h5_drvr);            /* Test H5Fincrement_filesize() and H5Fget_eoa() */
+    test_incr_filesize();                       /* Test H5Fincrement_filesize() and H5Fget_eoa() */
 #ifndef H5_NO_DEPRECATED_SYMBOLS
     test_deprec();                              /* Test deprecated routines */
 #endif /* H5_NO_DEPRECATED_SYMBOLS */