diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-03-02 15:07:07 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-03-02 15:07:07 +0000 |
| commit | d88156d998b10180714608d3834e791f5a9926c5 (patch) | |
| tree | cf15d4dfb31d354ac7f501680c4bb15704711909 /tests/compare_dump_files.c | |
| parent | 44a3af51f027c3f6292efa844bf66a9cdef899f9 (diff) | |
[trunk] merge r1234 from branch 1.5 over to trunk
Diffstat (limited to 'tests/compare_dump_files.c')
| -rw-r--r-- | tests/compare_dump_files.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/compare_dump_files.c b/tests/compare_dump_files.c index cd962bd4..e503d120 100644 --- a/tests/compare_dump_files.c +++ b/tests/compare_dump_files.c @@ -67,7 +67,7 @@ int parse_cmdline_cmp(int argc, char **argv, test_cmp_parameters* param) const char optlist[] = "b:t:"; int c; - // Init parameters + /* Init parameters */ param->base_filename = NULL; param->test_filename = NULL; @@ -82,7 +82,7 @@ int parse_cmdline_cmp(int argc, char **argv, test_cmp_parameters* param) param->base_filename[0] = '\0'; strncpy(param->base_filename, opj_optarg, strlen(opj_optarg)); param->base_filename[strlen(opj_optarg)] = '\0'; - //printf("param->base_filename = %s [%d / %d]\n", param->base_filename, strlen(param->base_filename), sizemembasefile ); + /*printf("param->base_filename = %s [%d / %d]\n", param->base_filename, strlen(param->base_filename), sizemembasefile );*/ break; case 't': sizememtestfile = (int) strlen(opj_optarg) + 1; @@ -90,7 +90,7 @@ int parse_cmdline_cmp(int argc, char **argv, test_cmp_parameters* param) param->test_filename[0] = '\0'; strncpy(param->test_filename, opj_optarg, strlen(opj_optarg)); param->test_filename[strlen(opj_optarg)] = '\0'; - //printf("param->test_filename = %s [%d / %d]\n", param->test_filename, strlen(param->test_filename), sizememtestfile); + /*printf("param->test_filename = %s [%d / %d]\n", param->test_filename, strlen(param->test_filename), sizememtestfile);*/ break; case '?': if ( (opj_optopt == 'b') || (opj_optopt == 't') ) @@ -132,7 +132,7 @@ int main(int argc, char **argv) return EXIT_FAILURE; } - // Display Parameters + /* Display Parameters*/ printf("******Parameters********* \n"); printf(" base_filename = %s\n" " test_filename = %s\n", @@ -180,7 +180,7 @@ int main(int argc, char **argv) return EXIT_FAILURE; } - // CRLF problem (Baseline must be always generated by unix platform) + /* CRLF problem (Baseline must be always generated by unix platform)*/ if (chbase == '\n' && chtest == '\r') if (fgetc(ftest) == '\n') chtest = '\n'; @@ -194,8 +194,8 @@ int main(int argc, char **argv) printf("Files differ at line %lu:\n", l); fseek(fbase,pos,SEEK_SET); - // Take into account CRLF characters when we write \n into - // dump file when we used WIN platform + /* Take into account CRLF characters when we write \n into + // dump file when we used WIN platform*/ #ifdef _WIN32 CRLF_shift = 2; fseek(ftest,pos + l - 1,SEEK_SET); @@ -241,11 +241,11 @@ int main(int argc, char **argv) } } - //Close File + /*Close File*/ fclose(fbase); fclose(ftest); - // Free memory + /* Free memory*/ free(inParam.base_filename); free(inParam.test_filename); |
