From 6a6dff46cf85c8bdcf334ff0919bf16bf6d9f96e Mon Sep 17 00:00:00 2001
From: Drake Arconis <drake@alchemyviewer.org>
Date: Mon, 12 Dec 2016 22:17:23 -0500
Subject: [PATCH] Rename a var used in a loop to prevent possible issue with
shadowing while loop control variable
---
indra/llcorehttp/bufferarray.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/llcorehttp/bufferarray.cpp b/indra/llcorehttp/bufferarray.cpp
index b5650ee879..0282bdf2db 100644
--- a/indra/llcorehttp/bufferarray.cpp
+++ b/indra/llcorehttp/bufferarray.cpp
@@ -224,8 +224,8 @@ size_t BufferArray::write(size_t pos, const void * src, size_t len)
do
{
Block & block(*mBlocks[block_start]);
- size_t block_limit(block.mUsed - offset);
- size_t block_len((std::min)(block_limit, len));
+ size_t block_offset(block.mUsed - offset);
+ size_t block_len((std::min)(block_offset, len));
memcpy(&block.mData[offset], c_src, block_len);
result += block_len;
--
GitLab