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

Fix some member-variable shadowing issues

Browse source
This commit is contained in:
Tim Wojtulewicz 2023-01-14 16:31:51 -07:00
parent 5bfd84a903
commit 4cdd68f019
2 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/Span.h
View file

@ -120,9 +120,9 @@ public:
// -- subviews ------------------------------------------------------------- // -- subviews -------------------------------------------------------------
constexpr Span subspan(size_t offset, size_t num_elements) const constexpr Span subspan(size_t offset, size_t count) const
{ {
return {memory_block + offset, num_elements}; return {memory_block + offset, count};
} }
constexpr Span subspan(size_t offset) const constexpr Span subspan(size_t offset) const
@ -130,12 +130,9 @@ public:
return {memory_block + offset, num_elements - offset}; return {memory_block + offset, num_elements - offset};
} }
constexpr Span first(size_t num_elements) const { return {memory_block, num_elements}; } constexpr Span first(size_t count) const { return {memory_block, count}; }
constexpr Span last(size_t num_elements) const constexpr Span last(size_t count) const { return subspan(num_elements - count, num_elements); }
{
return subspan(num_elements - num_elements, num_elements);
}
private: private:
// -- member variables ----------------------------------------------------- // -- member variables -----------------------------------------------------

10
src/analyzer/protocol/login/Rlogin.cc
View file

@ -139,17 +139,17 @@ void Contents_Rlogin_Analyzer::DoDeliver(int len, const u_char* data)
{ {
// Unknown control, or we're confused. // Unknown control, or we're confused.
// Put back what we've consumed. // Put back what we've consumed.
unsigned char buf[64]; unsigned char unknown_buf[64];
int n = 0; int n = 0;
buf[n++] = '\xff'; unknown_buf[n++] = '\xff';
buf[n++] = '\xff'; unknown_buf[n++] = '\xff';
if ( state == RLOGIN_WINDOW_CHANGE_S2 ) if ( state == RLOGIN_WINDOW_CHANGE_S2 )
buf[n++] = 's'; unknown_buf[n++] = 's';
state = RLOGIN_UNKNOWN; state = RLOGIN_UNKNOWN;
DoDeliver(n, buf); DoDeliver(n, unknown_buf);
} }
break; break;