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

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

2
src/analyzer/protocol/tcp/ContentLine.cc
View file

@ -97,7 +97,7 @@ void ContentLine_Analyzer::DeliverStream(int len, const u_char* data,
seq += len;
}
void ContentLine_Analyzer::Undelivered(uint64 seq, int len, bool orig)
void ContentLine_Analyzer::Undelivered(uint64_t seq, int len, bool orig)
{
ForwardUndelivered(seq, len, orig);
}