Compiler warning: parameter 'err' set but not used

This commit is contained in:
shahramn 2024-05-01 14:20:26 +01:00
parent a9e361fb96
commit 7d49e7b87a
5 changed files with 93 additions and 2 deletions

View File

@ -226,6 +226,9 @@ if( HAVE_BUILD_TOOLS )
grib_keys_iter
grib_keys_iter_skip
grib_geo_iter
grib_to_json
grib_to_ppm
grib_histogram
bufr_get_element
bufr_wmo_tables
bufr_extract_headers

21
tests/grib_histogram.sh Executable file
View File

@ -0,0 +1,21 @@
#!/bin/sh
# (C) Copyright 2005- ECMWF.
#
# This software is licensed under the terms of the Apache Licence Version 2.0
# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
#
# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
. ./include.ctest.sh
label="grib_histogram_test"
REDIRECT=/dev/null
tempOut=temp.$label.txt
${tools_dir}/grib_histogram $ECCODES_SAMPLES_PATH/GRIB1.tmpl > $tempOut
${tools_dir}/grib_histogram $ECCODES_SAMPLES_PATH/GRIB2.tmpl > $tempOut
# Clean up
rm -f $tempOut

43
tests/grib_to_json.sh Executable file
View File

@ -0,0 +1,43 @@
#!/bin/sh
# (C) Copyright 2005- ECMWF.
#
# This software is licensed under the terms of the Apache Licence Version 2.0
# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
#
# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
. ./include.ctest.sh
label="grib_to_json_test"
REDIRECT=/dev/null
tempOut=temp.$label.txt
if [ ! -x "${tools_dir}/grib_to_json" ]; then
exit 0
fi
# Currently only works for GRIB edition 1 !!!
${tools_dir}/grib_to_json $ECCODES_SAMPLES_PATH/GRIB1.tmpl > $tempOut
# Decide if we have the JSON verifier commandline utility
JSON_VERIF="json_xs"
JSON_CHECK=""
if command -v $JSON_VERIF >/dev/null 2>&1; then
JSON_CHECK=$JSON_VERIF
fi
# Check the json_xs command actually works!
set +e
echo '[]' | json_xs > $REDIRECT 2>&1
if [ $? -ne 0 ]; then JSON_CHECK=""; fi
set -e
echo "Using $JSON_CHECK ..."
if test "x$JSON_CHECK" != "x"; then
json_xs < $tempOut >$REDIRECT 2> $REDIRECT
fi
# Clean up
rm -f $tempOut

24
tests/grib_to_ppm.sh Executable file
View File

@ -0,0 +1,24 @@
#!/bin/sh
# (C) Copyright 2005- ECMWF.
#
# This software is licensed under the terms of the Apache Licence Version 2.0
# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
#
# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
. ./include.ctest.sh
label="grib_to_ppm_test"
tempOut=temp.$label.txt
if [ ! -x "${tools_dir}/grib2ppm" ]; then
exit 0
fi
${tools_dir}/grib2ppm $ECCODES_SAMPLES_PATH/GRIB1.tmpl > $tempOut
${tools_dir}/grib2ppm $ECCODES_SAMPLES_PATH/GRIB2.tmpl > $tempOut
# Clean up
rm -f $tempOut

View File

@ -713,7 +713,7 @@ static int compare_values(const grib_runtime_options* options, grib_handle* h1,
return GRIB_SUCCESS;
}
static int compare_all_dump_keys(grib_handle* h1, grib_handle* h2, grib_runtime_options* options, int* err)
static int compare_all_dump_keys(grib_handle* h1, grib_handle* h2, grib_runtime_options* options, int* pErr)
{
int ret = 0;
const char* name = NULL;
@ -733,7 +733,7 @@ static int compare_all_dump_keys(grib_handle* h1, grib_handle* h2, grib_runtime_
if (xa == NULL || (xa->flags & GRIB_ACCESSOR_FLAG_DUMP) == 0)
continue;
if (compare_values(options, h1, h2, name, GRIB_TYPE_UNDEFINED)) {
err++;
(*pErr)++;
write_messages(h1, h2);
ret = 1;
}