Commit 8c5b9206 authored by Nathan Froyd's avatar Nathan Froyd
Browse files

Bug 739962 - fix -Wunused-but-set-variable warnings in content; r=bent

parent ef06294f

content/base/src/nsContentUtils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ nsContentUtils::InitializeModifierStrings() 
  nsCOMPtr<nsIStringBundleService> bundleService =

    mozilla::services::GetStringBundleService();

  nsCOMPtr<nsIStringBundle> bundle;

  nsresult rv = NS_OK;

  DebugOnly<nsresult> rv = NS_OK;

  if (bundleService) {

    rv = bundleService->CreateBundle( "chrome://global-platform/locale/platformKeys.properties",

                                      getter_AddRefs(bundle));

content/base/src/nsEventSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ nsEventSource::Observe(nsISupports* aSubject, 
    return NS_OK;

  }



  nsresult rv;

  DebugOnly<nsresult> rv;

  if (strcmp(aTopic, DOM_WINDOW_FROZEN_TOPIC) == 0) {

    rv = Freeze();

    NS_ASSERTION(rv, "Freeze() failed");

content/media/MediaResource.cpp

+2 −3
Original line number Diff line number Diff line
@@ -1208,7 +1208,6 @@ void MediaResource::MoveLoadsToBackground() { 
    return;

  }



  nsresult rv;

  nsHTMLMediaElement* element = mDecoder->GetMediaElement();

  if (!element) {

    NS_WARNING("Null element in MediaResource::MoveLoadsToBackground()");
@@ -1219,7 +1218,7 @@ void MediaResource::MoveLoadsToBackground() { 
  if (NS_SUCCEEDED(mChannel->IsPending(&isPending)) &&

      isPending) {

    nsLoadFlags loadFlags;

    rv = mChannel->GetLoadFlags(&loadFlags);

    DebugOnly<nsresult> rv = mChannel->GetLoadFlags(&loadFlags);

    NS_ASSERTION(NS_SUCCEEDED(rv), "GetLoadFlags() failed!");



    loadFlags |= nsIRequest::LOAD_BACKGROUND;
@@ -1230,7 +1229,7 @@ void MediaResource::MoveLoadsToBackground() { 
void MediaResource::ModifyLoadFlags(nsLoadFlags aFlags)

{

  nsCOMPtr<nsILoadGroup> loadGroup;

  nsresult rv = mChannel->GetLoadGroup(getter_AddRefs(loadGroup));

  DebugOnly<nsresult> rv = mChannel->GetLoadGroup(getter_AddRefs(loadGroup));

  NS_ASSERTION(NS_SUCCEEDED(rv), "GetLoadGroup() failed!");



  nsresult status;

content/media/nsBuiltinDecoderStateMachine.cpp

+2 −0
Original line number Diff line number Diff line
@@ -2163,7 +2163,9 @@ void nsBuiltinDecoderStateMachine::StartBuffering() 
  mState = DECODER_STATE_BUFFERING;

  LOG(PR_LOG_DEBUG, ("%p Changed state from DECODING to BUFFERING, decoded for %.3lfs",

                     mDecoder.get(), decodeDuration.ToSeconds()));

#ifdef PR_LOGGING

  nsMediaDecoder::Statistics stats = mDecoder->GetStatistics();

#endif

  LOG(PR_LOG_DEBUG, ("%p Playback rate: %.1lfKB/s%s download rate: %.1lfKB/s%s",

    mDecoder.get(),

    stats.mPlaybackRate/1024, stats.mPlaybackRateReliable ? "" : " (unreliable)",

content/media/ogg/nsOggReader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1165,7 +1165,7 @@ nsresult nsOggReader::SeekBisection(PRInt64 aTarget, 
  ogg_int64_t seekTarget = aTarget;

  PRInt64 seekLowerBound = NS_MAX(static_cast<PRInt64>(0), aTarget - aFuzz);

  int hops = 0;

  ogg_int64_t previousGuess = -1;

  DebugOnly<ogg_int64_t> previousGuess = -1;

  int backsteps = 0;

  const int maxBackStep = 10;

  NS_ASSERTION(static_cast<PRUint64>(PAGE_STEP) * pow(2.0, maxBackStep) < PR_INT32_MAX,