diff options
| author | David Robillard <d@drobilla.net> | 2020-07-15 20:35:12 +0200 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2020-07-17 15:42:20 +0200 |
| commit | 444cfd7b8fa1066ae77a92e7466b0320eacab720 (patch) | |
| tree | 782f4aa483dbe72d5ee7fcbf5347168813b5e074 /src/sord_test.c | |
| parent | 616517f44ceeacb26592e50e2bf914aad2d93b90 (diff) | |
| download | sord-444cfd7b8fa1066ae77a92e7466b0320eacab720.tar.gz sord-444cfd7b8fa1066ae77a92e7466b0320eacab720.tar.bz2 sord-444cfd7b8fa1066ae77a92e7466b0320eacab720.zip | |
Fix incorrect printf format specifiers
Diffstat (limited to 'src/sord_test.c')
| -rw-r--r-- | src/sord_test.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/sord_test.c b/src/sord_test.c index 1ab350a..3553d4c 100644 --- a/src/sord_test.c +++ b/src/sord_test.c @@ -14,6 +14,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include <inttypes.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -21,6 +22,12 @@ #include "sord/sord.h" +#ifdef __GNUC__ +# define SORD_LOG_FUNC(fmt, arg1) __attribute__((format(printf, fmt, arg1))) +#else +# define SORD_LOG_FUNC(fmt, arg1) +#endif + static const int DIGITS = 3; static const unsigned n_objects_per = 2; @@ -46,6 +53,7 @@ uri(SordWorld* world, int num) return sord_new_uri(world, (const uint8_t*)str); } +SORD_LOG_FUNC(1, 2) static int test_fail(const char* fmt, ...) { @@ -280,7 +288,7 @@ test_read(SordWorld* world, SordModel* sord, SordNode* g, return test_fail("Fail: Expected %d results, got %d\n", test.expected_num_results, num_results); } - fprintf(stderr, "OK (%u matches)\n", test.expected_num_results); + fprintf(stderr, "OK (%i matches)\n", test.expected_num_results); } // Query blank node subject @@ -320,7 +328,7 @@ test_read(SordWorld* world, SordModel* sord, SordNode* g, SordQuad subpat = { id[0], 0, 0 }; SordIter* subiter = sord_find(sord, subpat); - uint64_t num_sub_results = 0; + unsigned num_sub_results = 0; if (sord_iter_get_node(subiter, SORD_SUBJECT) != id[0]) { return test_fail("Fail: Incorrect initial submatch\n"); } @@ -339,14 +347,14 @@ test_read(SordWorld* world, SordModel* sord, SordNode* g, if (num_sub_results != n_objects_per) { return test_fail( "Fail: Nested query " TUP_FMT " failed" - " (%d results, expected %d)\n", + " (%u results, expected %u)\n", TUP_FMT_ARGS(subpat), num_sub_results, n_objects_per); } uint64_t count = sord_count(sord, id[0], 0, 0, 0); if (count != num_sub_results) { - return test_fail("Fail: Query " TUP_FMT " sord_count() %d" - "does not match result count %d\n", + return test_fail("Fail: Query " TUP_FMT " sord_count() %" PRIu64 + "does not match result count %u\n", TUP_FMT_ARGS(subpat), count, num_sub_results); } |