diff options
| author | kmu <kmu@hdfgroup.org> | 2019-12-09 15:18:56 (GMT) |
|---|---|---|
| committer | kmu <kmu@hdfgroup.org> | 2019-12-09 15:18:56 (GMT) |
| commit | 8b51394f3841012f3c06bf380082a83f66a68168 (patch) | |
| tree | cfb41461a5f1f9bc14e8f3118ce541e1997aa485 /hl | |
| parent | 189935ff260cae6fb4e061fa68bd7b93e219c635 (diff) | |
| parent | 1f871e23b7c3fdec925004f2cd39d3a2cdd8decb (diff) | |
| download | hdf5-8b51394f3841012f3c06bf380082a83f66a68168.zip hdf5-8b51394f3841012f3c06bf380082a83f66a68168.tar.gz hdf5-8b51394f3841012f3c06bf380082a83f66a68168.tar.bz2 | |
Merge branch 'develop' into bugfix/intel_warnings
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/src/H5DS.c | 4 | ||||
| -rw-r--r-- | hl/test/H5srcdir_str.h.in | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c index ce61028..b24f887 100644 --- a/hl/src/H5DS.c +++ b/hl/src/H5DS.c @@ -1434,10 +1434,6 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label) char ** buf; /* discarding the 'const' qualifier in the free */ char const ** const_buf; /* buf calls */ } u; - - u.buf = NULL; - u.const_buf = NULL; - /*------------------------------------------------------------------------- * parameter checking *------------------------------------------------------------------------- diff --git a/hl/test/H5srcdir_str.h.in b/hl/test/H5srcdir_str.h.in index ba30a88..bab1df3 100644 --- a/hl/test/H5srcdir_str.h.in +++ b/hl/test/H5srcdir_str.h.in @@ -16,5 +16,5 @@ */ /* Set the 'srcdir' path from configure time */ -#define config_srcdir "@srcdir@" +static const char *config_srcdir = "@srcdir@"; |