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

Refactoring

This commit is contained in:
Shahram Najm 2016-11-29 18:12:23 +00:00
parent d2b3b95194
commit 26dda37909
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/bufr_compare.c
View File

@ -742,8 +742,7 @@ static int compare_values(grib_runtime_options* options, grib_handle* handle1, g
if(grib_inline_strcmp(sval1,sval2) != 0) if(grib_inline_strcmp(sval1,sval2) != 0)
{ {
printInfo(handle1); printInfo(handle1);
printf("string [%s]: [%s] != [%s]\n", printf("string [%s]: [%s] != [%s]\n", name, sval1, sval2);
name,sval1,sval2);
err1 = GRIB_VALUE_MISMATCH; err1 = GRIB_VALUE_MISMATCH;
save_error(c,name); save_error(c,name);
} }
@ -798,15 +797,12 @@ static int compare_values(grib_runtime_options* options, grib_handle* handle1, g
save_error(c,name); save_error(c,name);
err1 = GRIB_VALUE_MISMATCH; err1 = GRIB_VALUE_MISMATCH;
if(len1 == 1) if(len1 == 1)
printf("long [%s]: [%ld] != [%ld]\n", printf("long [%s]: [%ld] != [%ld]\n", name, *lval1, *lval2);
name,*lval1,*lval2);
else else
printf("long [%s] %d out of %ld different\n", printf("long [%s] %d out of %ld different\n", name, countdiff, (long)len1);
name,countdiff,(long)len1);
} }
} }
grib_context_free(handle1->context,lval1); grib_context_free(handle1->context,lval1);
grib_context_free(handle2->context,lval2); grib_context_free(handle2->context,lval2);
@ -996,7 +992,7 @@ static int compare_values(grib_runtime_options* options, grib_handle* handle1, g
if(memcmp(uval1,uval2,len1) != 0) if(memcmp(uval1,uval2,len1) != 0)
{ {
int i; int i;
for(i = 0; i < len1; i++) for(i = 0; i < len1; i++) {
if(uval1[i] != uval2[i]) if(uval1[i] != uval2[i])
{ {
printInfo(handle1); printInfo(handle1);
@ -1011,6 +1007,7 @@ static int compare_values(grib_runtime_options* options, grib_handle* handle1, g
err1 = GRIB_VALUE_MISMATCH; err1 = GRIB_VALUE_MISMATCH;
break; break;
} }
}
err1 = GRIB_VALUE_MISMATCH; err1 = GRIB_VALUE_MISMATCH;
} }
} }
@ -1066,6 +1063,7 @@ static int compare_attributes(grib_handle* handle1, grib_handle* handle2, grib_r
return ret; return ret;
} }
static int compare_attribute(grib_handle* handle1, grib_handle* handle2, grib_runtime_options* options, static int compare_attribute(grib_handle* handle1, grib_handle* handle2, grib_runtime_options* options,
grib_accessor* a, const char* prefix, int* err) grib_accessor* a, const char* prefix, int* err)
{ {