summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2018-04-06 16:12:06 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2018-04-06 16:12:06 (GMT)
commit051c5fa9b3541dce7c8d90e7fbab95c9e51bc709 (patch)
tree51f991973543d26428282abf46f7038d66e4ba7a
parent048ae59d2970dd21810577c999f756c028b6faaf (diff)
parent02039e0a91cf1baae46d52a77c521fc6357b7c90 (diff)
downloadhdf5-051c5fa9b3541dce7c8d90e7fbab95c9e51bc709.zip
hdf5-051c5fa9b3541dce7c8d90e7fbab95c9e51bc709.tar.gz
hdf5-051c5fa9b3541dce7c8d90e7fbab95c9e51bc709.tar.bz2
Merge pull request #1018 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit '02039e0a91cf1baae46d52a77c521fc6357b7c90': Minor warning cleanup while working on VOL issues.
-rw-r--r--src/H5B2dbg.c4
-rw-r--r--src/H5F.c2
-rw-r--r--test/objcopy.c1
-rw-r--r--test/ohdr.c20
-rw-r--r--test/tfile.c6
5 files changed, 15 insertions, 18 deletions
diff --git a/src/H5B2dbg.c b/src/H5B2dbg.c
index dc079f1..c4f56e5 100644
--- a/src/H5B2dbg.c
+++ b/src/H5B2dbg.c
@@ -218,7 +218,7 @@ H5B2__int_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth,
*/
H5_CHECK_OVERFLOW(depth, unsigned, uint16_t);
node_ptr.addr = addr;
- H5_CHECKED_ASSIGN(node_ptr.node_nrec, unsigned, nrec, uint16_t)
+ H5_CHECKED_ASSIGN(node_ptr.node_nrec, uint16_t, nrec, unsigned)
if(NULL == (internal = H5B2__protect_internal(hdr, NULL, &node_ptr, (uint16_t)depth, FALSE, H5AC__READ_ONLY_FLAG)))
HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree internal node")
@@ -330,7 +330,7 @@ H5B2__leaf_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth,
*/
H5_CHECK_OVERFLOW(nrec, unsigned, uint16_t);
node_ptr.addr = addr;
- H5_CHECKED_ASSIGN(node_ptr.node_nrec, unsigned, nrec, uint16_t)
+ H5_CHECKED_ASSIGN(node_ptr.node_nrec, uint16_t, nrec, unsigned)
if(NULL == (leaf = H5B2__protect_leaf(hdr, NULL, &node_ptr, FALSE, H5AC__READ_ONLY_FLAG)))
HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
diff --git a/src/H5F.c b/src/H5F.c
index 8023a04..6d62c08 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -1344,7 +1344,7 @@ H5Fstart_swmr_write(hid_t file_id)
/* Call the internal routine */
if(H5F__start_swmr_write(file) < 0)
- HGOTO_ERROR(H5E_FILE, H5E_CANTCONVERT, FAIL, "unable to convert file format")
+ HGOTO_ERROR(H5E_FILE, H5E_CANTCONVERT, FAIL, "unable to convert file format")
done:
FUNC_LEAVE_API(ret_value)
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 */