Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-27 15:55:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 820791 - Fix set-but-unused variable warning in nsUnicharStreamLoader::WriteSegmentFun; r=emk

Browse Source
This commit is contained in:
Ms2ger 2012-12-12 15:07:12 +01:00
parent e6bc42aed0
commit 43b1ee8155
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
netwerk/base/src/nsUnicharStreamLoader.cpp
View File

@ -1,4 +1,4 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@ -7,10 +7,11 @@
#include "nsIInputStream.h"
#include "nsICharsetConverterManager.h"
#include "nsIServiceManager.h"
#include "mozilla/Util.h" // DebugOnly
#define SNIFFING_BUFFER_SIZE 512 // specified in draft-abarth-mime-sniff-06
using mozilla::fallible_t;
using namespace mozilla;
NS_IMETHODIMP
nsUnicharStreamLoader::Init(nsIUnicharStreamLoaderObserver *aObserver)
@ -198,7 +199,6 @@ nsUnicharStreamLoader::WriteSegmentFun(nsIInputStream *,
nsUnicharStreamLoader* self = static_cast<nsUnicharStreamLoader*>(aClosure);
uint32_t haveRead = self->mBuffer.Length();
nsresult rv;
int32_t srcLen = aCount;
int32_t dstLen;
self->mDecoder->GetMaxLength(aSegment, srcLen, &dstLen);
@ -208,10 +208,11 @@ nsUnicharStreamLoader::WriteSegmentFun(nsIInputStream *,
return NS_ERROR_OUT_OF_MEMORY;
}
rv = self->mDecoder->Convert(aSegment,
&srcLen,
self->mBuffer.BeginWriting() + haveRead,
&dstLen);
DebugOnly<nsresult> rv =
self->mDecoder->Convert(aSegment,
&srcLen,
self->mBuffer.BeginWriting() + haveRead,
&dstLen);
MOZ_ASSERT(NS_SUCCEEDED(rv));
MOZ_ASSERT(srcLen == static_cast<int32_t>(aCount));
haveRead += dstLen;