Dead code removal

This commit is contained in:
Shahram Najm 2023-08-22 17:26:42 +01:00
parent c19b933b0f
commit 9b5452d002
1 changed files with 8 additions and 26 deletions

View File

@ -238,8 +238,6 @@ int grib_tool_before_getopt(grib_runtime_options* options)
int grib_tool_init(grib_runtime_options* options) int grib_tool_init(grib_runtime_options* options)
{ {
int ret = 0, i; int ret = 0, i;
int nfiles = 1;
char orderby[] = "md5Headers";
grib_context* context = grib_context_get_default(); grib_context* context = grib_context_get_default();
options->strict = 1; options->strict = 1;
@ -306,27 +304,12 @@ int grib_tool_init(grib_runtime_options* options)
/* Check 1st file is not a directory */ /* Check 1st file is not a directory */
exit_if_input_is_directory(tool_name, options->infile_extra->name); exit_if_input_is_directory(tool_name, options->infile_extra->name);
if (grib_options_on("r")) { options->random = 0;
const char* filename[1]; options->infile_extra->file = fopen(options->infile_extra->name, "r");
filename[0] = options->infile_extra->name;
options->random = 1;
options->orderby = strdup(orderby);
options->idx = grib_fieldset_new_from_files(context, filename,
nfiles, 0, 0, 0, orderby, &ret);
if (ret) {
fprintf(stderr, "%s: Unable to create index for input file %s (%s)",
tool_name, options->infile_extra->name, grib_get_error_message(ret));
exit(ret);
}
}
else {
options->random = 0;
options->infile_extra->file = fopen(options->infile_extra->name, "r");
if (!options->infile_extra->file) { if (!options->infile_extra->file) {
perror(options->infile_extra->name); perror(options->infile_extra->name);
exit(1); exit(1);
}
} }
global_tolerance = 0; global_tolerance = 0;
@ -483,10 +466,9 @@ int grib_tool_new_handle_action(grib_runtime_options* options, grib_handle* h)
return 0; return 0;
} }
else if (options->random) else {
global_handle = grib_fieldset_next_handle(options->idx, &err);
else
global_handle = bufr_handle_new_from_file_x(h->context, options->infile_extra->file, options->mode, 0, &err); global_handle = bufr_handle_new_from_file_x(h->context, options->infile_extra->file, options->mode, 0, &err);
}
if (!global_handle || err != GRIB_SUCCESS) { if (!global_handle || err != GRIB_SUCCESS) {
morein2++; morein2++;
@ -530,7 +512,7 @@ int grib_tool_new_handle_action(grib_runtime_options* options, grib_handle* h)
int grib_tool_skip_handle(grib_runtime_options* options, grib_handle* h) int grib_tool_skip_handle(grib_runtime_options* options, grib_handle* h)
{ {
int err = 0; int err = 0;
if (!options->through_index && !options->random) { if (!options->through_index) {
global_handle = codes_bufr_handle_new_from_file(h->context, options->infile_extra->file, &err); global_handle = codes_bufr_handle_new_from_file(h->context, options->infile_extra->file, &err);
if (!global_handle || err != GRIB_SUCCESS) if (!global_handle || err != GRIB_SUCCESS)