Fix -Wmissing-prototypes/-Wmissing-declarations warnings

[babeltrace.git] / tests / bitfield / test_bitfield.c

diff --git a/tests/bitfield/test_bitfield.c b/tests/bitfield/test_bitfield.c
index b9bd6d40a60bb093209ff67307b66aaca4277e4a..b8e7bcb49eebfa4a5be4f520f838440858ade7cb 100644 (file)
--- a/tests/bitfield/test_bitfield.c
+++ b/tests/bitfield/test_bitfield.c
@@ -30,8 +30,9 @@ unsigned int glob;
 
 /*
  * This function is only declared to show the size of a bitfield write in
- * objdump.
+ * objdump.  The declaration is there to avoid a -Wmissing-prototypes warning.
  */
+void fct(void);
 void fct(void)
 {
        bt_bitfield_write(&glob, unsigned int, 12, 15, 0x12345678);
@@ -48,8 +49,8 @@ void fct(void)
 #define UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR "Writing and reading back 0x%X, unsigned int source, varying write unit size"
 #define UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR "Writing and reading back 0x%llX, unsigned long long dest, varying read unit size"
 #define UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR "Writing and reading back 0x%llX, unsigned long long source, varying write unit size"
-#define DIAG_FMT_STR "Failed reading value written \"%s\"-wise, with start=%i" \
-       " and length=%i. Read %llX"
+#define DIAG_FMT_STR(val_type_fmt) "Failed reading value written \"%s\"-wise, with start=%i" \
+       " and length=%i. Read 0x" val_type_fmt
 
 static
 unsigned int fls_u64(uint64_t x)
@@ -136,18 +137,19 @@ do {                                      \
                (c)[i] = (val);         \
 } while (0)
 
-#define check_result(ref, val, buffer, typename, start, len,           \
-               desc_fmt_str)                                           \
-({                                                                     \
-       if ((val) != (ref)) {                                           \
-               fail(desc_fmt_str, ref);                                \
-               diag(DIAG_FMT_STR, #typename, start, len, val);         \
-               printf("# ");                                           \
-               print_byte_array(buffer, TEST_LEN);                     \
-       }                                                               \
-       (val) != (ref);                                                 \
+#define check_result(ref, val, buffer, typename, start, len,                   \
+               desc_fmt_str, val_type_fmt)                                     \
+({                                                                             \
+       if ((val) != (ref)) {                                                   \
+               fail(desc_fmt_str, ref);                                        \
+               diag(DIAG_FMT_STR(val_type_fmt), #typename, start, len, val);   \
+               printf("# ");                                                   \
+               print_byte_array(buffer, TEST_LEN);                             \
+       }                                                                       \
+       (val) != (ref);                                                         \
 })
 
+static
 void run_test_unsigned_write(unsigned int src_ui, unsigned long long src_ull)
 {
        unsigned int nrbits_ui, nrbits_ull;
@@ -171,7 +173,8 @@ void run_test_unsigned_write(unsigned int src_ui, unsigned long long src_ull)
                        bt_bitfield_write(target.c, unsigned char, s, l, src_ui);
                        bt_bitfield_read(target.c, unsigned char, s, l, &readval);
                        if (check_result(src_ui, readval, target.c, unsigned char,
-                                       s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
+                                       s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
 
@@ -179,7 +182,8 @@ void run_test_unsigned_write(unsigned int src_ui, unsigned long long src_ull)
                        bt_bitfield_write(target.s, unsigned short, s, l, src_ui);
                        bt_bitfield_read(target.c, unsigned char, s, l, &readval);
                        if (check_result(src_ui, readval, target.c, unsigned short,
-                                       s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
+                                       s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
 
@@ -187,7 +191,8 @@ void run_test_unsigned_write(unsigned int src_ui, unsigned long long src_ull)
                        bt_bitfield_write(target.i, unsigned int, s, l, src_ui);
                        bt_bitfield_read(target.c, unsigned char, s, l, &readval);
                        if (check_result(src_ui, readval, target.c, unsigned int,
-                                       s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
+                                       s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
 
@@ -195,7 +200,8 @@ void run_test_unsigned_write(unsigned int src_ui, unsigned long long src_ull)
                        bt_bitfield_write(target.l, unsigned long, s, l, src_ui);
                        bt_bitfield_read(target.c, unsigned char, s, l, &readval);
                        if (check_result(src_ui, readval, target.c, unsigned long,
-                                       s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
+                                       s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
 
@@ -203,7 +209,8 @@ void run_test_unsigned_write(unsigned int src_ui, unsigned long long src_ull)
                        bt_bitfield_write(target.ll, unsigned long long, s, l, src_ui);
                        bt_bitfield_read(target.c, unsigned char, s, l, &readval);
                        if (check_result(src_ui, readval, target.c, unsigned long long,
-                                       s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
+                                       s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
                }
@@ -220,7 +227,8 @@ void run_test_unsigned_write(unsigned int src_ui, unsigned long long src_ull)
                        bt_bitfield_write(target.c, unsigned char, s, l, src_ull);
                        bt_bitfield_read(target.c, unsigned char, s, l, &readval);
                        if (check_result(src_ull, readval, target.c, unsigned char,
-                                       s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
+                                       s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
 
@@ -228,7 +236,8 @@ void run_test_unsigned_write(unsigned int src_ui, unsigned long long src_ull)
                        bt_bitfield_write(target.s, unsigned short, s, l, src_ull);
                        bt_bitfield_read(target.c, unsigned char, s, l, &readval);
                        if (check_result(src_ull, readval, target.c, unsigned short,
-                                       s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
+                                       s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
 
@@ -236,7 +245,8 @@ void run_test_unsigned_write(unsigned int src_ui, unsigned long long src_ull)
                        bt_bitfield_write(target.i, unsigned int, s, l, src_ull);
                        bt_bitfield_read(target.c, unsigned char, s, l, &readval);
                        if (check_result(src_ull, readval, target.c, unsigned int,
-                                       s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
+                                       s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
 
@@ -244,7 +254,8 @@ void run_test_unsigned_write(unsigned int src_ui, unsigned long long src_ull)
                        bt_bitfield_write(target.l, unsigned long, s, l, src_ull);
                        bt_bitfield_read(target.c, unsigned char, s, l, &readval);
                        if (check_result(src_ull, readval, target.c, unsigned long,
-                                       s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
+                                       s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
 
@@ -252,7 +263,8 @@ void run_test_unsigned_write(unsigned int src_ui, unsigned long long src_ull)
                        bt_bitfield_write(target.ll, unsigned long long, s, l, src_ull);
                        bt_bitfield_read(target.c, unsigned char, s, l, &readval);
                        if (check_result(src_ull, readval, target.c, unsigned long long,
-                                       s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
+                                       s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
                }
@@ -260,6 +272,7 @@ void run_test_unsigned_write(unsigned int src_ui, unsigned long long src_ull)
        pass(UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR, src_ull);
 }
 
+static
 void run_test_unsigned_read(unsigned int src_ui, unsigned long long src_ull)
 {
        unsigned int nrbits_ui, nrbits_ull, readval_ui;
@@ -283,7 +296,8 @@ void run_test_unsigned_read(unsigned int src_ui, unsigned long long src_ull)
                        bt_bitfield_write(target.c, unsigned char, s, l, src_ui);
                        bt_bitfield_read(target.c, unsigned char, s, l, &readval_ui);
                        if (check_result(src_ui, readval_ui, target.c, unsigned char,
-                                       s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR)) {
+                                       s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR,
+                                       "%X")) {
                                return;
                        }
 
@@ -291,7 +305,8 @@ void run_test_unsigned_read(unsigned int src_ui, unsigned long long src_ull)
                        bt_bitfield_write(target.c, unsigned char, s, l, src_ui);
                        bt_bitfield_read(target.s, unsigned short, s, l, &readval_ui);
                        if (check_result(src_ui, readval_ui, target.c, unsigned short,
-                                       s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR)) {
+                                       s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR,
+                                       "%X")) {
                                return;
                        }
 
@@ -299,7 +314,8 @@ void run_test_unsigned_read(unsigned int src_ui, unsigned long long src_ull)
                        bt_bitfield_write(target.c, unsigned char, s, l, src_ui);
                        bt_bitfield_read(target.i, unsigned int, s, l, &readval_ui);
                        if (check_result(src_ui, readval_ui, target.c, unsigned int,
-                                       s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR)) {
+                                       s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR,
+                                       "%X")) {
                                return;
                        }
 
@@ -307,7 +323,8 @@ void run_test_unsigned_read(unsigned int src_ui, unsigned long long src_ull)
                        bt_bitfield_write(target.c, unsigned char, s, l, src_ui);
                        bt_bitfield_read(target.l, unsigned long, s, l, &readval_ui);
                        if (check_result(src_ui, readval_ui, target.c, unsigned long,
-                                       s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR)) {
+                                       s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR,
+                                       "%X")) {
                                return;
                        }
 
@@ -315,7 +332,8 @@ void run_test_unsigned_read(unsigned int src_ui, unsigned long long src_ull)
                        bt_bitfield_write(target.c, unsigned char, s, l, src_ui);
                        bt_bitfield_read(target.ll, unsigned long long, s, l, &readval_ui);
                        if (check_result(src_ui, readval_ui, target.c, unsigned long long,
-                                       s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR)) {
+                                       s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR,
+                                       "%X")) {
                                return;
                        }
                }
@@ -332,7 +350,8 @@ void run_test_unsigned_read(unsigned int src_ui, unsigned long long src_ull)
                        bt_bitfield_write(target.c, unsigned char, s, l, src_ull);
                        bt_bitfield_read(target.c, unsigned char, s, l, &readval_ull);
                        if (check_result(src_ull, readval_ull, target.c, unsigned char,
-                                       s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
+                                       s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
 
@@ -340,7 +359,8 @@ void run_test_unsigned_read(unsigned int src_ui, unsigned long long src_ull)
                        bt_bitfield_write(target.c, unsigned char, s, l, src_ull);
                        bt_bitfield_read(target.s, unsigned short, s, l, &readval_ull);
                        if (check_result(src_ull, readval_ull, target.c, unsigned short,
-                                       s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
+                                       s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
 
@@ -348,7 +368,8 @@ void run_test_unsigned_read(unsigned int src_ui, unsigned long long src_ull)
                        bt_bitfield_write(target.c, unsigned char, s, l, src_ull);
                        bt_bitfield_read(target.i, unsigned int, s, l, &readval_ull);
                        if (check_result(src_ull, readval_ull, target.c, unsigned int,
-                                       s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
+                                       s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
 
@@ -356,7 +377,8 @@ void run_test_unsigned_read(unsigned int src_ui, unsigned long long src_ull)
                        bt_bitfield_write(target.c, unsigned char, s, l, src_ull);
                        bt_bitfield_read(target.l, unsigned long, s, l, &readval_ull);
                        if (check_result(src_ull, readval_ull, target.c, unsigned long,
-                                       s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
+                                       s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
 
@@ -364,7 +386,8 @@ void run_test_unsigned_read(unsigned int src_ui, unsigned long long src_ull)
                        bt_bitfield_write(target.c, unsigned char, s, l, src_ull);
                        bt_bitfield_read(target.ll, unsigned long long, s, l, &readval_ull);
                        if (check_result(src_ull, readval_ull, target.c, unsigned long long,
-                                       s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
+                                       s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
                }
@@ -372,12 +395,14 @@ void run_test_unsigned_read(unsigned int src_ui, unsigned long long src_ull)
        pass(UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR, src_ull);
 }
 
+static
 void run_test_unsigned(unsigned int src_ui, unsigned long long src_ull)
 {
        run_test_unsigned_write(src_ui, src_ull);
        run_test_unsigned_read(src_ui, src_ull);
 }
 
+static
 void run_test_signed_write(int src_i, long long src_ll)
 {
        unsigned int nrbits_i, nrbits_ll;
@@ -405,7 +430,8 @@ void run_test_signed_write(int src_i, long long src_ll)
                        bt_bitfield_write(target.c, signed char, s, l, src_i);
                        bt_bitfield_read(target.c, signed char, s, l, &readval);
                        if (check_result(src_i, readval, target.c, signed char,
-                                       s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
+                                       s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
 
@@ -413,7 +439,8 @@ void run_test_signed_write(int src_i, long long src_ll)
                        bt_bitfield_write(target.s, short, s, l, src_i);
                        bt_bitfield_read(target.c, signed char, s, l, &readval);
                        if (check_result(src_i, readval, target.c, short,
-                                       s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
+                                       s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
 
@@ -421,7 +448,8 @@ void run_test_signed_write(int src_i, long long src_ll)
                        bt_bitfield_write(target.i, int, s, l, src_i);
                        bt_bitfield_read(target.c, signed char, s, l, &readval);
                        if (check_result(src_i, readval, target.c, int,
-                                       s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
+                                       s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
 
@@ -429,7 +457,8 @@ void run_test_signed_write(int src_i, long long src_ll)
                        bt_bitfield_write(target.l, long, s, l, src_i);
                        bt_bitfield_read(target.c, signed char, s, l, &readval);
                        if (check_result(src_i, readval, target.c, long,
-                                       s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
+                                       s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
 
@@ -437,7 +466,8 @@ void run_test_signed_write(int src_i, long long src_ll)
                        bt_bitfield_write(target.ll, long long, s, l, src_i);
                        bt_bitfield_read(target.c, signed char, s, l, &readval);
                        if (check_result(src_i, readval, target.c, long long,
-                                       s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR)) {
+                                       s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
                }
@@ -458,7 +488,8 @@ void run_test_signed_write(int src_i, long long src_ll)
                        bt_bitfield_write(target.c, signed char, s, l, src_ll);
                        bt_bitfield_read(target.c, signed char, s, l, &readval);
                        if (check_result(src_ll, readval, target.c, signed char,
-                                       s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
+                                       s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
 
@@ -466,7 +497,8 @@ void run_test_signed_write(int src_i, long long src_ll)
                        bt_bitfield_write(target.s, short, s, l, src_ll);
                        bt_bitfield_read(target.c, signed char, s, l, &readval);
                        if (check_result(src_ll, readval, target.c, short,
-                                       s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
+                                       s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
 
@@ -474,7 +506,8 @@ void run_test_signed_write(int src_i, long long src_ll)
                        bt_bitfield_write(target.i, int, s, l, src_ll);
                        bt_bitfield_read(target.c, signed char, s, l, &readval);
                        if (check_result(src_ll, readval, target.c, int,
-                                       s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
+                                       s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
 
@@ -482,7 +515,8 @@ void run_test_signed_write(int src_i, long long src_ll)
                        bt_bitfield_write(target.l, long, s, l, src_ll);
                        bt_bitfield_read(target.c, signed char, s, l, &readval);
                        if (check_result(src_ll, readval, target.c, long,
-                                       s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
+                                       s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
 
@@ -490,7 +524,8 @@ void run_test_signed_write(int src_i, long long src_ll)
                        bt_bitfield_write(target.ll, long long, s, l, src_ll);
                        bt_bitfield_read(target.c, signed char, s, l, &readval);
                        if (check_result(src_ll, readval, target.c, long long,
-                                       s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) {
+                                       s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
                }
@@ -498,6 +533,7 @@ void run_test_signed_write(int src_i, long long src_ll)
        pass(SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR, src_ll);
 }
 
+static
 void run_test_signed_read(int src_i, long long src_ll)
 {
        unsigned int nrbits_i, nrbits_ll;
@@ -526,7 +562,8 @@ void run_test_signed_read(int src_i, long long src_ll)
                        bt_bitfield_write(target.c, signed char, s, l, src_i);
                        bt_bitfield_read(target.c, signed char, s, l, &readval_i);
                        if (check_result(src_i, readval_i, target.c, signed char,
-                                       s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR)) {
+                                       s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR,
+                                       "%X")) {
                                return;
                        }
 
@@ -534,7 +571,8 @@ void run_test_signed_read(int src_i, long long src_ll)
                        bt_bitfield_write(target.c, signed char, s, l, src_i);
                        bt_bitfield_read(target.s, short, s, l, &readval_i);
                        if (check_result(src_i, readval_i, target.c, short,
-                                       s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR)) {
+                                       s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR,
+                                       "%X")) {
                                return;
                        }
 
@@ -542,7 +580,8 @@ void run_test_signed_read(int src_i, long long src_ll)
                        bt_bitfield_write(target.c, signed char, s, l, src_i);
                        bt_bitfield_read(target.i, int, s, l, &readval_i);
                        if (check_result(src_i, readval_i, target.c, int,
-                                       s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR)) {
+                                       s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR,
+                                       "%X")) {
                                return;
                        }
 
@@ -550,7 +589,8 @@ void run_test_signed_read(int src_i, long long src_ll)
                        bt_bitfield_write(target.c, signed char, s, l, src_i);
                        bt_bitfield_read(target.l, long, s, l, &readval_i);
                        if (check_result(src_i, readval_i, target.c, long,
-                                       s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR)) {
+                                       s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR,
+                                       "%X")) {
                                return;
                        }
 
@@ -558,7 +598,8 @@ void run_test_signed_read(int src_i, long long src_ll)
                        bt_bitfield_write(target.c, signed char, s, l, src_i);
                        bt_bitfield_read(target.ll, long long, s, l, &readval_i);
                        if (check_result(src_i, readval_i, target.c, long long,
-                                       s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR)) {
+                                       s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR,
+                                       "%X")) {
                                return;
                        }
                }
@@ -579,7 +620,8 @@ void run_test_signed_read(int src_i, long long src_ll)
                        bt_bitfield_write(target.c, signed char, s, l, src_ll);
                        bt_bitfield_read(target.c, signed char, s, l, &readval_ll);
                        if (check_result(src_ll, readval_ll, target.c, signed char,
-                                       s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
+                                       s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
 
@@ -587,7 +629,8 @@ void run_test_signed_read(int src_i, long long src_ll)
                        bt_bitfield_write(target.c, signed char, s, l, src_ll);
                        bt_bitfield_read(target.s, short, s, l, &readval_ll);
                        if (check_result(src_ll, readval_ll, target.c, short,
-                                       s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
+                                       s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
 
@@ -595,7 +638,8 @@ void run_test_signed_read(int src_i, long long src_ll)
                        bt_bitfield_write(target.c, signed char, s, l, src_ll);
                        bt_bitfield_read(target.i, int, s, l, &readval_ll);
                        if (check_result(src_ll, readval_ll, target.c, int,
-                                       s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
+                                       s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
 
@@ -603,7 +647,8 @@ void run_test_signed_read(int src_i, long long src_ll)
                        bt_bitfield_write(target.c, signed char, s, l, src_ll);
                        bt_bitfield_read(target.l, long, s, l, &readval_ll);
                        if (check_result(src_ll, readval_ll, target.c, long,
-                                       s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
+                                       s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
 
@@ -611,7 +656,8 @@ void run_test_signed_read(int src_i, long long src_ll)
                        bt_bitfield_write(target.c, signed char, s, l, src_ll);
                        bt_bitfield_read(target.ll, long long, s, l, &readval_ll);
                        if (check_result(src_ll, readval_ll, target.c, long long,
-                                       s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) {
+                                       s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR,
+                                       "%llX")) {
                                return;
                        }
                }
@@ -619,12 +665,14 @@ void run_test_signed_read(int src_i, long long src_ll)
        pass(SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR, src_ll);
 }
 
+static
 void run_test_signed(int src_i, long long src_ll)
 {
        run_test_signed_write(src_i, src_ll);
        run_test_signed_read(src_i, src_ll);
 }
 
+static
 void run_test(void)
 {
        int i;