walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

[trunk] fixed return value for compare_raw_files (fixes issue 453)

This commit is contained in:
Matthieu Darbois 2014-12-20 12:42:40 +00:00
parent dde788b59e
commit a504edf724
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/compare_raw_files.c
View File

@ -120,14 +120,14 @@ int main(int argc, char **argv)
int pos = 0; int pos = 0;
test_cmp_parameters inParam; test_cmp_parameters inParam;
FILE *file_test=NULL, *file_base=NULL; FILE *file_test=NULL, *file_base=NULL;
unsigned char equal = 1; unsigned char equal = 0U; /* returns error by default */
/* Get parameters from command line*/ /* Get parameters from command line*/
if (parse_cmdline_cmp(argc, argv, &inParam)) if (parse_cmdline_cmp(argc, argv, &inParam))
{ {
compare_raw_files_help_display(); compare_raw_files_help_display();
goto cleanup; goto cleanup;
} }
file_test = fopen(inParam.test_filename, "rb"); file_test = fopen(inParam.test_filename, "rb");
if (!file_test) { if (!file_test) {
@ -142,8 +142,9 @@ int main(int argc, char **argv)
} }
/* Read simultaneously the two files*/ /* Read simultaneously the two files*/
equal = 1U;
while (equal) while (equal)
{ {
unsigned char value_test = 0; unsigned char value_test = 0;
unsigned char eof_test = 0; unsigned char eof_test = 0;
unsigned char value_base = 0; unsigned char value_base = 0;
@ -165,19 +166,19 @@ int main(int argc, char **argv)
/* End of file reached only by one file?*/ /* End of file reached only by one file?*/
if (eof_test || eof_base) if (eof_test || eof_base)
{ {
fprintf(stdout,"Files have different sizes.\n"); fprintf(stdout,"Files have different sizes.\n");
equal = 0; equal = 0;
} }
/* Binary values are equal?*/ /* Binary values are equal?*/
if (value_test != value_base) if (value_test != value_base)
{ {
fprintf(stdout,"Binary values read in the file are different %x vs %x at position %d.\n", value_test, value_base, pos); fprintf(stdout,"Binary values read in the file are different %x vs %x at position %d.\n", value_test, value_base, pos);
equal = 0; equal = 0;
}
pos++;
} }
pos++;
}
if(equal) fprintf(stdout,"---- TEST SUCCEED: Files are equal ----\n"); if(equal) fprintf(stdout,"---- TEST SUCCEED: Files are equal ----\n");
cleanup: cleanup: