core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tools: Preparation for ECC-1528

This commit is contained in:
Shahram Najm 2023-02-17 17:08:50 +00:00
parent 2432c1d029
commit d6ab079a42
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/grib_tools.cc
View File

@ -799,7 +799,7 @@ static void grib_tools_set_print_keys(grib_runtime_options* options, grib_handle
} }
} }
static int to_skip(grib_handle* h, grib_values* v, int* err) static int to_skip(grib_runtime_options* options, grib_handle* h, grib_values* v, int* err)
{ {
double dvalue = 0; double dvalue = 0;
int ret = 0; int ret = 0;
@ -808,6 +808,8 @@ static int to_skip(grib_handle* h, grib_values* v, int* err)
size_t len = MAX_STRING_LEN; size_t len = MAX_STRING_LEN;
*err = 0; *err = 0;
Assert(options->constraints_count > 0);
if (strcmp(v->name, "count")==0 && v->long_value < 1) { if (strcmp(v->name, "count")==0 && v->long_value < 1) {
fprintf(dump_file, "ERROR: Invalid value for key '%s' (must be an integer greater than 0)\n", v->name); fprintf(dump_file, "ERROR: Invalid value for key '%s' (must be an integer greater than 0)\n", v->name);
exit(1); exit(1);
@ -858,7 +860,7 @@ void grib_skip_check(grib_runtime_options* options, grib_handle* h)
if (v->equal) { if (v->equal) {
options->skip = 1; options->skip = 1;
while (v) { while (v) {
if (!to_skip(h, v, &ret)) { if (!to_skip(options, h, v, &ret)) {
if (!strcmp(v->name, "count") && !v->next) { if (!strcmp(v->name, "count") && !v->next) {
/* We have count=XX and nothing after that so we can /* We have count=XX and nothing after that so we can
* skip every other message after it * skip every other message after it
@ -879,7 +881,7 @@ void grib_skip_check(grib_runtime_options* options, grib_handle* h)
else { else {
options->skip = 0; options->skip = 0;
while (v) { while (v) {
if (to_skip(h, v, &ret)) { if (to_skip(options, h, v, &ret)) {
options->skip = 1; options->skip = 1;
break; break;
} }