diff options
Diffstat (limited to 'tools/h5repack/h5repack_main.c')
| -rw-r--r-- | tools/h5repack/h5repack_main.c | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/tools/h5repack/h5repack_main.c b/tools/h5repack/h5repack_main.c index d6998d0..9f8a701 100644 --- a/tools/h5repack/h5repack_main.c +++ b/tools/h5repack/h5repack_main.c @@ -20,6 +20,8 @@ #include "h5tools_utils.h" #include "h5repack.h" +/* Name of tool */ +#define PROGRAMNAME "h5repack" static void usage(const char *prog); static void parse_command_line(int argc, const char **argv, pack_opt_t* options); @@ -27,8 +29,6 @@ static void read_info(const char *filename,pack_opt_t *options); /* module-scoped variables */ -const char *progname = "h5repack"; -int d_status = EXIT_SUCCESS; static int has_i_o = 0; const char *infile = NULL; const char *outfile = NULL; @@ -107,6 +107,9 @@ int main(int argc, const char **argv) pack_opt_t options; /*the global options */ int ret=-1; + h5tools_setprogname(PROGRAMNAME); + h5tools_setstatus(EXIT_SUCCESS); + /* initialize options */ h5repack_init(&options, 0, 0, 0, (hsize_t)0); @@ -123,8 +126,8 @@ int main(int argc, const char **argv) if ( strcmp( infile, outfile ) == 0 ) { - error_msg(progname, "file names cannot be the same\n"); - usage(progname); + error_msg("file names cannot be the same\n"); + usage(h5tools_getprogname()); exit(EXIT_FAILURE); } @@ -132,8 +135,8 @@ int main(int argc, const char **argv) else { - error_msg(progname, "file names missing\n"); - usage(progname); + error_msg("file names missing\n"); + usage(h5tools_getprogname()); exit(EXIT_FAILURE); } } @@ -316,10 +319,10 @@ void parse_command_line(int argc, const char **argv, pack_opt_t* options) case 'h': - usage(progname); + usage(h5tools_getprogname()); exit(EXIT_SUCCESS); case 'V': - print_version(progname); + print_version(h5tools_getprogname()); exit(EXIT_SUCCESS); case 'v': options->verbose = 1; @@ -329,7 +332,7 @@ void parse_command_line(int argc, const char **argv, pack_opt_t* options) /* parse the -f filter option */ if (h5repack_addfilter( opt_arg, options)<0) { - error_msg(progname, "in parsing filter\n"); + error_msg("in parsing filter\n"); exit(EXIT_FAILURE); } break; @@ -338,7 +341,7 @@ void parse_command_line(int argc, const char **argv, pack_opt_t* options) /* parse the -l layout option */ if (h5repack_addlayout( opt_arg, options)<0) { - error_msg(progname, "in parsing layout\n"); + error_msg("in parsing layout\n"); exit(EXIT_FAILURE); } break; @@ -349,7 +352,7 @@ void parse_command_line(int argc, const char **argv, pack_opt_t* options) options->min_comp = atoi( opt_arg ); if ((int)options->min_comp<=0) { - error_msg(progname, "invalid minimum compress size <%s>\n", opt_arg ); + error_msg("invalid minimum compress size <%s>\n", opt_arg ); exit(EXIT_FAILURE); } break; @@ -442,7 +445,7 @@ void parse_command_line(int argc, const char **argv, pack_opt_t* options) options->alignment = atol( opt_arg ); if ( options->alignment < 1 ) { - error_msg(progname, "invalid alignment size\n", opt_arg ); + error_msg("invalid alignment size\n", opt_arg ); exit(EXIT_FAILURE); } break; @@ -461,7 +464,7 @@ void parse_command_line(int argc, const char **argv, pack_opt_t* options) else if(!strcmp(strategy, "VFD")) options->fs_strategy = H5F_FILE_SPACE_VFD; else { - error_msg(progname, "invalid file space management strategy\n", opt_arg ); + error_msg("invalid file space management strategy\n", opt_arg ); exit(EXIT_FAILURE); } break; @@ -481,8 +484,8 @@ void parse_command_line(int argc, const char **argv, pack_opt_t* options) /* check for file names to be processed */ if (argc <= opt_ind || argv[ opt_ind + 1 ] == NULL) { - error_msg(progname, "missing file names\n"); - usage(progname); + error_msg("missing file names\n"); + usage(h5tools_getprogname()); exit(EXIT_FAILURE); } } @@ -515,7 +518,7 @@ void read_info(const char *filename, int i, rc=1; if ((fp = fopen(filename, "r")) == (FILE *)NULL) { - error_msg(progname, "cannot open options file %s\n", filename); + error_msg("cannot open options file %s\n", filename); exit(EXIT_FAILURE); } @@ -552,7 +555,7 @@ void read_info(const char *filename, comp_info[i-1]='\0'; /*cut the last " */ if (h5repack_addfilter(comp_info,options)==-1){ - error_msg(progname, "could not add compression option\n"); + error_msg("could not add compression option\n"); exit(EXIT_FAILURE); } } @@ -582,7 +585,7 @@ void read_info(const char *filename, comp_info[i-1]='\0'; /*cut the last " */ if (h5repack_addlayout(comp_info,options)==-1){ - error_msg(progname, "could not add chunck option\n"); + error_msg("could not add chunck option\n"); exit(EXIT_FAILURE); } } @@ -591,7 +594,7 @@ void read_info(const char *filename, *------------------------------------------------------------------------- */ else { - error_msg(progname, "bad file format for %s", filename); + error_msg("bad file format for %s", filename); exit(EXIT_FAILURE); } } |