From 799e014f2a16d5031d976e9662d3333d65cfc94c Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Thu, 15 Apr 2010 20:31:56 +0100
Subject: [PATCH] Backed out changeset eaac19489aa6 Bao agreed with my initial
version after all.
---
indra/llcommon/llapr.cpp | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/indra/llcommon/llapr.cpp b/indra/llcommon/llapr.cpp
index f030867ec47..7330b00bcfd 100644
--- a/indra/llcommon/llapr.cpp
+++ b/indra/llcommon/llapr.cpp
@@ -535,11 +535,6 @@ S32 LLAPRFile::seek(apr_file_t* file_handle, apr_seek_where_t where, S32 offset)
//static
S32 LLAPRFile::readEx(const std::string& filename, void *buf, S32 offset, S32 nbytes, LLVolatileAPRPool* pool)
{
- if (offset < 0)
- {
- return 0; // do nothing, negative offsets don't make sense for reads
- }
-
//*****************************************
apr_file_t* file_handle = open(filename, pool, APR_READ|APR_BINARY);
//*****************************************
@@ -548,10 +543,10 @@ S32 LLAPRFile::readEx(const std::string& filename, void *buf, S32 offset, S32 nb
return 0;
}
+ llassert(offset >= 0);
+
if (offset > 0)
- {
offset = LLAPRFile::seek(file_handle, APR_SET, offset);
- }
apr_size_t bytes_read;
if (offset < 0)
--
GitLab