Use proper format for size_t printf

[dragonstd.git] / test / test_array.c

diff --git a/test/test_array.c b/test/test_array.c
index 0fa509ab25fc5006068ce3c0f85d04ee6def50c2..db10964f615c9dd751162bd9a3fb584cd7a1a19f 100644 (file)
--- a/test/test_array.c
+++ b/test/test_array.c
@@ -39,18 +39,18 @@ int main()
        array_ini(&arr, sizeof(int), 0);
 
        printf("testing add\n");
-       i = 1; array_add(&arr, &i);
-       i = 3; array_add(&arr, &i);
-       i = 4; array_add(&arr, &i);
+       i = 1; array_apd(&arr, &i);
+       i = 3; array_apd(&arr, &i);
+       i = 4; array_apd(&arr, &i);
 
        printf("testing put\n");
        i = 2; array_put(&arr, &i, 1);
        i = 5; array_put(&arr, &i, arr.siz);
 
-       printf("testing siz: exp: 5 got: %lu\n", arr.siz);
+       printf("testing siz: exp: 5 got: %zu\n", arr.siz);
        assert(arr.siz == 5);
 
-       printf("testing cap: exp: 5 got: %lu\n", arr.cap);
+       printf("testing cap: exp: 5 got: %zu\n", arr.cap);
        assert(arr.cap == 5);
 
        printf("testing contents: exp: 1,2,3,4,5 got: "); dump(&arr); printf("\n");
@@ -73,68 +73,68 @@ int main()
        printf("testing ini after clr\n");
        array_ini(&arr, sizeof(int), 5);
 
-       printf("testing cap: exp: 0 got: %lu\n", arr.cap);
+       printf("testing cap: exp: 0 got: %zu\n", arr.cap);
        assert(arr.cap == 0);
 
        printf("testing overallocation\n");
-       i = 50; array_add(&arr, &i);
+       i = 50; array_apd(&arr, &i);
 
-       printf("testing cap: exp: 0 got: %lu\n", arr.cap);
+       printf("testing cap: exp: 0 got: %zu\n", arr.cap);
        assert(arr.siz == 1);
 
-       printf("testing cap: exp: 6 got: %lu\n", arr.cap);
+       printf("testing cap: exp: 6 got: %zu\n", arr.cap);
        assert(arr.cap == 6);
 
        for (int j = 0; j < 7; j++) {
-               i = rand() % 100; array_add(&arr, &i);
+               i = rand() % 100; array_apd(&arr, &i);
        }
 
-       printf("testing siz: exp: 8 got: %lu\n", arr.cap);
+       printf("testing siz: exp: 8 got: %zu\n", arr.cap);
        assert(arr.siz == 8);
 
-       printf("testing cap: exp: 12 got: %lu\n", arr.cap);
+       printf("testing cap: exp: 12 got: %zu\n", arr.cap);
        assert(arr.cap == 12);
 
        printf("testing grw\n");
        array_grw(&arr, 5);
 
-       printf("testing siz: exp: 13 got: %lu\n", arr.cap);
+       printf("testing siz: exp: 13 got: %zu\n", arr.cap);
        assert(arr.siz == 13);
 
-       printf("testing cap: exp: 18 got: %lu\n", arr.cap);
+       printf("testing cap: exp: 18 got: %zu\n", arr.cap);
        assert(arr.cap == 18);
 
        printf("testing shr\n");
        array_shr(&arr, 5);
 
-       printf("testing siz: exp: 8 got: %lu\n", arr.cap);
+       printf("testing siz: exp: 8 got: %zu\n", arr.cap);
        assert(arr.siz == 8);
 
-       printf("testing cap: exp: 8 got: %lu\n", arr.cap);
+       printf("testing cap: exp: 8 got: %zu\n", arr.cap);
        assert(arr.cap == 8);
 
        printf("testing srt\n");
-       array_srt(&arr, (void *) &cmp_int);
+       array_srt(&arr, &cmp_int);
 
        printf("testing order: exp: (sorted) got: "); dump(&arr); printf("\n");
        assert_in_order(&arr);
 
        for (size_t j = 0; j < arr.siz; j++) {
                i = ((int *) arr.ptr)[j];
-               ssize_t s = array_fnd(&arr, &i, NULL, (void *) &cmp_int);
+               ssize_t s = array_fnd(&arr, &i, NULL, &cmp_int);
 
-               printf("testing fnd at index %lu: exp: >=0 got: %ld\n", j, s);
+               printf("testing fnd at index %zu: exp: >=0 got: %ld\n", j, s);
                assert(s >= 0);
 
                int k = ((int *) arr.ptr)[s];
 
-               printf("testing fnd at index %lu: exp: %d got: %d\n", j, i, k);
+               printf("testing fnd at index %zu: exp: %d got: %d\n", j, i, k);
                assert(k == i);
        }
 
        printf("testing ins\n");
        for (int j = 0; j < 10; j++) {
-               i = rand() % 100; array_ins(&arr, &i, (void *) &cmp_int);
+               i = rand() % 100; array_ins(&arr, &i, &cmp_int);
        }
 
        printf("testing order: exp: (sorted) got: "); dump(&arr); printf("\n");