Skip to content

Commit

Permalink
Merge pull request #21 from byrnHDF/hdf5_1_10
Browse files Browse the repository at this point in the history
h5repacktest VFD fix and formatting changes
  • Loading branch information
lrknox authored Oct 6, 2020
2 parents ab7333f + ad5710e commit d1adf43
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 10 deletions.
6 changes: 1 addition & 5 deletions hl/src/H5LTanalyze.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions src/H5Fquery.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
*-------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion tools/test/h5repack/h5repack.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions tools/test/h5repack/h5repacktst.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit d1adf43

Please sign in to comment.