Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Clang format again but now with v13.0.1

Browse source
This commit is contained in:
Tomer Lev 2022-11-02 10:13:58 +02:00
parent a105ea9d80
commit 73e749a162
12 changed files with 215 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Flare.cc
View file

@ -32,7 +32,9 @@ namespace zeek::detail
Flare::Flare() Flare::Flare()
#ifndef _MSC_VER #ifndef _MSC_VER
: pipe(FD_CLOEXEC, FD_CLOEXEC, O_NONBLOCK, O_NONBLOCK){} : pipe(FD_CLOEXEC, FD_CLOEXEC, O_NONBLOCK, O_NONBLOCK)
{
}
#else #else
{ {
WSADATA wsaData; WSADATA wsaData;

3
src/iosource/BPF_Program.cc
View file

@ -4,8 +4,11 @@
#include "zeek/zeek-config.h" #include "zeek/zeek-config.h"
// clang-format off
// Include order is required here for a working build on Windows.
#include <unistd.h> #include <unistd.h>
#include <sys/socket.h> #include <sys/socket.h>
// clang-format on
#include <cstring> #include <cstring>
#include "zeek/util.h" #include "zeek/util.h"

7
src/zeek-setup.cc
View file

@ -977,8 +977,8 @@ SetupResult setup(int argc, char** argv, Options* zopts)
} }
if ( dns_type != DNS_PRIME ) if ( dns_type != DNS_PRIME )
run_state::detail::init_run(options.interface, options.pcap_file, options.pcap_output_file, run_state::detail::init_run(options.interface, options.pcap_file,
options.use_watchdog); options.pcap_output_file, options.use_watchdog);
if ( ! g_policy_debug ) if ( ! g_policy_debug )
{ {
@ -1106,7 +1106,8 @@ SetupResult setup(int argc, char** argv, Options* zopts)
packet_mgr->DumpDebug(); packet_mgr->DumpDebug();
analyzer_mgr->DumpDebug(); analyzer_mgr->DumpDebug();
run_state::detail::have_pending_timers = ! run_state::reading_traces && timer_mgr->Size() > 0; run_state::detail::have_pending_timers = ! run_state::reading_traces &&
timer_mgr->Size() > 0;
return {0, std::move(options)}; return {0, std::move(options)};
} }