diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-12-20 20:18:01 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-12-20 20:18:01 (GMT) |
| commit | de0f6670767e952c5a0a7bb3418164f42d92ba6f (patch) | |
| tree | 5276cd6fadd6150432a6010f0aaddd97376306cc | |
| parent | 23f813026f06f3ed9aa9fea86df265950eb6770f (diff) | |
| download | hdf5-de0f6670767e952c5a0a7bb3418164f42d92ba6f.zip hdf5-de0f6670767e952c5a0a7bb3418164f42d92ba6f.tar.gz hdf5-de0f6670767e952c5a0a7bb3418164f42d92ba6f.tar.bz2 | |
Fix compile statement order
| -rw-r--r-- | tools/lib/h5diff_array.c | 4 | ||||
| -rw-r--r-- | tools/lib/h5diff_attr.c | 2 | ||||
| -rw-r--r-- | tools/lib/h5tools_str.c | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c index ef13da0..dcc2c81 100644 --- a/tools/lib/h5diff_array.c +++ b/tools/lib/h5diff_array.c @@ -702,11 +702,11 @@ static hsize_t diff_datum( */ case H5T_ARRAY: { - H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "diff_datum H5T_ARRAY"); hid_t memb_type = -1; hsize_t adims[H5S_MAX_RANK]; int ndims; + H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "diff_datum H5T_ARRAY"); /* get the array's base datatype for each element */ memb_type = H5Tget_super(m_type); size = H5Tget_size(memb_type); @@ -747,7 +747,6 @@ static hsize_t diff_datum( *------------------------------------------------------------------------- */ if (H5Tequal(m_type, H5T_STD_REF)) { - H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "diff_datum H5T_REFERENCE - H5T_STD_REF"); /* if (type_size == H5R_STD_REF_SIZE) */ hid_t region1_id = -1; hid_t region2_id = -1; @@ -757,6 +756,7 @@ static hsize_t diff_datum( H5O_type_t obj2_type = -1; /* Object type */ H5R_type_t ref_type; /* Reference type */ + H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "diff_datum H5T_REFERENCE - H5T_STD_REF"); ref_type = H5Rget_type(ref1_buf); switch (ref_type) { case H5R_OBJECT1: diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c index bd66567..40a3b01 100644 --- a/tools/lib/h5diff_attr.c +++ b/tools/lib/h5diff_attr.c @@ -550,9 +550,9 @@ hsize_t diff_attr(hid_t loc1_id, hid_t loc2_id, const char *path1, const char *p unsigned u; /* Local index variable */ hsize_t nfound = 0; hsize_t nfound_total = 0; + table_attrs_t *match_list_attrs = NULL; H5TOOLS_PUSH_STACK(); - table_attrs_t *match_list_attrs = NULL; H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "diff_attr start - errstat:%d", opts->err_stat); if(build_match_list_attrs(loc1_id, loc2_id, &match_list_attrs, opts) < 0) { diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c index f734cce..4b27847 100644 --- a/tools/lib/h5tools_str.c +++ b/tools/lib/h5tools_str.c @@ -1320,9 +1320,10 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai case H5T_BITFIELD: case H5T_OPAQUE: { - H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "OTHER"); /* All other types get printed as hexadecimal */ size_t i; + + H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "OTHER"); if(1 == nsize) h5tools_str_append(str, "0x%02x", ucp_vp[0]); else |