From a5de5c90be361eb8291c4f486d3b4d34310b0322 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Sun, 21 Jan 2024 19:12:58 +0000 Subject: [PATCH] Tools: Remove redundant method grib_tool_print_key_values --- tests/codes_info.sh | 15 +++++++++++++++ tools/gts_compare.cc | 5 ----- tools/gts_copy.cc | 5 ----- tools/gts_dump.cc | 5 ----- tools/gts_filter.cc | 5 ----- tools/gts_get.cc | 5 ----- tools/gts_ls.cc | 6 ------ tools/taf_dump.cc | 5 ----- tools/taf_filter.cc | 5 ----- tools/taf_get.cc | 5 ----- tools/taf_ls.cc | 5 ----- 11 files changed, 15 insertions(+), 51 deletions(-) diff --git a/tests/codes_info.sh b/tests/codes_info.sh index 4d81e2061..b9cff23fd 100755 --- a/tests/codes_info.sh +++ b/tests/codes_info.sh @@ -29,6 +29,14 @@ status=$? set -e [ $status -eq 1 ] +# Wrong arguments +set +e +${tools_dir}/codes_info abcd > $tempLog 2>&1 +status=$? +set -e +[ $status -eq 1 ] + + # Verbose debug output ECCODES_DEBUG=1 ${tools_dir}/codes_info @@ -49,6 +57,13 @@ ECCODES_DEBUG=1 ${tools_dir}/codes_info unset _ECCODES_ECMWF_TEST_DEFINITION_PATH unset _ECCODES_ECMWF_TEST_SAMPLES_PATH +${tools_dir}/codes_info -d +${tools_dir}/codes_info -s + +export ECCODES_EXTRA_SAMPLES_PATH=abcd +ECCODES_DEBUG=1 ${tools_dir}/codes_info +unset ECCODES_EXTRA_SAMPLES_PATH + # Clean up rm -f $tempLog diff --git a/tools/gts_compare.cc b/tools/gts_compare.cc index 934aee66d..cedbfa4b6 100644 --- a/tools/gts_compare.cc +++ b/tools/gts_compare.cc @@ -297,11 +297,6 @@ int grib_tool_skip_handle(grib_runtime_options* options, grib_handle* h) return 0; } -void grib_tool_print_key_values(grib_runtime_options* options, grib_handle* h) -{ - grib_print_key_values(options, h); -} - int grib_tool_finalise_action(grib_runtime_options* options) { grib_error* e = error_summary; diff --git a/tools/gts_copy.cc b/tools/gts_copy.cc index 568babe2b..a05df672c 100644 --- a/tools/gts_copy.cc +++ b/tools/gts_copy.cc @@ -91,11 +91,6 @@ int grib_tool_skip_handle(grib_runtime_options* options, grib_handle* h) return 0; } -void grib_tool_print_key_values(grib_runtime_options* options, grib_handle* h) -{ - grib_print_key_values(options, h); -} - int grib_tool_finalise_action(grib_runtime_options* options) { return 0; diff --git a/tools/gts_dump.cc b/tools/gts_dump.cc index a58f93ddf..d289ee2da 100644 --- a/tools/gts_dump.cc +++ b/tools/gts_dump.cc @@ -133,11 +133,6 @@ int grib_tool_skip_handle(grib_runtime_options* options, grib_handle* h) return 0; } -void grib_tool_print_key_values(grib_runtime_options* options, grib_handle* h) -{ - grib_print_key_values(options, h); -} - int grib_tool_finalise_action(grib_runtime_options* options) { return 0; diff --git a/tools/gts_filter.cc b/tools/gts_filter.cc index c57dc7dce..91a24b41d 100644 --- a/tools/gts_filter.cc +++ b/tools/gts_filter.cc @@ -95,11 +95,6 @@ int grib_tool_skip_handle(grib_runtime_options* options, grib_handle* h) return 0; } -void grib_tool_print_key_values(grib_runtime_options* options, grib_handle* h) -{ - grib_print_key_values(options, h); -} - int grib_tool_finalise_action(grib_runtime_options* options) { grib_file_pool_clean(); diff --git a/tools/gts_get.cc b/tools/gts_get.cc index ccdf51d83..38aa6feba 100644 --- a/tools/gts_get.cc +++ b/tools/gts_get.cc @@ -92,11 +92,6 @@ int grib_tool_skip_handle(grib_runtime_options* options, grib_handle* h) return 0; } -void grib_tool_print_key_values(grib_runtime_options* options, grib_handle* h) -{ - grib_print_key_values(options, h); -} - int grib_tool_finalise_action(grib_runtime_options* options) { return 0; diff --git a/tools/gts_ls.cc b/tools/gts_ls.cc index c0b912887..b1b0920ac 100644 --- a/tools/gts_ls.cc +++ b/tools/gts_ls.cc @@ -107,12 +107,6 @@ int grib_tool_skip_handle(grib_runtime_options* options, grib_handle* h) return 0; } -/* key values can be printed in this function. Headers are already printed if requested.*/ -void grib_tool_print_key_values(grib_runtime_options* options, grib_handle* h) -{ - grib_print_key_values(options, h); -} - /* this is executed after the last message in the last file is processed */ int grib_tool_finalise_action(grib_runtime_options* options) { diff --git a/tools/taf_dump.cc b/tools/taf_dump.cc index fa5636509..bc7c62227 100644 --- a/tools/taf_dump.cc +++ b/tools/taf_dump.cc @@ -143,11 +143,6 @@ int grib_tool_skip_handle(grib_runtime_options* options, grib_handle* h) return 0; } -void grib_tool_print_key_values(grib_runtime_options* options, grib_handle* h) -{ - grib_print_key_values(options, h); -} - int grib_tool_finalise_action(grib_runtime_options* options) { return 0; diff --git a/tools/taf_filter.cc b/tools/taf_filter.cc index 7851f1ca6..5405e2be0 100644 --- a/tools/taf_filter.cc +++ b/tools/taf_filter.cc @@ -94,11 +94,6 @@ int grib_tool_skip_handle(grib_runtime_options* options, grib_handle* h) return 0; } -void grib_tool_print_key_values(grib_runtime_options* options, grib_handle* h) -{ - grib_print_key_values(options, h); -} - int grib_tool_finalise_action(grib_runtime_options* options) { grib_file_pool_clean(); diff --git a/tools/taf_get.cc b/tools/taf_get.cc index 9e873f957..4e0853753 100644 --- a/tools/taf_get.cc +++ b/tools/taf_get.cc @@ -96,11 +96,6 @@ int grib_tool_skip_handle(grib_runtime_options* options, grib_handle* h) return 0; } -void grib_tool_print_key_values(grib_runtime_options* options, grib_handle* h) -{ - grib_print_key_values(options, h); -} - int grib_tool_finalise_action(grib_runtime_options* options) { return 0; diff --git a/tools/taf_ls.cc b/tools/taf_ls.cc index 3886198c3..1262a85f3 100644 --- a/tools/taf_ls.cc +++ b/tools/taf_ls.cc @@ -145,11 +145,6 @@ int grib_tool_skip_handle(grib_runtime_options* options, grib_handle* h) return 0; } -void grib_tool_print_key_values(grib_runtime_options* options, grib_handle* h) -{ - grib_print_key_values(options, h); -} - int grib_tool_finalise_action(grib_runtime_options* options) { if (json)