diff --git a/CHANGES b/CHANGES index 3a925f945d..a794b70a72 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +3.2.0-dev.37 | 2020-02-14 11:09:50 -0800 + + * Fix various format specifiers (Jon Siwek, Corelight) + 3.2.0-dev.36 | 2020-02-14 10:29:36 -0700 * broker: include cleanup (Max Kellermann) diff --git a/VERSION b/VERSION index cbe056d2b7..d6c32b13ce 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.2.0-dev.36 +3.2.0-dev.37 diff --git a/src/Net.cc b/src/Net.cc index f3d3f50c2d..744bd8a811 100644 --- a/src/Net.cc +++ b/src/Net.cc @@ -289,7 +289,7 @@ void net_run() // starting with the first. if ( ! ready.empty() || loop_counter++ % 100 == 0 ) { - DBG_LOG(DBG_MAINLOOP, "realtime=%.6f ready_count=%ld", + DBG_LOG(DBG_MAINLOOP, "realtime=%.6f ready_count=%zu", current_time(), ready.size()); if ( ! ready.empty() ) diff --git a/src/Stats.cc b/src/Stats.cc index 39e6148fbe..5d76dc5e80 100644 --- a/src/Stats.cc +++ b/src/Stats.cc @@ -135,7 +135,7 @@ void ProfileLogger::Log() SessionStats s; sessions->GetStats(s); - file->Write(fmt("%.06f Conns: tcp=%lu/%lu udp=%lu/%lu icmp=%lu/%lu\n", + file->Write(fmt("%.06f Conns: tcp=%zu/%zu udp=%zu/%zu icmp=%zu/%zu\n", network_time, s.num_TCP_conns, s.max_TCP_conns, s.num_UDP_conns, s.max_UDP_conns, diff --git a/src/iosource/Manager.cc b/src/iosource/Manager.cc index 49c0fb50b8..96fcaee522 100644 --- a/src/iosource/Manager.cc +++ b/src/iosource/Manager.cc @@ -156,7 +156,7 @@ void Manager::FindReadySources(std::vector* ready) } } - DBG_LOG(DBG_MAINLOOP, "timeout: %f ready size: %ld time_to_poll: %d\n", + DBG_LOG(DBG_MAINLOOP, "timeout: %f ready size: %zu time_to_poll: %d\n", timeout, ready->size(), time_to_poll); // If we didn't find any IOSources with zero timeouts or it's time to