diff options
| author | kmu <kmu@hdfgroup.org> | 2019-11-27 03:59:51 (GMT) |
|---|---|---|
| committer | kmu <kmu@hdfgroup.org> | 2019-11-27 03:59:51 (GMT) |
| commit | ea0759d047dc6421da90375a9c27f7cde0a8e117 (patch) | |
| tree | 81df83e8c53a80b61365d579b26aeb9532fe493f /hl | |
| parent | e0262c8bedf0e59b7b32b02ecd91ed50cf834a1c (diff) | |
| parent | 9f61c26927ac74c4498cbebd7c9f2166d5f5b786 (diff) | |
| download | hdf5-ea0759d047dc6421da90375a9c27f7cde0a8e117.zip hdf5-ea0759d047dc6421da90375a9c27f7cde0a8e117.tar.gz hdf5-ea0759d047dc6421da90375a9c27f7cde0a8e117.tar.bz2 | |
Merge branch 'develop' of https://git.hdfgroup.org/scm/hdffv/hdf5 into develop
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/c++/examples/run-hlc++-ex.sh.in | 2 | ||||
| -rw-r--r-- | hl/examples/run-hlc-ex.sh.in | 2 | ||||
| -rw-r--r-- | hl/src/H5DS.c | 4 | ||||
| -rw-r--r-- | hl/test/H5srcdir_str.h.in | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/hl/c++/examples/run-hlc++-ex.sh.in b/hl/c++/examples/run-hlc++-ex.sh.in index e46534a..43831f5 100644 --- a/hl/c++/examples/run-hlc++-ex.sh.in +++ b/hl/c++/examples/run-hlc++-ex.sh.in @@ -47,7 +47,7 @@ prefix=@prefix@ examplesdir=@examplesdir@ if [ ${examplesdir##${prefix}/} != ${examplesdir} ]; then echo $(echo ${examplesdir##${prefix}/} | \ - sed -E 's,[^/]+,..,g') + sed 's,[^/][^/]*,..,g') else echo $prefix fi diff --git a/hl/examples/run-hlc-ex.sh.in b/hl/examples/run-hlc-ex.sh.in index ceb77dd..e6d0cc9 100644 --- a/hl/examples/run-hlc-ex.sh.in +++ b/hl/examples/run-hlc-ex.sh.in @@ -46,7 +46,7 @@ prefix=@prefix@ examplesdir=@examplesdir@ if [ ${examplesdir##${prefix}/} != ${examplesdir} ]; then echo $(echo ${examplesdir##${prefix}/} | \ - sed -E 's,[^/]+,..,g') + sed 's,[^/][^/]*,..,g') else echo $prefix fi diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c index b24f887..ce61028 100644 --- a/hl/src/H5DS.c +++ b/hl/src/H5DS.c @@ -1434,6 +1434,10 @@ 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 bab1df3..ba30a88 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 */ -static const char *config_srcdir = "@srcdir@"; +#define config_srcdir "@srcdir@" |