commit 7fab89734d88724a288e96a9996b15548c5294c7
author Ben Chan <benchan@chromium.org> Sun Aug 10 17:14:46 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Mon Aug 11 05:37:57 2014 +0000
tree ec3fa83e9f1b0bb8647e94890f7b963b653c6215
parent 73dd0dcf5a44ee14eac2de389c9ba967a449a20d

shill: Use integer types from stdint.h

This CL replaces the deprecated int* and uint* types from
'base/basictypes.h' with the int*_t and uint*_t types from 'stdint.h'.

BUG=chromium:401356
TEST=`USE='cellular gdmwimax wimax' FEATURES=test emerge-$BOARD platform2`

Change-Id: I3d4c195881203dd2a47dbb5af150b6c90b9c206e
Reviewed-on: https://chromium-review.googlesource.com/211770
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>

cellular_capability_universal_cdma.cc

diff --git a/cellular_capability_universal_cdma.cc b/cellular_capability_universal_cdma.cc
index 7b9a4bd..1726015 100644
--- a/cellular_capability_universal_cdma.cc
+++ b/cellular_capability_universal_cdma.cc
@@ -243,8 +243,8 @@
 }
 
 void CellularCapabilityUniversalCDMA::OnActivationStateChangedSignal(
-    uint32 activation_state,
-    uint32 activation_error,
+    uint32_t activation_state,
+    uint32_t activation_error,
     const DBusPropertiesMap &status_changes) {
   SLOG(Cellular, 2) << __func__;
 
@@ -290,7 +290,8 @@
     callback.Run(error);
 }
 
-void CellularCapabilityUniversalCDMA::HandleNewActivationStatus(uint32 error) {
+void CellularCapabilityUniversalCDMA::HandleNewActivationStatus(
+    uint32_t error) {
   SLOG(Cellular, 2) << __func__ << "(" << error << ")";
   if (!cellular()->service().get()) {
     LOG(ERROR) << "In " << __func__ << "(): service is null.";
@@ -305,7 +306,7 @@
 
 // static
 string CellularCapabilityUniversalCDMA::GetActivationStateString(
-    uint32 state) {
+    uint32_t state) {
   switch (state) {
     case MM_MODEM_CDMA_ACTIVATION_STATE_ACTIVATED:
       return kActivationStateActivated;
@@ -322,7 +323,7 @@
 
 // static
 string CellularCapabilityUniversalCDMA::GetActivationErrorString(
-    uint32 error) {
+    uint32_t error) {
   switch (error) {
     case MM_CDMA_ACTIVATION_ERROR_WRONG_RADIO_INTERFACE:
       return kErrorNeedEvdo;
@@ -418,7 +419,7 @@
 }
 
 string CellularCapabilityUniversalCDMA::GetRoamingStateString() const {
-  uint32 state = cdma_evdo_registration_state_;
+  uint32_t state = cdma_evdo_registration_state_;
   if (state == MM_MODEM_CDMA_REGISTRATION_STATE_UNKNOWN) {
     state = cdma_1x_registration_state_;
   }