Fixed most compiler warnings -Wall -Wextra

[libyaml.git] / tests / test-reader.c

diff --git a/tests/test-reader.c b/tests/test-reader.c
index 2ecb292d687253a0978483796203ba2232edb0fe..40f8199e009f85a254ef49bc013fa0dbd048c7e6 100644 (file)
--- a/tests/test-reader.c
+++ b/tests/test-reader.c
@@ -144,12 +144,12 @@ int check_utf8_sequences(void)
             }
             else if (parser.error == YAML_READER_ERROR) {
                 if (parser.problem_value != -1) {
-                    printf("(reader error: %s: #%X at %zu)\n",
-                            parser.problem, parser.problem_value, parser.problem_offset);
+                    printf("(reader error: %s: #%X at %ld)\n",
+                            parser.problem, parser.problem_value, (long)parser.problem_offset);
                 }
                 else {
-                    printf("(reader error: %s at %zu)\n",
-                            parser.problem, parser.problem_offset);
+                    printf("(reader error: %s at %ld)\n",
+                            parser.problem, (long)parser.problem_offset);
                 }
             }
             if (*end == '!') break;
@@ -180,12 +180,12 @@ int check_boms(void)
         yaml_parser_set_input_string(&parser, (unsigned char *)start, end-start);
         result = yaml_parser_update_buffer(&parser, end-start);
         if (!result) {
-            printf("- (reader error: %s at %zu)\n", parser.problem, parser.problem_offset);
+            printf("- (reader error: %s at %ld)\n", parser.problem, (long)parser.problem_offset);
             failed++;
         }
         else {
             if (parser.unread != check) {
-                printf("- (length=%zu while expected length=%d)\n", parser.unread, check);
+                printf("- (length=%ld while expected length=%d)\n", (long)parser.unread, check);
                 failed++;
             }
             else if (memcmp(parser.buffer.start, bom_original, check) != 0) {
@@ -211,7 +211,7 @@ int check_long_utf8(void)
     int j;
     int failed = 0;
     unsigned char ch0, ch1;
-    unsigned char *buffer = malloc(3+LONG*2);
+    unsigned char *buffer = (unsigned char *)malloc(3+LONG*2);
     assert(buffer);
     printf("checking a long utf8 sequence...\n");
     buffer[k++] = '\xef';
@@ -232,7 +232,7 @@ int check_long_utf8(void)
     for (k = 0; k < LONG; k++) {
         if (!parser.unread) {
             if (!yaml_parser_update_buffer(&parser, 1)) {
-                printf("\treader error: %s at %zu\n", parser.problem, parser.problem_offset);
+                printf("\treader error: %s at %ld\n", parser.problem, (long)parser.problem_offset);
                 failed = 1;
                 break;
             }
@@ -262,11 +262,11 @@ int check_long_utf8(void)
     }
     if (!failed) {
         if (!yaml_parser_update_buffer(&parser, 1)) {
-            printf("\treader error: %s at %zu\n", parser.problem, parser.problem_offset);
+            printf("\treader error: %s at %ld\n", parser.problem, (long)parser.problem_offset);
             failed = 1;
         }
         else if (parser.buffer.pointer[0] != '\0') {
-            printf("\texpected NUL, found %X (eof=%d, unread=%zu)\n", (int)parser.buffer.pointer[0], parser.eof, parser.unread);
+            printf("\texpected NUL, found %X (eof=%d, unread=%ld)\n", (int)parser.buffer.pointer[0], parser.eof, (long)parser.unread);
             failed = 1;
         }
     }
@@ -283,7 +283,7 @@ int check_long_utf16(void)
     int j;
     int failed = 0;
     unsigned char ch0, ch1;
-    unsigned char *buffer = malloc(2+LONG*2);
+    unsigned char *buffer = (unsigned char *)malloc(2+LONG*2);
     assert(buffer);
     printf("checking a long utf16 sequence...\n");
     buffer[k++] = '\xff';
@@ -303,7 +303,7 @@ int check_long_utf16(void)
     for (k = 0; k < LONG; k++) {
         if (!parser.unread) {
             if (!yaml_parser_update_buffer(&parser, 1)) {
-                printf("\treader error: %s at %zu\n", parser.problem, parser.problem_offset);
+                printf("\treader error: %s at %ld\n", parser.problem, (long)parser.problem_offset);
                 failed = 1;
                 break;
             }
@@ -333,11 +333,11 @@ int check_long_utf16(void)
     }
     if (!failed) {
         if (!yaml_parser_update_buffer(&parser, 1)) {
-            printf("\treader error: %s at %zu\n", parser.problem, parser.problem_offset);
+            printf("\treader error: %s at %ld\n", parser.problem, (long)parser.problem_offset);
             failed = 1;
         }
         else if (parser.buffer.pointer[0] != '\0') {
-            printf("\texpected NUL, found %X (eof=%d, unread=%zu)\n", (int)parser.buffer.pointer[0], parser.eof, parser.unread);
+            printf("\texpected NUL, found %X (eof=%d, unread=%ld)\n", (int)parser.buffer.pointer[0], parser.eof, (long)parser.unread);
             failed = 1;
         }
     }