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

Fix key comparisons

This commit is contained in:
Shahram Najm 2023-12-17 17:08:32 +00:00
parent 8e5132f0be
commit dc58a160c0
4 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/grib_accessor_class_data_apply_bitmap.cc
View File

@ -446,7 +446,7 @@ static int get_native_type(grib_accessor* a)
static int compare(grib_accessor* a, grib_accessor* b) static int compare(grib_accessor* a, grib_accessor* b)
{ {
int retval = 0; int retval = GRIB_SUCCESS;
double* aval = 0; double* aval = 0;
double* bval = 0; double* bval = 0;
@ -475,10 +475,8 @@ static int compare(grib_accessor* a, grib_accessor* b)
grib_unpack_double(b, bval, &blen); grib_unpack_double(b, bval, &blen);
retval = GRIB_SUCCESS; retval = GRIB_SUCCESS;
while (alen != 0) { for (size_t i=0; i<alen && retval == GRIB_SUCCESS; ++i) {
if (*bval != *aval) if (aval[i] != bval[i]) retval = GRIB_DOUBLE_VALUE_MISMATCH;
retval = GRIB_DOUBLE_VALUE_MISMATCH;
alen--;
} }
grib_context_free(a->context, aval); grib_context_free(a->context, aval);

6
src/grib_accessor_class_long.cc
View File

@ -241,10 +241,8 @@ static int compare(grib_accessor* a, grib_accessor* b)
grib_unpack_long(b, bval, &blen); grib_unpack_long(b, bval, &blen);
retval = GRIB_SUCCESS; retval = GRIB_SUCCESS;
while (alen != 0) { for (size_t i=0; i<alen && retval == GRIB_SUCCESS; ++i) {
if (*bval != *aval) if (aval[i] != bval[i]) retval = GRIB_LONG_VALUE_MISMATCH;
retval = GRIB_LONG_VALUE_MISMATCH;
alen--;
} }
grib_context_free(a->context, aval); grib_context_free(a->context, aval);

7
src/grib_accessor_class_statistics.cc
View File

@ -313,10 +313,9 @@ static int compare(grib_accessor* a, grib_accessor* b)
grib_unpack_double(a, aval, &alen); grib_unpack_double(a, aval, &alen);
grib_unpack_double(b, bval, &blen); grib_unpack_double(b, bval, &blen);
while (alen != 0) { retval = GRIB_SUCCESS;
if (*bval != *aval) for (size_t i=0; i<alen && retval == GRIB_SUCCESS; ++i) {
retval = GRIB_DOUBLE_VALUE_MISMATCH; if (aval[i] != bval[i]) retval = GRIB_DOUBLE_VALUE_MISMATCH;
alen--;
} }
grib_context_free(a->context, aval); grib_context_free(a->context, aval);

6
src/grib_accessor_class_statistics_spectral.cc
View File

@ -266,10 +266,8 @@ static int compare(grib_accessor* a, grib_accessor* b)
grib_unpack_double(b, bval, &blen); grib_unpack_double(b, bval, &blen);
retval = GRIB_SUCCESS; retval = GRIB_SUCCESS;
while (alen != 0) { for (size_t i=0; i<alen && retval == GRIB_SUCCESS; ++i) {
if (*bval != *aval) if (aval[i] != bval[i]) retval = GRIB_DOUBLE_VALUE_MISMATCH;
retval = GRIB_DOUBLE_VALUE_MISMATCH;
alen--;
} }
grib_context_free(a->context, aval); grib_context_free(a->context, aval);