From 4cdd68f0197af0f8b5c3892db2fe9419e0e0a1cf Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Sat, 14 Jan 2023 16:31:51 -0700
Subject: [PATCH] Fix some member-variable shadowing issues

---
 src/Span.h                            | 11 ++++-------
 src/analyzer/protocol/login/Rlogin.cc | 10 +++++-----
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/Span.h b/src/Span.h
index fb91b37c5d..276d9896b7 100644
--- a/src/Span.h
+++ b/src/Span.h
@@ -120,9 +120,9 @@ public:
 
 	// -- 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
@@ -130,12 +130,9 @@ public:
 		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
-		{
-		return subspan(num_elements - num_elements, num_elements);
-		}
+	constexpr Span last(size_t count) const { return subspan(num_elements - count, num_elements); }
 
 private:
 	// -- member variables -----------------------------------------------------
diff --git a/src/analyzer/protocol/login/Rlogin.cc b/src/analyzer/protocol/login/Rlogin.cc
index 771c121874..3b7fc0ce29 100644
--- a/src/analyzer/protocol/login/Rlogin.cc
+++ b/src/analyzer/protocol/login/Rlogin.cc
@@ -139,17 +139,17 @@ void Contents_Rlogin_Analyzer::DoDeliver(int len, const u_char* data)
 					{
 					// Unknown control, or we're confused.
 					// Put back what we've consumed.
-					unsigned char buf[64];
+					unsigned char unknown_buf[64];
 					int n = 0;
-					buf[n++] = '\xff';
-					buf[n++] = '\xff';
+					unknown_buf[n++] = '\xff';
+					unknown_buf[n++] = '\xff';
 
 					if ( state == RLOGIN_WINDOW_CHANGE_S2 )
-						buf[n++] = 's';
+						unknown_buf[n++] = 's';
 
 					state = RLOGIN_UNKNOWN;
 
-					DoDeliver(n, buf);
+					DoDeliver(n, unknown_buf);
 					}
 				break;