From c00f4ca0817919e6ba5780212781e03dada206a6 Mon Sep 17 00:00:00 2001 From: Vasily Evseenko Date: Thu, 8 Sep 2022 22:18:11 +0300 Subject: [PATCH] Fix printf warnings --- src/rx.cpp | 2 +- src/tx.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/rx.cpp b/src/rx.cpp index 53cc706..f3bccab 100644 --- a/src/rx.cpp +++ b/src/rx.cpp @@ -869,7 +869,7 @@ int main(int argc, char* const *argv) fprintf(stderr, "Local receiver: %s [-K rx_key] [-k RS_K] [-n RS_N] [-c client_addr] [-u client_port] [-p radio_port] [-l log_interval] [-e epoch] [-i link_id] interface1 [interface2] ...\n", argv[0]); fprintf(stderr, "Remote (forwarder): %s -f [-c client_addr] [-u client_port] [-p radio_port] [-i link_id] interface1 [interface2] ...\n", argv[0]); fprintf(stderr, "Remote (aggregator): %s -a server_port [-K rx_key] [-k RS_K] [-n RS_N] [-c client_addr] [-u client_port] [-l log_interval] [-p radio_port] [-e epoch] [-i link_id]\n", argv[0]); - fprintf(stderr, "Default: K='%s', k=%d, n=%d, connect=%s:%d, link_id=0x%06x, radio_port=%u, epoch=%lu, log_interval=%d\n", keypair.c_str(), k, n, client_addr.c_str(), client_port, link_id, radio_port, epoch, log_interval); + fprintf(stderr, "Default: K='%s', k=%d, n=%d, connect=%s:%d, link_id=0x%06x, radio_port=%u, epoch=%" PRIu64 ", log_interval=%d\n", keypair.c_str(), k, n, client_addr.c_str(), client_port, link_id, radio_port, epoch, log_interval); fprintf(stderr, "WFB-ng version " WFB_VERSION "\n"); fprintf(stderr, "WFB-ng home page: \n"); exit(1); diff --git a/src/tx.cpp b/src/tx.cpp index e42dbc1..64b5a1b 100644 --- a/src/tx.cpp +++ b/src/tx.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -393,7 +394,7 @@ int main(int argc, char * const *argv) show_usage: fprintf(stderr, "Usage: %s [-K tx_key] [-k RS_K] [-n RS_N] [-u udp_port] [-p radio_port] [-B bandwidth] [-G guard_interval] [-S stbc] [-L ldpc] [-M mcs_index] [-T poll_timeout] [-e epoch] [-i link_id] interface1 [interface2] ...\n", argv[0]); - fprintf(stderr, "Default: K='%s', k=%d, n=%d, udp_port=%d, link_id=0x%06x, radio_port=%u, epoch=%lu, bandwidth=%d guard_interval=%s stbc=%d ldpc=%d mcs_index=%d, poll_timeout=%d\n", + fprintf(stderr, "Default: K='%s', k=%d, n=%d, udp_port=%d, link_id=0x%06x, radio_port=%u, epoch=%" PRIu64 ", bandwidth=%d guard_interval=%s stbc=%d ldpc=%d mcs_index=%d, poll_timeout=%d\n", keypair.c_str(), k, n, udp_port, link_id, radio_port, epoch, bandwidth, short_gi ? "short" : "long", stbc, ldpc, mcs_index, poll_timeout); fprintf(stderr, "Radio MTU: %lu\n", (unsigned long)MAX_PAYLOAD_SIZE); fprintf(stderr, "WFB-ng version " WFB_VERSION "\n"); @@ -491,7 +492,7 @@ int main(int argc, char * const *argv) if(debug_port) { - fprintf(stderr, "Using %lu ports from %d for wlan emulation\n", wlans.size(), debug_port); + fprintf(stderr, "Using %zu ports from %d for wlan emulation\n", wlans.size(), debug_port); t = shared_ptr(new UdpTransmitter(k, n, keypair, "127.0.0.1", debug_port, epoch, channel_id)); } else { t = shared_ptr(new PcapTransmitter(k, n, keypair, epoch, channel_id, wlans));