diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2020-10-06 11:47:44 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-06 11:47:44 (GMT) |
| commit | d1adf43852c29d9c81372a83b5ed2a5b943c5c6d (patch) | |
| tree | 01728234e86353cc159c0920fd31f62f93397bc3 | |
| parent | ab7333fd8b26eebbd1cfe215a34047d1c5502afc (diff) | |
| parent | ad5710ef668322c241df1442c335bfc7f09b5184 (diff) | |
| download | hdf5-d1adf43852c29d9c81372a83b5ed2a5b943c5c6d.zip hdf5-d1adf43852c29d9c81372a83b5ed2a5b943c5c6d.tar.gz hdf5-d1adf43852c29d9c81372a83b5ed2a5b943c5c6d.tar.bz2 | |
Merge pull request #21 from byrnHDF/hdf5_1_10
h5repacktest VFD fix and formatting changes
| -rw-r--r-- | hl/src/H5LTanalyze.c | 6 | ||||
| -rw-r--r-- | src/H5Fquery.c | 4 | ||||
| -rw-r--r-- | tools/test/h5repack/h5repack.sh.in | 2 | ||||
| -rw-r--r-- | tools/test/h5repack/h5repacktst.c | 2 |
4 files changed, 4 insertions, 10 deletions
diff --git a/hl/src/H5LTanalyze.c b/hl/src/H5LTanalyze.c index 41e77b0..afef871 100644 --- a/hl/src/H5LTanalyze.c +++ b/hl/src/H5LTanalyze.c @@ -2413,11 +2413,7 @@ yy_scan_buffer(char *base, yy_size_t size) * yy_scan_bytes() instead. */ YY_BUFFER_STATE -yy_scan_string(const char *yystr) -{ - - return yy_scan_bytes(yystr, (int)strlen(yystr)); -} +yy_scan_string(const char *yystr) { return yy_scan_bytes(yystr, (int)strlen(yystr)); } /** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. diff --git a/src/H5Fquery.c b/src/H5Fquery.c index 580c5fa..7609ea4 100644 --- a/src/H5Fquery.c +++ b/src/H5Fquery.c @@ -200,8 +200,8 @@ H5F_get_actual_name(const H5F_t *f) * Function: H5F_get_extpath * * Purpose: Retrieve the file's 'extpath' flags - * This is used by H5L_extern_traverse() and H5D_build_file_prefix() to retrieve the main file's - *location when searching the target file. + * This is used by H5L_extern_traverse() and H5D_build_file_prefix() + * to retrieve the main file's location when searching the target file. * * Return: 'extpath' on success/abort on failure (shouldn't fail) *------------------------------------------------------------------------- diff --git a/tools/test/h5repack/h5repack.sh.in b/tools/test/h5repack/h5repack.sh.in index 431f959..5e5b09c 100644 --- a/tools/test/h5repack/h5repack.sh.in +++ b/tools/test/h5repack/h5repack.sh.in @@ -683,7 +683,7 @@ DIFFFAIL() $RUNSERIAL $H5DIFF_BIN -q "$@" ) RET=$? - if [ $RET == 0 ] ; then + if [ $RET -eq 0 ] ; then echo "*FAILED*" nerrors="`expr $nerrors + 1`" else diff --git a/tools/test/h5repack/h5repacktst.c b/tools/test/h5repack/h5repacktst.c index b80ec32..42233a2 100644 --- a/tools/test/h5repack/h5repacktst.c +++ b/tools/test/h5repack/h5repacktst.c @@ -3292,8 +3292,6 @@ make_layout2(hid_t loc_id) if (make_dset(loc_id, CHUNKED_S_FIX, s_sid, chunked_dcpl, s_buf[0]) < 0) goto error; - HDfree(s_buf); - ret_value = 0; error: |