cashew: add cros-debug support

src/data_plan.cc

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/data_plan.h"
 
 #include <time.h>
 
 #include <glog/logging.h>
 
@@ skipping 288 matching lines @@
   // convert from time_t to base::Time
   *time_out = base::Time::FromTimeT(tt);
   return true;
 }
 
 // static
 DataPlan* DataPlan::GetActivePlan(const DataPlanList& data_plans) {
   DataPlanList::const_iterator it;
   for (it = data_plans.begin(); it != data_plans.end(); ++it) {
     DataPlan *plan = *it;
     DCHECK(plan != NULL);

[Daniel Kurtz, 2010/12/14 04:38:44]

CHECK_NOTNULL(plan)?

[Vince Laviano, 2010/12/14 18:48:22]

I wanted this to be a debug-only check. The version of glog that we were using
at the time of writing had no DCHECK_NOTNULL macro, so I used the more general
DCHECK macro instead.  However, DCHECK_NOTNULL was added in glog 0.3.1, so I'll
update this code to use it.

     if (plan->IsActive()) {
       return plan;
     }
   }
   return NULL;
 }
 
 // private methods
 
 const char* DataPlan::TypeToLibcrosString(DataPlan::Type type) const {
   switch (type) {
     case kTypeUnlimited:
       return kCellularDataPlanTypeUnlimited;
     case kTypeMeteredFree:
       return kCellularDataPlanTypeMeteredFree;
     case kTypeMeteredPaid:
       return kCellularDataPlanTypeMeteredPaid;
     default:
-      DCHECK(false);
+      CHECK(false);

[Daniel Kurtz, 2010/12/14 04:38:44]

Is it ok to not return anything here?

[Vince Laviano, 2010/12/14 18:48:22]

Yes, if we're aborting unconditionally. The reason for aborting is because this
is a "can't happen" scenario and there's nothing sensible to return here. 

g++ is ok with this in -Wall -Werror mode.

   }
 }
 
 // static
 bool DataPlan::CrosUsageStringToType(const std::string& type_string,
                                      DataPlan::Type *type_out) {
   CHECK_NOTNULL(type_out);
   if (type_string == kCrosUsageDataPlanTypeUnlimited) {
     *type_out = kTypeUnlimited;
   } else if (type_string == kCrosUsageDataPlanTypeMeteredFree) {
@@ skipping 16 matching lines @@
     *out_value = generic_int_out;
     return true;
   }
   if (dict.GetInteger64(key, out_value)) {
     return true;
   }
   return false;
 }
 
 }  // namespace cashew