laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/40867?usp=email ) Change subject: Use %zu for size_t ...................................................................... Use %zu for size_t Fix that this doesn't build for debian 13 armv7l with errors like: osmo-amr-inspect.c:138:53: error: format '%lu' expects argument of type 'long unsigned int', but argument 2 has type 'size_t' {aka 'unsigned int'} [-Werror=format=] 138 | printf(" Payload has no padding (%lu bits with offset 10)\n", ft_bits); | ~~^ ~~~~~~~ | | | | long unsigned int size_t {aka unsigned int} Related: OS#6828 Change-Id: I81f6d26623544c259199099beb54d14f5788a9e4 --- M tests/stream/stream_test.c M utils/osmo-amr-inspect.c 2 files changed, 10 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/tests/stream/stream_test.c b/tests/stream/stream_test.c index f23bb5b..cc3f0c2 100644 --- a/tests/stream/stream_test.c +++ b/tests/stream/stream_test.c @@ -745,7 +745,7 @@ fprintf(stderr, "Cannot allocate message\n"); return -ENOMEM; } - LOGSRV(conn, "Received message from stream (total len including stripped headers = %lu)\n", + LOGSRV(conn, "Received message from stream (total len including stripped headers = %zu)\n", osmo_ntohs(h->len) + sizeof(*h)); if (5 < ipa_msg_type) { fprintf(stderr, "Received unexpected IPAC message type %"PRIu8"\n", ipa_msg_type); diff --git a/utils/osmo-amr-inspect.c b/utils/osmo-amr-inspect.c index dbf612d..b550f50 100644 --- a/utils/osmo-amr-inspect.c +++ b/utils/osmo-amr-inspect.c @@ -73,7 +73,7 @@ printf(" F: %u\n", hdr->f); printf(" FT: %u (%s)\n", hdr->ft, osmo_amr_type_name(hdr->ft)); printf(" Q: %u\n", hdr->q); - printf(" Payload (%lu bytes): %s\n", + printf(" Payload (%zu bytes): %s\n", buf_len - sizeof(*hdr), osmo_hexdump_nospc(payload, payload_len)); if (hdr->f) @@ -88,11 +88,11 @@ println_orange(" WARN: PAD2=0x%x not zero!", hdr->pad2); ft_bytes = osmo_amr_bytes(hdr->ft); if (payload_len != ft_bytes) { - println_red(" ERROR: Wrong payload byte-length %lu != exp %lu!", payload_len, ft_bytes); + println_red(" ERROR: Wrong payload byte-length %zu != exp %zu!", payload_len, ft_bytes); } else { ft_bits = osmo_amr_bits(hdr->ft); if (ft_bits/8 == ft_bytes) { - printf(" Payload has no padding (%lu bits)\n", ft_bits); + printf(" Payload has no padding (%zu bits)\n", ft_bits); } else { uint8_t last_byte = payload[payload_len - 1]; uint8_t padding = last_byte & (0xff >> (ft_bits & 3)); @@ -117,7 +117,7 @@ printf(" FT: %u (%s)\n", ft, osmo_amr_type_name(ft)); printf(" Q: %u\n", hdr->q); printf(" Payload first 6 bits: 0x%02x\n", hdr->data_start); - printf(" Payload continuation (%lu bytes): %s\n", buf_len - sizeof(*hdr), + printf(" Payload continuation (%zu bytes): %s\n", buf_len - sizeof(*hdr), osmo_hexdump_nospc(buf + sizeof(*hdr), buf_len - sizeof(*hdr))); if (hdr->f) @@ -130,12 +130,12 @@ } ft_bits = osmo_amr_bits(ft); if (ft_bits != payload_len_bits) { - println_red(" ERROR: Wrong payload bits-length %lu != exp %lu! (FT=%u)\n", payload_len_bits, ft_bits, ft); + println_red(" ERROR: Wrong payload bits-length %zu != exp %zu! (FT=%u)\n", payload_len_bits, ft_bits, ft); return; } if (!((AMR_HDR_BWE_LEN_BITS + ft_bits) & 0x03)) { - printf(" Payload has no padding (%lu bits with offset 10)\n", ft_bits); + printf(" Payload has no padding (%zu bits with offset 10)\n", ft_bits); } else { uint8_t last_byte = buf[buf_len - 1]; uint8_t padding = last_byte & (0xff >> ((AMR_HDR_BWE_LEN_BITS + ft_bits) & 0x03)); @@ -156,7 +156,7 @@ static void inspect_amr(unsigned int i, const uint8_t *buf, size_t buf_len) { bool is_oa; - printf("[%u] Buffer (%lu bytes): %s\n", i, buf_len, osmo_hexdump_nospc(buf, buf_len)); + printf("[%u] Buffer (%zu bytes): %s\n", i, buf_len, osmo_hexdump_nospc(buf, buf_len)); is_oa = osmo_amr_is_oa(buf, buf_len); switch (force_fmt) { case FORCE_AMR_INPUT_FMT_AUTO: @@ -253,7 +253,7 @@ hex_buf[hex_buflen] = '\0'; if (hex_buflen == sizeof(hex_buf) - 1) { - fprintf(stderr, "Failed parsing (input too long > %lu): %s\n", hex_buflen, hex_buf); + fprintf(stderr, "Failed parsing (input too long > %zu): %s\n", hex_buflen, hex_buf); return -ENOMEM; } @@ -263,7 +263,7 @@ return -1; } if (rc < 2) { - fprintf(stderr, "Too short to be an AMR buffer (%ld bytes): %s\n", rc, hex_buf); + fprintf(stderr, "Too short to be an AMR buffer (%zu bytes): %s\n", rc, hex_buf); return -1; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/40867?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I81f6d26623544c259199099beb54d14f5788a9e4 Gerrit-Change-Number: 40867 Gerrit-PatchSet: 2 Gerrit-Owner: osmith &lt;osmith(a)sysmocom.de&gt; Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: laforge &lt;laforge(a)osmocom.org&gt;