This is an automated email from the ASF dual-hosted git repository. janc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit 9660042277834ef684b6187bb6fd7b8c3d47a249 Author: Mariusz Skamra <[email protected]> AuthorDate: Fri Nov 15 15:14:03 2024 +0100 btshell: Fix print format specifiers This fixes various compilation issues related to usage of invalid format specifiers. Tested on native and nrf5340. repos/apache-mynewt-nimble/apps/btshell/src/cmd_leaudio.c:724:39: error: format '%x' expects argument of type 'unsigned int', but argument 2 has type 'uint32_t' {aka 'long unsigned int'} [-Werror=format=] 724 | console_printf("broadcast_id=0x%06x adv_sid=%d adv_addr_type=%s adv_addr=", | ~~~^ | | | unsigned int | %06lx 725 | source_desc->broadcast_id, source_desc->adv_sid, | ~~~~~~~~~~~~~~~~~~~~~~~~~ | | | uint32_t {aka long unsigned int} cc1: all warnings being treated as errors --- apps/btshell/src/cmd_iso.c | 4 ++-- apps/btshell/src/cmd_leaudio.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/btshell/src/cmd_iso.c b/apps/btshell/src/cmd_iso.c index 3383c379f..cd6046082 100644 --- a/apps/btshell/src/cmd_iso.c +++ b/apps/btshell/src/cmd_iso.c @@ -107,8 +107,8 @@ iso_rx_stats_update(uint16_t conn_handle, const struct ble_iso_rx_data_info *inf stats->total_cnt++; if ((stats->total_cnt % 100) == 0) { - console_printf("conn_handle=0x%04x, seq_num=%d, num_rx=%lld, " - "(valid=%lld, error=%lld, lost=%lld) ", + console_printf("conn_handle=0x%04x, seq_num=%d, num_rx=%" PRIu64 ", " + "(valid=%" PRIu64 ", error=%" PRIu64 ", lost=%" PRIu64 ") ", stats->conn_handle, stats->seq_num, stats->total_cnt, stats->valid_cnt, stats->error_cnt, stats->lost_cnt); diff --git a/apps/btshell/src/cmd_leaudio.c b/apps/btshell/src/cmd_leaudio.c index bd243dfd4..8cc3e5457 100644 --- a/apps/btshell/src/cmd_leaudio.c +++ b/apps/btshell/src/cmd_leaudio.c @@ -482,7 +482,7 @@ broadcast_sink_action_fn(struct ble_audio_broadcast_sink_action *action, void *a return broadcast_sink_pa_sync_params_get(action->pa_sync.out_params); case BLE_AUDIO_BROADCAST_SINK_ACTION_BIG_SYNC: console_printf("BIG Sync:\nsource_id=0x%02x iso_interval=0x%04x" - " presentation_delay=%u[us]\n", + " presentation_delay=%" PRIu32 "[us]\n", action->big_sync.source_id, action->big_sync.iso_interval, action->big_sync.presentation_delay); break; @@ -684,7 +684,7 @@ broadcast_sink_audio_event_handler(struct ble_audio_event *event, void *arg) static void scan_delegator_source_desc_printf(const struct ble_audio_scan_delegator_source_desc *source_desc) { - console_printf("broadcast_id=0x%6x adv_sid=%d adv_addr_type=%s adv_addr=", + console_printf("broadcast_id=0x%06" PRIx32 " adv_sid=%d adv_addr_type=%s adv_addr=", source_desc->broadcast_id, source_desc->adv_sid, cmd_addr_type_str(source_desc->addr.type)); print_addr(source_desc->addr.val); @@ -697,7 +697,7 @@ scan_delegator_sync_opt_printf(const struct ble_audio_scan_delegator_sync_opt *s console_printf("pa_sync=%d pa_interval=0x%04x num_subgroups=%d", sync_opt->pa_sync, sync_opt->pa_interval, sync_opt->num_subgroups); for (uint8_t i = 0; i < sync_opt->num_subgroups; i++) { - console_printf("\n\tbis_sync=0x%04x metadata_length=%d metadata=", + console_printf("\n\tbis_sync=0x%04" PRIx32 " metadata_length=%d metadata=", sync_opt->subgroups[i].bis_sync, sync_opt->subgroups[i].metadata_length); print_bytes(sync_opt->subgroups[i].metadata, sync_opt->subgroups[i].metadata_length); } @@ -957,7 +957,7 @@ scan_delegator_receive_state_printf(const struct ble_audio_scan_delegator_receiv } for (uint8_t i = 0; i < state->num_subgroups; i++) { - console_printf("\n\tbis_sync=0x%04x metadata_length=%d metadata=", + console_printf("\n\tbis_sync=0x%04" PRIu32 " metadata_length=%d metadata=", state->subgroups[i].bis_sync, state->subgroups[i].metadata_length); print_bytes(state->subgroups[i].metadata, state->subgroups[i].metadata_length); console_printf("\n"); @@ -1045,7 +1045,7 @@ scan_delegator_audio_event_handler(struct ble_audio_event *event, void *arg) switch (event->type) { case BLE_AUDIO_EVENT_BROADCAST_ANNOUNCEMENT: console_printf("Broadcast Announcement\n"); - console_printf("broadcast_id=0x%6x adv_sid=%d addr_type=%s addr=", + console_printf("broadcast_id=0x%06" PRIx32 " adv_sid=%d addr_type=%s addr=", event->broadcast_announcement.broadcast_id, event->broadcast_announcement.ext_disc->sid, cmd_addr_type_str(event->broadcast_announcement.ext_disc->addr.type));
