summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVailin Choi <vchoi@jam.ad.hdfgroup.org>2018-07-12 23:25:49 (GMT)
committerVailin Choi <vchoi@jam.ad.hdfgroup.org>2018-07-12 23:25:49 (GMT)
commit92bf81a0fbad8e263c1e0d3c5791f49b78046afb (patch)
tree5e4d43ce6e3bd409a6c5fa51d8510e70230b108a
parentd1f8ac331222351a63147ab54271ac9d5b271f0b (diff)
downloadhdf5-92bf81a0fbad8e263c1e0d3c5791f49b78046afb.zip
hdf5-92bf81a0fbad8e263c1e0d3c5791f49b78046afb.tar.gz
hdf5-92bf81a0fbad8e263c1e0d3c5791f49b78046afb.tar.bz2
Changes based on feedback from pull request.
-rw-r--r--src/H5Ofill.c4
-rw-r--r--tools/test/h5dump/h5dumpgentest.c4
-rw-r--r--tools/test/h5stat/h5stat_gentest.c1
3 files changed, 3 insertions, 6 deletions
diff --git a/src/H5Ofill.c b/src/H5Ofill.c
index 3ce2e4f..da9829b 100644
--- a/src/H5Ofill.c
+++ b/src/H5Ofill.c
@@ -19,7 +19,6 @@
*/
#include "H5Omodule.h" /* This source code file is part of the H5O module */
-#define H5T_FRIEND /*prevent warning from including H5Tpkg */
#include "H5private.h" /* Generic Functions */
@@ -32,7 +31,6 @@
#include "H5Pprivate.h" /* Property lists */
#include "H5Sprivate.h" /* Dataspaces */
-#include "H5Tpkg.h" /* Datatypes */
static void *H5O_fill_old_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags,
unsigned *ioflags, size_t p_size, const uint8_t *p);
@@ -345,7 +343,7 @@ H5O_fill_old_decode(H5F_t *f, H5O_t *open_oh,
if((dt = H5O_msg_read_oh(f, open_oh, H5O_DTYPE_ID, NULL)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, NULL, "can't read DTYPE message")
/* Verify size */
- if(fill->size != dt->shared->size)
+ if(fill->size != H5T_GET_SIZE(dt))
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, NULL, "inconsistent fill value size")
}
diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c
index f34d479..9e9f6f1 100644
--- a/tools/test/h5dump/h5dumpgentest.c
+++ b/tools/test/h5dump/h5dumpgentest.c
@@ -10494,8 +10494,8 @@ gent_err_attr_dspace()
{
hid_t fid = -1; /* File identifier */
hid_t fcpl = -1; /* File access property list */
- hid_t sid; /* Dataspace identifier */
- hid_t aid; /* Attribute identifier */
+ hid_t sid = -1; /* Dataspace identifier */
+ hid_t aid = -1; /* Attribute identifier */
hsize_t dims = 2; /* Dimensino size */
int wdata[2] = {7, 42}; /* The buffer to write */
int fd = -1; /* The file descriptor */
diff --git a/tools/test/h5stat/h5stat_gentest.c b/tools/test/h5stat/h5stat_gentest.c
index 01206dd..2daf24b 100644
--- a/tools/test/h5stat/h5stat_gentest.c
+++ b/tools/test/h5stat/h5stat_gentest.c
@@ -455,7 +455,6 @@ static void
gen_err_refcount(const char *fname)
{
hid_t fid = -1; /* File identifier */
- hid_t fapl = -1; /* File access property list */
hid_t sid = -1; /* Dataspace message */
hid_t did = -1; /* Dataset identifier */
hid_t gid = -1; /* Group identifier */