diff options
| author | nat-goodspeed <nat@lindenlab.com> | 2023-08-17 13:05:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-17 13:05:14 -0400 |
| commit | 9d981c72f8d098baeae9e9fa1e3c4737f957bbe2 (patch) | |
| tree | e041df46ca357f3071b4c9c7a0799090c45669a6 /indra/llcommon/llsdserialize.cpp | |
| parent | e06cdc329a83b4c1e52eaf39b4b030763b7d8568 (diff) | |
| parent | 6cf6f81ae865d4e15b715a93408c7970b6936ce8 (diff) | |
Merge pull request #332 from secondlife/DRTVWR-588-monterey
Remove unused counters that cause fatal warnings
Diffstat (limited to 'indra/llcommon/llsdserialize.cpp')
| -rw-r--r-- | indra/llcommon/llsdserialize.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp index b7e316da10..9181600f23 100644 --- a/indra/llcommon/llsdserialize.cpp +++ b/indra/llcommon/llsdserialize.cpp @@ -2193,9 +2193,9 @@ LLUZipHelper::EZipRresult LLUZipHelper::unzip_llsd(LLSD& data, std::istream& is, LLUZipHelper::EZipRresult LLUZipHelper::unzip_llsd(LLSD& data, const U8* in, S32 size) { U8* result = NULL; - U32 cur_size = 0; + llssize cur_size = 0; z_stream strm; - + constexpr U32 CHUNK = 1024 * 512; static thread_local std::unique_ptr<U8[]> out; @@ -2388,7 +2388,7 @@ U8* unzip_llsdNavMesh( bool& valid, size_t& outsize, std::istream& is, S32 size return result; } -char* strip_deprecated_header(char* in, U32& cur_size, U32* header_size) +char* strip_deprecated_header(char* in, llssize& cur_size, size_t* header_size) { const char* deprecated_header = "<? LLSD/Binary ?>"; constexpr size_t deprecated_header_size = 17; |