diff options
Diffstat (limited to 'tools/src')
-rw-r--r-- | tools/src/h5copy/h5copy.c | 2 | ||||
-rw-r--r-- | tools/src/h5diff/ph5diff_main.c | 2 | ||||
-rw-r--r-- | tools/src/h5dump/h5dump_ddl.c | 2 | ||||
-rw-r--r-- | tools/src/h5dump/h5dump_xml.c | 4 | ||||
-rw-r--r-- | tools/src/h5format_convert/h5format_convert.c | 3 | ||||
-rw-r--r-- | tools/src/h5import/h5import.c | 12 | ||||
-rw-r--r-- | tools/src/h5jam/h5unjam.c | 1 | ||||
-rw-r--r-- | tools/src/h5repack/h5repack.c | 4 | ||||
-rw-r--r-- | tools/src/h5repack/h5repack_copy.c | 6 | ||||
-rw-r--r-- | tools/src/h5repack/h5repack_parse.c | 2 | ||||
-rw-r--r-- | tools/src/h5repack/h5repack_refs.c | 10 | ||||
-rw-r--r-- | tools/src/h5repack/h5repack_verify.c | 4 | ||||
-rw-r--r-- | tools/src/misc/h5delete.c | 2 | ||||
-rw-r--r-- | tools/src/misc/h5repart.c | 2 |
14 files changed, 27 insertions, 29 deletions
diff --git a/tools/src/h5copy/h5copy.c b/tools/src/h5copy/h5copy.c index 9756d11..72cd88e 100644 --- a/tools/src/h5copy/h5copy.c +++ b/tools/src/h5copy/h5copy.c @@ -488,7 +488,7 @@ done: H5Fclose(fid_src); H5Fclose(fid_dst); } - H5E_END_TRY; + H5E_END_TRY leave(ret_value); } diff --git a/tools/src/h5diff/ph5diff_main.c b/tools/src/h5diff/ph5diff_main.c index 64b1f28..f65d2b0 100644 --- a/tools/src/h5diff/ph5diff_main.c +++ b/tools/src/h5diff/ph5diff_main.c @@ -150,7 +150,7 @@ ph5diff_worker(int nID) } /* enable error reporting */ } - H5E_END_TRY; + H5E_END_TRY } /* Check for work */ else if (Status.MPI_TAG == MPI_TAG_ARGS) { diff --git a/tools/src/h5dump/h5dump_ddl.c b/tools/src/h5dump/h5dump_ddl.c index 3eaa2f9..9d59c95 100644 --- a/tools/src/h5dump/h5dump_ddl.c +++ b/tools/src/h5dump/h5dump_ddl.c @@ -1649,7 +1649,7 @@ error: H5Oclose(oid); H5Aclose(attr_id); } - H5E_END_TRY; + H5E_END_TRY dump_indent -= COL; } diff --git a/tools/src/h5dump/h5dump_xml.c b/tools/src/h5dump/h5dump_xml.c index d0bc7e4..80f9142 100644 --- a/tools/src/h5dump/h5dump_xml.c +++ b/tools/src/h5dump/h5dump_xml.c @@ -3079,7 +3079,7 @@ error: H5Tclose(type); H5Sclose(space); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } @@ -3249,7 +3249,7 @@ error: H5Tclose(type); H5Sclose(space); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } diff --git a/tools/src/h5format_convert/h5format_convert.c b/tools/src/h5format_convert/h5format_convert.c index 200f735..82f91e7 100644 --- a/tools/src/h5format_convert/h5format_convert.c +++ b/tools/src/h5format_convert/h5format_convert.c @@ -162,7 +162,6 @@ parse_command_line(int argc, const char *const *argv) error: return -1; - ; } /* parse_command_line() */ /*------------------------------------------------------------------------- @@ -334,7 +333,7 @@ error: H5Pclose(dcpl); H5Dclose(did); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* convert() */ diff --git a/tools/src/h5import/h5import.c b/tools/src/h5import/h5import.c index 5a2fae3..428d32f 100644 --- a/tools/src/h5import/h5import.c +++ b/tools/src/h5import/h5import.c @@ -1021,7 +1021,7 @@ processStrData(FILE *strm, struct Input *in, hid_t file_id) /*enable error reporting */ } - H5E_END_TRY; + H5E_END_TRY if ((space_id = H5Screate_simple(1, dims, NULL)) < 0) goto out; @@ -1147,7 +1147,7 @@ processStrHDFData(FILE *strm, struct Input *in, hid_t file_id) /*enable error reporting */ } - H5E_END_TRY; + H5E_END_TRY #ifdef H5DEBUGIMPORT HDprintf("processStrHDFData DATATYPE STRING groups created\n"); #endif @@ -1249,7 +1249,7 @@ out: H5Sclose(mspace_id); H5Tclose(type_id); } - H5E_END_TRY; + H5E_END_TRY return (-1); } @@ -4629,7 +4629,7 @@ process(struct Options *opt) } } } - H5E_END_TRY; + H5E_END_TRY for (k = 0; k < opt->fcount; k++) { in = &(opt->infiles[k].in); @@ -4677,7 +4677,7 @@ process(struct Options *opt) /*enable error reporting */ } - H5E_END_TRY; + H5E_END_TRY /*create data type */ intype = createInputDataType(in); @@ -4733,7 +4733,7 @@ process(struct Options *opt) /*enable error reporting */ } - H5E_END_TRY; + H5E_END_TRY /* write dataset */ if (H5Dwrite(dataset, intype, H5S_ALL, H5S_ALL, H5P_DEFAULT, (VOIDP)in->data) < 0) { diff --git a/tools/src/h5jam/h5unjam.c b/tools/src/h5jam/h5unjam.c index d130b38..1c8c24a 100644 --- a/tools/src/h5jam/h5unjam.c +++ b/tools/src/h5jam/h5unjam.c @@ -109,7 +109,6 @@ parse_command_line(int argc, const char *const *argv) if (input_file) h5tools_set_input_file(input_file, 1); break; - ; case 'u': ub_file = HDstrdup(H5_optarg); diff --git a/tools/src/h5repack/h5repack.c b/tools/src/h5repack/h5repack.c index c58943b..0bb0082 100644 --- a/tools/src/h5repack/h5repack.c +++ b/tools/src/h5repack/h5repack.c @@ -575,7 +575,7 @@ done: H5Tclose(ftype_id); H5Aclose(attr_id); } - H5E_END_TRY; + H5E_END_TRY return ret_value; } /* end copy_attr() */ @@ -884,7 +884,7 @@ done: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY if (travt) trav_table_free(travt); return ret_value; diff --git a/tools/src/h5repack/h5repack_copy.c b/tools/src/h5repack/h5repack_copy.c index 42c393b..5275481 100644 --- a/tools/src/h5repack/h5repack_copy.c +++ b/tools/src/h5repack/h5repack_copy.c @@ -390,7 +390,7 @@ done: H5Fclose(fidout); H5Fclose(fidin); } - H5E_END_TRY; + H5E_END_TRY } if (travt) trav_table_free(travt); @@ -1455,7 +1455,7 @@ done: { named_datatype_free(&named_dt_head, 1); } - H5E_END_TRY; + H5E_END_TRY } /* free link info path */ @@ -1480,7 +1480,7 @@ done: H5Tclose(type_in); H5Tclose(type_out); } - H5E_END_TRY; + H5E_END_TRY /* free */ if (buf != NULL) diff --git a/tools/src/h5repack/h5repack_parse.c b/tools/src/h5repack/h5repack_parse.c index 9ffee0a..cee85ac 100644 --- a/tools/src/h5repack/h5repack_parse.c +++ b/tools/src/h5repack/h5repack_parse.c @@ -457,7 +457,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t break; default: break; - }; + } return obj_list; } diff --git a/tools/src/h5repack/h5repack_refs.c b/tools/src/h5repack/h5repack_refs.c index 3c0be30..6bc4a31 100644 --- a/tools/src/h5repack/h5repack_refs.c +++ b/tools/src/h5repack/h5repack_refs.c @@ -172,7 +172,7 @@ do_copy_refobjs(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti H5Rdereference2(dset_in, H5P_DEFAULT, H5R_OBJECT, &buf[u])) < 0) continue; } - H5E_END_TRY; + H5E_END_TRY /* get the name. a valid name could only occur * in the second traversal of the file @@ -260,7 +260,7 @@ do_copy_refobjs(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti &buf[u])) < 0) continue; } - H5E_END_TRY; + H5E_END_TRY /* get the name. a valid name could only occur * in the second traversal of the file @@ -408,7 +408,7 @@ done: H5Tclose(type_in); named_datatype_free(&named_dt_head, 1); } - H5E_END_TRY; + H5E_END_TRY return ret_value; } @@ -795,7 +795,7 @@ done: H5Aclose(attr_id); H5Aclose(attr_out); } - H5E_END_TRY; + H5E_END_TRY return ret_value; } @@ -876,7 +876,7 @@ done: H5Sclose(space_id); H5Oclose(ref_obj_id); } - H5E_END_TRY; + H5E_END_TRY return ret_value; } diff --git a/tools/src/h5repack/h5repack_verify.c b/tools/src/h5repack/h5repack_verify.c index bccf034..572aa48 100644 --- a/tools/src/h5repack/h5repack_verify.c +++ b/tools/src/h5repack/h5repack_verify.c @@ -286,7 +286,7 @@ done: if (travt) trav_table_free(travt); } - H5E_END_TRY; + H5E_END_TRY return ret_value; } /* h5repack_verify() */ @@ -475,7 +475,7 @@ done: if (trav) trav_table_free(trav); } - H5E_END_TRY; + H5E_END_TRY return ret_value; } diff --git a/tools/src/misc/h5delete.c b/tools/src/misc/h5delete.c index ef5b25f..f83b379 100644 --- a/tools/src/misc/h5delete.c +++ b/tools/src/misc/h5delete.c @@ -57,7 +57,7 @@ main(int argc, char *argv[]) /* Only uses the environment variable at this time */ ret = (int)H5Fdelete(name, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY if (ret < 0 && !quiet) HDfprintf(stderr, "Unable to delete storage at: %s\n", name); diff --git a/tools/src/misc/h5repart.c b/tools/src/misc/h5repart.c index c01ec0f..e0201f9 100644 --- a/tools/src/misc/h5repart.c +++ b/tools/src/misc/h5repart.c @@ -483,7 +483,7 @@ main(int argc, char *argv[]) { file = H5Fopen(dst_gen_name, H5F_ACC_RDWR, fapl); } - H5E_END_TRY; + H5E_END_TRY if (file >= 0) { if (H5Fclose(file) < 0) { |