Bug 1338086 - Remove useless else blocks in order to reduce complexity in toolkit/components/telemetry/ r?dexter draft
authorSylvestre Ledru <sledru@mozilla.com>
Thu, 09 Feb 2017 10:52:55 +0100
changeset 484419 0da15e380a8ff298d753621d5795ae85cb0761d2
parent 484418 0a132818df453e63b0c547df1b952c36ad5f48db
child 484420 b991eaa5b121d8dcd126c92ad36bf32ca127d222
push id45470
push userbmo:sledru@mozilla.com
push dateWed, 15 Feb 2017 08:57:47 +0000
reviewersdexter
bugs1338086
milestone54.0a1
Bug 1338086 - Remove useless else blocks in order to reduce complexity in toolkit/components/telemetry/ r?dexter MozReview-Commit-ID: EjMufQ1PReI
toolkit/components/telemetry/TelemetryHistogram.cpp
toolkit/components/telemetry/TelemetryScalar.cpp
--- a/toolkit/components/telemetry/TelemetryHistogram.cpp
+++ b/toolkit/components/telemetry/TelemetryHistogram.cpp
@@ -846,19 +846,18 @@ internal_ShouldReflectHistogram(Histogra
     // However, these two histograms are created by Histogram itself for
     // tracking corruption.  We have our own histograms for that, so
     // ignore these two.
     if (strcmp(name, "Histogram.InconsistentCountHigh") == 0
         || strcmp(name, "Histogram.InconsistentCountLow") == 0) {
       return false;
     }
     return true;
-  } else {
-    return !gCorruptHistograms[id];
   }
+  return !gCorruptHistograms[id];
 }
 
 } // namespace
 
 
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 //
--- a/toolkit/components/telemetry/TelemetryScalar.cpp
+++ b/toolkit/components/telemetry/TelemetryScalar.cpp
@@ -1098,17 +1098,18 @@ internal_UpdateScalar(const nsACString& 
     if (rv == NS_ERROR_NOT_AVAILABLE) {
       return ScalarResult::Ok;
     }
     return ScalarResult::UnknownScalar;
   }
 
   if (aType == ScalarActionType::eAdd) {
     return scalar->AddValue(aValue);
-  } else if (aType == ScalarActionType::eSet) {
+  }
+  if (aType == ScalarActionType::eSet) {
     return scalar->SetValue(aValue);
   }
 
   return scalar->SetMaximum(aValue);
 }
 
 } // namespace
 
@@ -1239,17 +1240,18 @@ internal_UpdateKeyedScalar(const nsACStr
     if (rv == NS_ERROR_NOT_AVAILABLE) {
       return ScalarResult::Ok;
     }
     return ScalarResult::UnknownScalar;
   }
 
   if (aType == ScalarActionType::eAdd) {
     return scalar->AddValue(aKey, aValue);
-  } else if (aType == ScalarActionType::eSet) {
+  }
+  if (aType == ScalarActionType::eSet) {
     return scalar->SetValue(aKey, aValue);
   }
 
   return scalar->SetMaximum(aKey, aValue);
 }
 
 } // namespace