Skip to content

Commit

Permalink
Cleanup tools debug build warnings (#627)
Browse files Browse the repository at this point in the history 
* OESS-98 convert plugin option to FetchContent, add tests

* Fixes for pkcfg files because of plugin option

* OESS-98 fix tools test for plugins

* Keep doxygen comments under 100 chars long - format hint

* Whitespace

* HDFFV-11144 - Reclassify CMake messages

* HDFFV-11099/11100 added help text

* Reworked switch statement to compare string instead

* Fix typo

* Update CDash mode

* Correct name of threadsafe

* Correct option name

* Undo accidental commit

* Note LLVM 10 to 11 format default changes

* Update format plugin

* Undo clang-format version 11 changes

* One more correction

* Update supported platforms

* Revert whitespace changes

* Correct whitespace

* Changes from PR#3

* HDFFV-11213 added option to control gcc10 warnings diagnostics

* HDFFV-11212 Use the new references correctly in JNI utility and tests

* format source

* Fix typo

* Add new test file

* HDFFV-11212 - update test and remove unused arg

* Minor non-space formatting changes

* Use H5I_INVALID_ID instead of "-1"

* source formatting

* add missing testfile, update jni function

* Undo commit of debug code

* remove mislocated file

* Fix h5repack test for handling of fapls and id close

* Update h5diff test files usage text

* HDFFV-11212 add new ref tests for JNI export dataset

* src format update

* Remove blank line typo

* src format typo

* long double requires %Lg

* Another long double foramt specifer S.B. %Lg

* issue with t128bit test

* Windows issue with h5dump and type.

* Fix review issues

* refactor function nesting and fix error checks

* format fixes

* Remove untested functions and javadoc quiet comments

* Restore TRY block.

* Change string append errors to memory exception

* revert to H5_JNI_FATAL_ERROR - support functions need work

* Add assertion error for h5util functions

* remove duplicate function

* format fix

* Revert HD function error handling

* Update copyright comments

* GH #386 java folder copyright corrections

* Whitespace

* GH #359 implement and fix tools 1.6 API usage

* remove excessive comments

* Flip inits to correct ifdef section

* rework ifdef to be simpler

* format issue

* Reformat ifdef inits

* remove static attribute

* format compliance

* Update names

* Revert because logic relies on float not being int

* Changes noticed from creating merge of #412

* Double underscore change

* Correct compiler version variable used

* Remove header guard underscores

* Whitespace cleanup

* Split format source and commit changes on repo push

* remove pre-split setting

* Change windows TS to use older VS.

* correct window os name

* HDFFV-11212 JNI export util and Javadoc

* Suggested review changes

* Another change found

* Committing clang-format changes

* HDFFV-11113 long double in tools

* HDFFV-11113 add note

* Disable long double tests for now

* HDFFV-11228 remove arbitrary CMake warning groups.

* Make each flag a string

* Some Javadoc warning fixes

* Updated javadoc fixes

* # WARNING: head commit changed in the meantime

HDFFV-11229 Fix long double usage in tools and java

Changed h5dump and h5ls to just print 128-bit for long double type.
Added test and file for dataset and attributes with all three float
types.

* Committing clang-format changes

* HDFFV-11229 Add release note

* HDFFV-11229 windows testfile needed

* fix typo

* Remove non supported message text

* HDFFV-11229 - change ldouble test to check both native and general

* HDFFV-11229 add second file compare

* HDFFV-11229 fix reference file

* HDFFV-11229 autotools check two refs

* HDFFV-11229 revert back to removal of NATIVE_LDOUBLE in tools output

* Committing clang-format changes

* Update release note

* Update attribute type of ref file

* Change source of ninja for macs

* try port instead of brew

* Recommended is to use brew.

* Undo non long double changes

* remove unneeded file

* Fix perl and doxygen CMake code

* Add "option" command for clang options

* Rework CMake add_custom to use the BYPRODUCTS argument

* Add stamp files to BYPRODUCTS

* Only one copy of file exists

* Fix custom cmmand depends targets

* Fix fortran custom command DEPENDS

* Add LD_LIBRARY_PATH to tests

* Add custom target for DEPENDS

* Add h5detect conditionaly to generated target DEPENDS

* Correct DEPENDS targets

* Parallel builds need the mpi compiler for pkgconfig scripts.

* install only if MPI build

* Fortran target depends

* Remove incorrect source attribute

* doxygen adjustments

* doxygen build updates

* Correct version

* Correct function version - function has been merged to 1.12

* Correct version string for map functions

* Cleanup warnings for tools debug builds

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
@byrnHDF @github-actions
byrnHDF and github-actions[bot] authored May 5, 2021
1 parent 2f79e3f commit 333a79c
Show file tree
Hide file tree
Showing 8 changed files with 75 additions and 75 deletions.
8 changes: 4 additions & 4 deletions tools/lib/h5diff.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ build_match_list(const char *objname1, trav_info_t *info1, const char *objname2,
done:
*table_out = table;

H5TOOLS_ENDDEBUG("");
H5TOOLS_ENDDEBUG(" ");
}

/*-------------------------------------------------------------------------
Expand Down Expand Up @@ -493,7 +493,7 @@ trav_grp_symlinks(const char *path, const H5L_info2_t *linfo, void *udata)
const char * ext_path;
herr_t ret_value = SUCCEED;

H5TOOLS_START_DEBUG("");
H5TOOLS_START_DEBUG(" ");
/* init linkinfo struct */
HDmemset(&lnk_info, 0, sizeof(h5tool_link_info_t));

Expand Down Expand Up @@ -577,7 +577,7 @@ trav_grp_symlinks(const char *path, const H5L_info2_t *linfo, void *udata)
done:
if (lnk_info.trg_path)
HDfree(lnk_info.trg_path);
H5TOOLS_ENDDEBUG("");
H5TOOLS_ENDDEBUG(" ");
return ret_value;
}

Expand Down Expand Up @@ -627,7 +627,7 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char
trav_table_t *match_list = NULL;
diff_err_t ret_value = H5DIFF_NO_ERR;

H5TOOLS_START_DEBUG("");
H5TOOLS_START_DEBUG(" ");
/* init filenames */
HDmemset(filenames, 0, MAX_FILENAME * 2);
/* init link info struct */
Expand Down
2 changes: 1 addition & 1 deletion tools/lib/h5diff_dset.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,7 @@ diff_can_type(hid_t f_tid1, hid_t f_tid2, int rank1, int rank2, hsize_t *dims1,
int i;
int ret_value = 1;

H5TOOLS_START_DEBUG("");
H5TOOLS_START_DEBUG(" ");
/*-------------------------------------------------------------------------
* check for the same class
*-------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions tools/lib/h5diff_util.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ match_up_memsize(hid_t f_tid1_id, hid_t f_tid2_id, hid_t *m_tid1, hid_t *m_tid2,
{
herr_t ret_value = SUCCEED;

H5TOOLS_START_DEBUG("");
H5TOOLS_START_DEBUG(" ");
if ((*m_size1) != (*m_size2)) {
if ((*m_size1) < (*m_size2)) {
H5Tclose(*m_tid1);
Expand All @@ -362,6 +362,6 @@ match_up_memsize(hid_t f_tid1_id, hid_t f_tid2_id, hid_t *m_tid1, hid_t *m_tid2,
H5TOOLS_GOTO_ERROR(FAIL, "native type sizes do not compare");

done:
H5TOOLS_ENDDEBUG("");
H5TOOLS_ENDDEBUG(" ");
return ret_value;
}
38 changes: 19 additions & 19 deletions tools/lib/h5tools.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1129,7 +1129,7 @@ h5tools_simple_prefix(FILE *stream, const h5tool_format_t *info, h5tools_context
if (!ctx->need_prefix)
return;

H5TOOLS_START_DEBUG("");
H5TOOLS_START_DEBUG(" ");

HDmemset(&prefix, 0, sizeof(h5tools_str_t));
HDmemset(&str, 0, sizeof(h5tools_str_t));
Expand Down Expand Up @@ -1198,7 +1198,7 @@ h5tools_simple_prefix(FILE *stream, const h5tool_format_t *info, h5tools_context
h5tools_str_close(&prefix);
h5tools_str_close(&str);

H5TOOLS_ENDDEBUG("");
H5TOOLS_ENDDEBUG(" ");
}

/*-------------------------------------------------------------------------
Expand Down Expand Up @@ -1444,7 +1444,7 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_contex

ctx->prev_multiline = multiline;

H5TOOLS_ENDDEBUG("");
H5TOOLS_ENDDEBUG(" ");

return dimension_break;
}
Expand Down Expand Up @@ -1485,7 +1485,7 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info, h5tools
int secnum; /* section sequence number */
int multiline; /* datum was multiline */

H5TOOLS_START_DEBUG("");
H5TOOLS_START_DEBUG(" ");
H5TOOLS_DEBUG("elmt_counter=%ld - local_elmt_counter=%ld", elmt_counter, local_elmt_counter);

s = h5tools_str_fmt(buffer, (size_t)0, "%s");
Expand Down Expand Up @@ -1598,7 +1598,7 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info, h5tools

ctx->prev_multiline = multiline;

H5TOOLS_ENDDEBUG("");
H5TOOLS_ENDDEBUG(" ");

return dimension_break;
}
Expand All @@ -1617,7 +1617,7 @@ init_acc_pos(unsigned ndims, const hsize_t *dims, hsize_t *acc, hsize_t *pos, hs
int i;
unsigned j;

H5TOOLS_START_DEBUG("");
H5TOOLS_START_DEBUG(" ");

for (i = 0; (unsigned)i < ndims; i++)
p_min_idx[i] = 0;
Expand All @@ -1632,7 +1632,7 @@ init_acc_pos(unsigned ndims, const hsize_t *dims, hsize_t *acc, hsize_t *pos, hs
pos[j] = 0;
}

H5TOOLS_ENDDEBUG("");
H5TOOLS_ENDDEBUG(" ");
}

/*-------------------------------------------------------------------------
Expand All @@ -1650,7 +1650,7 @@ calc_acc_pos(unsigned ndims, hsize_t elmtno, const hsize_t *acc, hsize_t *pos)
int i;
hsize_t curr_pos = elmtno;

H5TOOLS_START_DEBUG("");
H5TOOLS_START_DEBUG(" ");

if (ndims > 0) {
for (i = 0; i < (int)ndims; i++) {
Expand All @@ -1665,7 +1665,7 @@ calc_acc_pos(unsigned ndims, hsize_t elmtno, const hsize_t *acc, hsize_t *pos)
}
}

H5TOOLS_ENDDEBUG("");
H5TOOLS_ENDDEBUG(" ");

return curr_pos;
}
Expand All @@ -1689,7 +1689,7 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem, hsize_t
hbool_t past_catch = FALSE;
int ret_value = 0;

H5TOOLS_START_DEBUG("");
H5TOOLS_START_DEBUG(" ");
if ((size = H5Tget_size(tid)) == 0)
H5TOOLS_THROW((-1), "H5Tget_size failed");

Expand Down Expand Up @@ -1899,7 +1899,7 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem, hsize_t
} /* end switch */

CATCH
H5TOOLS_ENDDEBUG("");
H5TOOLS_ENDDEBUG(" ");
return ret_value;
}

Expand Down Expand Up @@ -1932,7 +1932,7 @@ render_bin_output_region_data_blocks(hid_t region_id, FILE *stream, hid_t contai
hid_t sid1 = H5I_INVALID_HID;
int ret_value = -1;

H5TOOLS_START_DEBUG("");
H5TOOLS_START_DEBUG(" ");
/* Get the dataspace of the dataset */
if ((sid1 = H5Dget_space(region_id)) < 0)
H5TOOLS_THROW((-1), "H5Dget_space failed");
Expand Down Expand Up @@ -1998,7 +1998,7 @@ done:;
if (H5Sclose(sid1) < 0)
H5TOOLS_ERROR((-1), "H5Sclose failed");

H5TOOLS_ENDDEBUG("");
H5TOOLS_ENDDEBUG(" ");
return ret_value;
}

Expand Down Expand Up @@ -2026,7 +2026,7 @@ render_bin_output_region_blocks(hid_t region_space, hid_t region_id, FILE *strea
hbool_t past_catch = FALSE;
hbool_t ret_value = TRUE;

H5TOOLS_START_DEBUG("");
H5TOOLS_START_DEBUG(" ");
if ((snblocks = H5Sget_select_hyper_nblocks(region_space)) <= 0)
H5TOOLS_THROW(FALSE, "H5Sget_select_hyper_nblocks failed");
nblocks = (hsize_t)snblocks;
Expand Down Expand Up @@ -2062,7 +2062,7 @@ render_bin_output_region_blocks(hid_t region_space, hid_t region_id, FILE *strea
H5_LEAVE(TRUE)

CATCH
H5TOOLS_ENDDEBUG("");
H5TOOLS_ENDDEBUG(" ");
return ret_value;
}

Expand Down Expand Up @@ -2093,7 +2093,7 @@ render_bin_output_region_data_points(hid_t region_space, hid_t region_id, FILE *
void * region_buf = NULL;
int ret_value = 0;

H5TOOLS_START_DEBUG("");
H5TOOLS_START_DEBUG(" ");
if ((type_size = H5Tget_size(type_id)) == 0)
H5TOOLS_GOTO_ERROR((-1), "H5Tget_size failed");

Expand Down Expand Up @@ -2123,7 +2123,7 @@ render_bin_output_region_data_points(hid_t region_space, hid_t region_id, FILE *
if (H5Sclose(mem_space) < 0)
H5TOOLS_ERROR((-1), "H5Sclose failed");

H5TOOLS_ENDDEBUG("");
H5TOOLS_ENDDEBUG(" ");
return ret_value;
}

Expand All @@ -2149,7 +2149,7 @@ render_bin_output_region_points(hid_t region_space, hid_t region_id, FILE *strea
hbool_t past_catch = FALSE;
hbool_t ret_value = TRUE;

H5TOOLS_START_DEBUG("");
H5TOOLS_START_DEBUG(" ");
if ((snpoints = H5Sget_select_elem_npoints(region_space)) <= 0)
H5TOOLS_THROW(FALSE, "H5Sget_select_elem_npoints failed");
npoints = (hsize_t)snpoints;
Expand All @@ -2176,7 +2176,7 @@ render_bin_output_region_points(hid_t region_space, hid_t region_id, FILE *strea

H5_LEAVE(ret_value)
CATCH
H5TOOLS_ENDDEBUG("");
H5TOOLS_ENDDEBUG(" ");
return ret_value;
}

Expand Down
Loading

0 comments on commit 333a79c

Please sign in to comment.