OpenSystemsDevelopment / qpdf

Commit 7be97b3e80bdb856c9d1fe720f9ee14a8063b5fa

Authored by Jay Berkenbilt
1 parent 53bfa860

Fix long long format string for WIN32

Inline Side-by-side
Showing 1 changed file with 9 additions and 6 deletions
qpdf/qpdf-ctest.c
  View file @7be97b3
@@ -36,6 +36,13 @@ static FILE* safe_fopen(char const* filename, char const* mode) @@ -36,6 +36,13 @@ static FILE* safe_fopen(char const* filename, char const* mode)
36 36
37 static void report_errors() 37 static void report_errors()
38 { 38 {
  39 +#ifdef _WIN32
  40 +# define POS_FMT " pos : %I64d\n"
  41 +#else
  42 +/* If your compiler doesn't support lld, change to ld and lose
  43 + precision on offsets in error messages. */
  44 +# define POS_FMT " pos : %lld\n"
  45 +#endif
39 qpdf_error e = 0; 46 qpdf_error e = 0;
40 while (qpdf_more_warnings(qpdf)) 47 while (qpdf_more_warnings(qpdf))
41 { 48 {
@@ -43,10 +50,7 @@ static void report_errors() @@ -43,10 +50,7 @@ static void report_errors()
43 printf("warning: %s\n", qpdf_get_error_full_text(qpdf, e)); 50 printf("warning: %s\n", qpdf_get_error_full_text(qpdf, e));
44 printf(" code: %d\n", qpdf_get_error_code(qpdf, e)); 51 printf(" code: %d\n", qpdf_get_error_code(qpdf, e));
45 printf(" file: %s\n", qpdf_get_error_filename(qpdf, e)); 52 printf(" file: %s\n", qpdf_get_error_filename(qpdf, e));
46 - /* If your compiler doesn't support %lld, change to %ld and  
47 - * lose precision in the error message.  
48 - */  
49 - printf(" pos : %lld\n", qpdf_get_error_file_position(qpdf, e)); 53 + printf(POS_FMT, qpdf_get_error_file_position(qpdf, e));
50 printf(" text: %s\n", qpdf_get_error_message_detail(qpdf, e)); 54 printf(" text: %s\n", qpdf_get_error_message_detail(qpdf, e));
51 } 55 }
52 if (qpdf_has_error(qpdf)) 56 if (qpdf_has_error(qpdf))
@@ -56,8 +60,7 @@ static void report_errors() @@ -56,8 +60,7 @@ static void report_errors()
56 printf("error: %s\n", qpdf_get_error_full_text(qpdf, e)); 60 printf("error: %s\n", qpdf_get_error_full_text(qpdf, e));
57 printf(" code: %d\n", qpdf_get_error_code(qpdf, e)); 61 printf(" code: %d\n", qpdf_get_error_code(qpdf, e));
58 printf(" file: %s\n", qpdf_get_error_filename(qpdf, e)); 62 printf(" file: %s\n", qpdf_get_error_filename(qpdf, e));
59 - /* see above comment about %lld */  
60 - printf(" pos : %lld\n", qpdf_get_error_file_position(qpdf, e)); 63 + printf(POS_FMT, qpdf_get_error_file_position(qpdf, e));
61 printf(" text: %s\n", qpdf_get_error_message_detail(qpdf, e)); 64 printf(" text: %s\n", qpdf_get_error_message_detail(qpdf, e));
62 } 65 }
63 else 66 else