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

Merge remote-tracking branch 'origin/topic/timw/deprecate-int-types'

Browse source 
* origin/topic/timw/deprecate-int-types:
  Deprecate the internal int/uint types in favor of the cstdint types they were based on

Merge adjustments:
  * A bpf type mistakenly got replaced (inside an unlikely #ifdef)
  * Did a few substitutions that got missed (likely due to
    pre-processing out of DEBUG macros)
This commit is contained in:
Jon Siwek 2019-08-14 15:38:02 -07:00
commit 47235b57a6
222 changed files with 1343 additions and 1327 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/iosource/BPF_Program.cc
View file

@ -74,7 +74,7 @@ BPF_Program::~BPF_Program()
FreeCode();
}
bool BPF_Program::Compile(pcap_t* pcap, const char* filter, uint32 netmask,
bool BPF_Program::Compile(pcap_t* pcap, const char* filter, uint32_t netmask,
char* errbuf, unsigned int errbuf_len, bool optimize)
{
if ( ! pcap )
@ -99,7 +99,7 @@ bool BPF_Program::Compile(pcap_t* pcap, const char* filter, uint32 netmask,
}
bool BPF_Program::Compile(int snaplen, int linktype, const char* filter,
uint32 netmask, char* errbuf, unsigned int errbuf_len,
uint32_t netmask, char* errbuf, unsigned int errbuf_len,
bool optimize)
{
FreeCode();