diff options
| author | David Young <dyoung@hdfgroup.org> | 2019-11-27 17:26:02 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2019-11-27 17:26:02 (GMT) |
| commit | 0108072f7a746b809952d5cc560577f931b64f71 (patch) | |
| tree | da729387e6ffc48a0fc3f2c73d57ff3e8b11457c /tools/src | |
| parent | 8fb9fb5d4dab0b7e9a9884611d0511e2a03228a2 (diff) | |
| download | hdf5-0108072f7a746b809952d5cc560577f931b64f71.zip hdf5-0108072f7a746b809952d5cc560577f931b64f71.tar.gz hdf5-0108072f7a746b809952d5cc560577f931b64f71.tar.bz2 | |
Revert "Make a squash commit of 'Quiet some warnings by adjusting warnings level and fixing some code.' (commit 5c911d8baf3)"
Diffstat (limited to 'tools/src')
| -rw-r--r-- | tools/src/h5import/h5import.c | 2 | ||||
| -rw-r--r-- | tools/src/h5repack/h5repack_main.c | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/tools/src/h5import/h5import.c b/tools/src/h5import/h5import.c index 65c2359..1eef5ab 100644 --- a/tools/src/h5import/h5import.c +++ b/tools/src/h5import/h5import.c @@ -1428,7 +1428,7 @@ static int processConfigurationFile(char *infile, struct Input *in) /* Initialize machine endian */ volatile uint32_t ibyte=0x01234567; /* 0 for big endian, 1 for little endian. */ - if ((*((volatile uint8_t*)(&ibyte))) == 0x67) { + if ((*((uint8_t*)(&ibyte))) == 0x67) { if ((kindex = OutputByteOrderStrToInt("LE")) == -1) { (void) HDfprintf(stderr, "%s", err11e); return (-1); diff --git a/tools/src/h5repack/h5repack_main.c b/tools/src/h5repack/h5repack_main.c index 16899a3..c628beb 100644 --- a/tools/src/h5repack/h5repack_main.c +++ b/tools/src/h5repack/h5repack_main.c @@ -281,7 +281,7 @@ int read_info(const char *filename, pack_opt_t *options) char comp_info[1024]; FILE *fp = NULL; char c; - int i; + int i, rc = 1; int ret_value = EXIT_SUCCESS; if (NULL == (fp = HDfopen(filename, "r"))) { @@ -412,7 +412,7 @@ set_sort_order(const char *form) static int parse_command_line(int argc, const char **argv, pack_opt_t* options) { - int bound, opt; + int opt; int ret_value = 0; /* parse command line options */ @@ -492,21 +492,19 @@ int parse_command_line(int argc, const char **argv, pack_opt_t* options) break; case 'j': - bound = HDatoi(opt_arg); - if (bound < H5F_LIBVER_EARLIEST || bound > H5F_LIBVER_LATEST) { + options->low_bound = (H5F_libver_t)HDatoi(opt_arg); + if (options->low_bound < H5F_LIBVER_EARLIEST || options->low_bound > H5F_LIBVER_LATEST) { error_msg("in parsing low bound\n"); goto done; } - options->low_bound = bound; break; case 'k': - bound = HDatoi(opt_arg); - if (bound < H5F_LIBVER_EARLIEST || bound > H5F_LIBVER_LATEST) { + options->high_bound = (H5F_libver_t)HDatoi(opt_arg); + if (options->high_bound < H5F_LIBVER_EARLIEST || options->high_bound > H5F_LIBVER_LATEST) { error_msg("in parsing high bound\n"); goto done; } - options->high_bound = bound; break; case 'c': |