Bug 1073003 - Fix more -Wunused-variable and -Wunused-but-set-variabl…

…e warnings. r=ehsan --HG-- extra : rebase_source : bb768dd07c19dc39994d5cca6e0f59048d12130a
dothq · Dec 17, 2014 · edd363a · edd363a
1 parent c97b750
commit edd363a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/dom/fmradio/FMRadioService.cpp b/dom/fmradio/FMRadioService.cpp
@@ -20,6 +20,7 @@
 #include "nsJSUtils.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/SettingChangeNotificationBinding.h"
+#include "mozilla/DebugOnly.h"
 
 #define TUNE_THREAD_TIMEOUT_MS  5000
 
@@ -780,7 +781,7 @@ FMRadioService::SetRDSGroupMask(uint32_t aRDSGroupMask)
 {
   mRDSGroupMask = aRDSGroupMask;
   if (IsFMRadioOn() && mRDSEnabled) {
-    bool enabled = hal::EnableRDS(mRDSGroupMask | DOM_PARSED_RDS_GROUPS);
+    DebugOnly<bool> enabled = hal::EnableRDS(mRDSGroupMask | DOM_PARSED_RDS_GROUPS);
     MOZ_ASSERT(enabled);
   }
 }

diff --git a/hal/gonk/GonkHal.cpp b/hal/gonk/GonkHal.cpp
@@ -48,6 +48,7 @@
 #include "HalLog.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/dom/battery/Constants.h"
+#include "mozilla/DebugOnly.h"
 #include "mozilla/FileUtils.h"
 #include "mozilla/Monitor.h"
 #include "mozilla/RefPtr.h"
@@ -529,7 +530,7 @@ GetCurrentBatteryCharge(int* aCharge)
 static bool
 GetCurrentBatteryCharging(int* aCharging)
 {
-  static const int BATTERY_NOT_CHARGING = 0;
+  static const DebugOnly<int> BATTERY_NOT_CHARGING = 0;
   static const int BATTERY_CHARGING_USB = 1;
   static const int BATTERY_CHARGING_AC  = 2;
 
@@ -1313,8 +1314,8 @@ EnsureKernelLowMemKillerParamsSet()
   nsAutoCString adjParams;
   nsAutoCString minfreeParams;
 
-  int32_t lowerBoundOfNextOomScoreAdj = OOM_SCORE_ADJ_MIN - 1;
-  int32_t lowerBoundOfNextKillUnderKB = 0;
+  DebugOnly<int32_t> lowerBoundOfNextOomScoreAdj = OOM_SCORE_ADJ_MIN - 1;
+  DebugOnly<int32_t> lowerBoundOfNextKillUnderKB = 0;
   int32_t countOfLowmemorykillerParametersSets = 0;
 
   long page_size = sysconf(_SC_PAGESIZE);

diff --git a/media/webrtc/signaling/src/media-conduit/WebrtcOMXH264VideoCodec.cpp b/media/webrtc/signaling/src/media-conduit/WebrtcOMXH264VideoCodec.cpp
@@ -1169,7 +1169,6 @@ WebrtcOMXH264VideoDecoder::Decode(const webrtc::EncodedImage& aInputImage,
 
   bool feedFrame = true;
   while (feedFrame) {
-    int64_t timeUs;
     status_t err = mOMX->FillInput(aInputImage, !configured, aRenderTimeMs);
     feedFrame = (err == -EAGAIN); // No input buffer available. Try again.
   }

diff --git a/netwerk/protocol/rtsp/rtsp/RTSPSource.cpp b/netwerk/protocol/rtsp/rtsp/RTSPSource.cpp
@@ -29,6 +29,7 @@
 #include "nsString.h"
 #include "nsStringStream.h"
 #include "nsAutoPtr.h"
+#include "mozilla/DebugOnly.h"
 
 using namespace mozilla;
 using namespace mozilla::net;
@@ -595,7 +596,7 @@ void RTSPSource::onConnected(bool isSeekable)
         meta->SetTotalTracks(numTracks);
         meta->SetMimeType(mimeType);
 
-        bool success;
+        DebugOnly<bool> success;
         success = format->findInt64(kKeyDuration, &int64Value);
         MOZ_ASSERT(success);
         meta->SetDuration(int64Value);
@@ -713,7 +714,7 @@ void RTSPSource::onTrackDataAvailable(size_t trackIndex)
     meta = new mozilla::net::RtspMetaData();
 
     MOZ_ASSERT(accessUnit != NULL);
-    bool success = accessUnit->meta()->findInt64("timeUs", &int64Value);
+    DebugOnly<bool> success = accessUnit->meta()->findInt64("timeUs", &int64Value);
     MOZ_ASSERT(success);
     meta->SetTimeStamp(int64Value);