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>
diff --git a/accessor_interface.h b/accessor_interface.h
index e81c7ec..ac7bcbb 100644
--- a/accessor_interface.h
+++ b/accessor_interface.h
@@ -56,13 +56,13 @@
typedef std::vector<std::string> Strings;
typedef std::map<std::string, std::string> Stringmap;
typedef std::vector<Stringmap> Stringmaps;
-typedef std::vector<uint16> Uint16s;
+typedef std::vector<uint16_t> Uint16s;
// Using a smart pointer here allows pointers to classes derived from
// AccessorInterface<> to be stored in maps and other STL container types.
typedef std::shared_ptr<AccessorInterface<bool>> BoolAccessor;
-typedef std::shared_ptr<AccessorInterface<int16>> Int16Accessor;
-typedef std::shared_ptr<AccessorInterface<int32>> Int32Accessor;
+typedef std::shared_ptr<AccessorInterface<int16_t>> Int16Accessor;
+typedef std::shared_ptr<AccessorInterface<int32_t>> Int32Accessor;
// See comment above RpcIdentifiers typedef, for the reason why the
// RpcIdentifiersAccessor exists (even though it has the same
// underlying type as StringsAccessor).
@@ -76,11 +76,11 @@
typedef std::shared_ptr<AccessorInterface<Strings>> StringsAccessor;
typedef std::shared_ptr<
AccessorInterface<KeyValueStore>> KeyValueStoreAccessor;
-typedef std::shared_ptr<AccessorInterface<uint8>> Uint8Accessor;
-typedef std::shared_ptr<AccessorInterface<uint16>> Uint16Accessor;
+typedef std::shared_ptr<AccessorInterface<uint8_t>> Uint8Accessor;
+typedef std::shared_ptr<AccessorInterface<uint16_t>> Uint16Accessor;
typedef std::shared_ptr<AccessorInterface<Uint16s>> Uint16sAccessor;
-typedef std::shared_ptr<AccessorInterface<uint32>> Uint32Accessor;
-typedef std::shared_ptr<AccessorInterface<uint64>> Uint64Accessor;
+typedef std::shared_ptr<AccessorInterface<uint32_t>> Uint32Accessor;
+typedef std::shared_ptr<AccessorInterface<uint64_t>> Uint64Accessor;
} // namespace shill
diff --git a/active_passive_out_of_credits_detector.cc b/active_passive_out_of_credits_detector.cc
index e9d9d59..6386615 100644
--- a/active_passive_out_of_credits_detector.cc
+++ b/active_passive_out_of_credits_detector.cc
@@ -14,11 +14,11 @@
namespace shill {
// static
-const int64
+const int64_t
ActivePassiveOutOfCreditsDetector::kOutOfCreditsConnectionDropSeconds = 15;
const int
ActivePassiveOutOfCreditsDetector::kOutOfCreditsMaxConnectAttempts = 3;
-const int64
+const int64_t
ActivePassiveOutOfCreditsDetector::kOutOfCreditsResumeIgnoreSeconds = 5;
ActivePassiveOutOfCreditsDetector::ActivePassiveOutOfCreditsDetector(
diff --git a/active_passive_out_of_credits_detector.h b/active_passive_out_of_credits_detector.h
index b49b7fa..bd123a7 100644
--- a/active_passive_out_of_credits_detector.h
+++ b/active_passive_out_of_credits_detector.h
@@ -30,7 +30,7 @@
Service::ConnectState old_state,
Service::ConnectState new_state) override;
virtual void NotifySubscriptionStateChanged(
- uint32 subscription_state) override {}
+ uint32_t subscription_state) override {}
const TrafficMonitor *traffic_monitor() const {
return traffic_monitor_.get();
@@ -47,9 +47,9 @@
FRIEND_TEST(ActivePassiveOutOfCreditsDetectorTest, OnNoNetworkRouting);
FRIEND_TEST(ActivePassiveOutOfCreditsDetectorTest, StopTrafficMonitor);
- static const int64 kOutOfCreditsConnectionDropSeconds;
+ static const int64_t kOutOfCreditsConnectionDropSeconds;
static const int kOutOfCreditsMaxConnectAttempts;
- static const int64 kOutOfCreditsResumeIgnoreSeconds;
+ static const int64_t kOutOfCreditsResumeIgnoreSeconds;
// Initiates traffic monitoring.
bool StartTrafficMonitor();
diff --git a/adaptor_interfaces.h b/adaptor_interfaces.h
index fa0d65c..9bcae37 100644
--- a/adaptor_interfaces.h
+++ b/adaptor_interfaces.h
@@ -30,8 +30,8 @@
virtual const std::string &GetRpcConnectionIdentifier() = 0;
virtual void EmitBoolChanged(const std::string &name, bool value) = 0;
- virtual void EmitUintChanged(const std::string &name, uint32 value) = 0;
- virtual void EmitUint16Changed(const std::string &name, uint16 value) = 0;
+ virtual void EmitUintChanged(const std::string &name, uint32_t value) = 0;
+ virtual void EmitUint16Changed(const std::string &name, uint16_t value) = 0;
virtual void EmitIntChanged(const std::string &name, int value) = 0;
virtual void EmitStringChanged(const std::string &name,
const std::string &value) = 0;
@@ -57,7 +57,7 @@
virtual const std::string &GetRpcIdentifier() = 0;
virtual void EmitBoolChanged(const std::string &name, bool value) = 0;
- virtual void EmitUintChanged(const std::string &name, uint32 value) = 0;
+ virtual void EmitUintChanged(const std::string &name, uint32_t value) = 0;
virtual void EmitIntChanged(const std::string &name, int value) = 0;
virtual void EmitStringChanged(const std::string &name,
const std::string &value) = 0;
@@ -77,7 +77,7 @@
virtual void UpdateRunning() = 0;
virtual void EmitBoolChanged(const std::string &name, bool value) = 0;
- virtual void EmitUintChanged(const std::string &name, uint32 value) = 0;
+ virtual void EmitUintChanged(const std::string &name, uint32_t value) = 0;
virtual void EmitIntChanged(const std::string &name, int value) = 0;
virtual void EmitStringChanged(const std::string &name,
const std::string &value) = 0;
@@ -103,7 +103,7 @@
virtual const std::string &GetRpcIdentifier() = 0;
virtual void EmitBoolChanged(const std::string &name, bool value) = 0;
- virtual void EmitUintChanged(const std::string &name, uint32 value) = 0;
+ virtual void EmitUintChanged(const std::string &name, uint32_t value) = 0;
virtual void EmitIntChanged(const std::string &name, int value) = 0;
virtual void EmitStringChanged(const std::string &name,
const std::string &value) = 0;
@@ -137,11 +137,11 @@
virtual void UpdateConnected() = 0;
virtual void EmitBoolChanged(const std::string &name, bool value) = 0;
- virtual void EmitUint8Changed(const std::string &name, uint8 value) = 0;
- virtual void EmitUint16Changed(const std::string &name, uint16 value) = 0;
+ virtual void EmitUint8Changed(const std::string &name, uint8_t value) = 0;
+ virtual void EmitUint16Changed(const std::string &name, uint16_t value) = 0;
virtual void EmitUint16sChanged(const std::string &name,
const Uint16s &value) = 0;
- virtual void EmitUintChanged(const std::string &name, uint32 value) = 0;
+ virtual void EmitUintChanged(const std::string &name, uint32_t value) = 0;
virtual void EmitIntChanged(const std::string &name, int value) = 0;
virtual void EmitRpcIdentifierChanged(const std::string &name,
const std::string &value) = 0;
diff --git a/arp_client.cc b/arp_client.cc
index f25d91b..eb7605a 100644
--- a/arp_client.cc
+++ b/arp_client.cc
@@ -17,8 +17,8 @@
namespace shill {
-// ARP opcode is the last uint16 in the ARP header.
-const size_t ArpClient::kArpOpOffset = sizeof(arphdr) - sizeof(uint16);
+// ARP opcode is the last uint16_t in the ARP header.
+const size_t ArpClient::kArpOpOffset = sizeof(arphdr) - sizeof(uint16_t);
// The largest packet we expect is one with IPv6 addresses in it.
const size_t ArpClient::kMaxArpPacketLength =
diff --git a/arp_client_unittest.cc b/arp_client_unittest.cc
index b55fdfe..b73f295 100644
--- a/arp_client_unittest.cc
+++ b/arp_client_unittest.cc
@@ -54,9 +54,9 @@
static const int kInterfaceIndex;
static const int kSocketFD;
static const char kLocalIPAddress[];
- static const uint8 kLocalMACAddress[];
+ static const uint8_t kLocalMACAddress[];
static const char kRemoteIPAddress[];
- static const uint8 kRemoteMACAddress[];
+ static const uint8_t kRemoteMACAddress[];
static const int kArpOpOffset;
bool CreateSocket() { return client_.CreateSocket(); }
@@ -78,9 +78,9 @@
const int ArpClientTest::kInterfaceIndex = 123;
const int ArpClientTest::kSocketFD = 456;
const char ArpClientTest::kLocalIPAddress[] = "10.0.1.1";
-const uint8 ArpClientTest::kLocalMACAddress[] = { 0, 1, 2, 3, 4, 5 };
+const uint8_t ArpClientTest::kLocalMACAddress[] = { 0, 1, 2, 3, 4, 5 };
const char ArpClientTest::kRemoteIPAddress[] = "10.0.1.2";
-const uint8 ArpClientTest::kRemoteMACAddress[] = { 6, 7, 8, 9, 10, 11 };
+const uint8_t ArpClientTest::kRemoteMACAddress[] = { 6, 7, 8, 9, 10, 11 };
const int ArpClientTest::kArpOpOffset = 7;
@@ -231,7 +231,7 @@
// Hack: Force this packet to be an ARP repsonse instead of an ARP request.
recvfrom_reply_data_.GetData()[kArpOpOffset] = ARPOP_REPLY;
- static const uint8 kSenderBytes[] = { 0xa, 0xb, 0xc, 0xd, 0xe, 0xf };
+ static const uint8_t kSenderBytes[] = { 0xa, 0xb, 0xc, 0xd, 0xe, 0xf };
memcpy(&recvfrom_sender_.sll_addr, kSenderBytes, sizeof(kSenderBytes));
recvfrom_sender_.sll_halen = sizeof(kSenderBytes);
EXPECT_TRUE(client_.ReceiveReply(&reply, &sender));
@@ -282,10 +282,11 @@
// If the destination MAC address is unset, it should be sent to the
// broadcast MAC address.
- static const uint8 kZeroBytes[] = { 0, 0, 0, 0, 0, 0 };
+ static const uint8_t kZeroBytes[] = { 0, 0, 0, 0, 0, 0 };
packet.set_remote_mac_address(ByteString(kZeroBytes, arraysize(kZeroBytes)));
ASSERT_TRUE(packet.FormatRequest(&packet_bytes));
- static const uint8 kBroadcastBytes[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+ static const uint8_t kBroadcastBytes[] =
+ { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
ByteString broadcast_mac(kBroadcastBytes, arraysize(kBroadcastBytes));
EXPECT_CALL(*sockets_, SendTo(kSocketFD,
IsByteData(packet_bytes),
diff --git a/arp_packet.cc b/arp_packet.cc
index aca0715..cf0c129 100644
--- a/arp_packet.cc
+++ b/arp_packet.cc
@@ -59,13 +59,13 @@
memcpy(&header, packet.GetConstData(), sizeof(header));
- const uint16 hardware_type = ntohs(header.ar_hrd);
+ const uint16_t hardware_type = ntohs(header.ar_hrd);
if (hardware_type != ARPHRD_ETHER) {
NOTIMPLEMENTED() << "Packet is of unknown ARPHRD type "
<< hardware_type;
return false;
}
- const uint16 protocol = ntohs(header.ar_pro);
+ const uint16_t protocol = ntohs(header.ar_pro);
IPAddress::Family family = IPAddress::kFamilyUnknown;
if (protocol == ETHERTYPE_IP) {
family = IPAddress::kFamilyIPv4;
@@ -88,7 +88,7 @@
<< ip_address_length;
return false;
}
- const uint16 operation = ntohs(header.ar_op);
+ const uint16_t operation = ntohs(header.ar_op);
if (operation != ARPOP_REPLY) {
NOTIMPLEMENTED() << "Packet is not an ARP reply but of type "
<< operation;
@@ -124,7 +124,7 @@
LOG(ERROR) << "Local and remote IP address families do not match!";
return false;
}
- uint16 protocol;
+ uint16_t protocol;
IPAddress::Family family = local_ip_address_.family();
if (family == IPAddress::kFamilyIPv4) {
protocol = ETHERTYPE_IP;
diff --git a/arp_packet_unittest.cc b/arp_packet_unittest.cc
index a952718..11141a8 100644
--- a/arp_packet_unittest.cc
+++ b/arp_packet_unittest.cc
@@ -15,21 +15,21 @@
namespace shill {
namespace {
-const uint8 kArpRequestV4[] =
+const uint8_t kArpRequestV4[] =
{ 0x00, 0x01, 0x08, 0x00, 0x06, 0x04, 0x00, 0x01 };
-const uint8 kArpRequestV6[] =
+const uint8_t kArpRequestV6[] =
{ 0x00, 0x01, 0x86, 0xdd, 0x06, 0x10, 0x00, 0x01 };
-const uint8 kArpReplyV4[] =
+const uint8_t kArpReplyV4[] =
{ 0x00, 0x01, 0x08, 0x00, 0x06, 0x04, 0x00, 0x02 };
-const uint8 kArpReplyV6[] =
+const uint8_t kArpReplyV6[] =
{ 0x00, 0x01, 0x86, 0xdd, 0x06, 0x10, 0x00, 0x02 };
const char kIPv4Address0[] = "192.168.0.1";
const char kIPv4Address1[] = "10.0.12.13";
const char kIPv6Address0[] = "fe80::1aa9:5ff:7ebf:14c5";
const char kIPv6Address1[] = "1980:0:0:1000:1b02:1aa9:5ff:7ebf";
-const uint8 kMACAddress0[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05 };
-const uint8 kMACAddress1[] = { 0x88, 0x87, 0x86, 0x85, 0x84, 0x83 };
-const uint8 kInsertedByte[] = { 0x00 };
+const uint8_t kMACAddress0[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05 };
+const uint8_t kMACAddress1[] = { 0x88, 0x87, 0x86, 0x85, 0x84, 0x83 };
+const uint8_t kInsertedByte[] = { 0x00 };
const size_t kArpPaddingSizeV4 = 18;
const size_t kArpPaddingSizeV6 = 0;
} // namespace
diff --git a/byte_string.cc b/byte_string.cc
index 5d2917e..912961d 100644
--- a/byte_string.cc
+++ b/byte_string.cc
@@ -52,25 +52,25 @@
}
// static
-ByteString ByteString::CreateFromCPUUInt32(uint32 val) {
+ByteString ByteString::CreateFromCPUUInt32(uint32_t val) {
return ByteString(reinterpret_cast<unsigned char *>(&val), sizeof(val));
}
// static
-ByteString ByteString::CreateFromNetUInt32(uint32 val) {
+ByteString ByteString::CreateFromNetUInt32(uint32_t val) {
return CreateFromCPUUInt32(ntohl(val));
}
// static
ByteString ByteString::CreateFromHexString(const string &hex_string) {
- vector<uint8> bytes;
+ vector<uint8_t> bytes;
if (!base::HexStringToBytes(hex_string, &bytes)) {
return ByteString();
}
return ByteString(&bytes.front(), bytes.size());
}
-bool ByteString::ConvertToCPUUInt32(uint32 *val) const {
+bool ByteString::ConvertToCPUUInt32(uint32_t *val) const {
if (val == NULL || GetLength() != sizeof(*val)) {
return false;
}
@@ -79,7 +79,7 @@
return true;
}
-bool ByteString::ConvertToNetUInt32(uint32 *val) const {
+bool ByteString::ConvertToNetUInt32(uint32_t *val) const {
if (!ConvertToCPUUInt32(val)) {
return false;
}
diff --git a/byte_string.h b/byte_string.h
index ae06557..71b70c8 100644
--- a/byte_string.h
+++ b/byte_string.h
@@ -52,10 +52,10 @@
// this ByteString.
ByteString GetSubstring(size_t offset, size_t length) const;
- // Inserts a uint32 into a ByteString in cpu-order
- static ByteString CreateFromCPUUInt32(uint32 val);
- // Inserts a uint32 into a ByteString in network-order
- static ByteString CreateFromNetUInt32(uint32 val);
+ // Inserts a uint32_t into a ByteString in cpu-order
+ static ByteString CreateFromCPUUInt32(uint32_t val);
+ // Inserts a uint32_t into a ByteString in network-order
+ static ByteString CreateFromNetUInt32(uint32_t val);
// Creates a ByteString from a string of hexadecimal digits where
// a pair of hexadecimal digits corresponds to a byte.
@@ -64,12 +64,12 @@
// of bytes.
static ByteString CreateFromHexString(const std::string &hex_string);
- // Converts to a uint32 from a host-order value stored in the ByteString
+ // Converts to a uint32_t from a host-order value stored in the ByteString
// Returns true on success
- bool ConvertToCPUUInt32(uint32 *val) const;
- // Converts to a uint32 from a network-order value stored in the ByteString
+ bool ConvertToCPUUInt32(uint32_t *val) const;
+ // Converts to a uint32_t from a network-order value stored in the ByteString
// Returns true on success
- bool ConvertToNetUInt32(uint32 *val) const;
+ bool ConvertToNetUInt32(uint32_t *val) const;
// Converts the string of bytes stored in the ByteString from network order
// to host order in 32-bit chunks. Returns true on success or false if the
diff --git a/byte_string_unittest.cc b/byte_string_unittest.cc
index f8e17b7..7d3cf38 100644
--- a/byte_string_unittest.cc
+++ b/byte_string_unittest.cc
@@ -31,7 +31,7 @@
class ByteStringTest : public Test {
public:
bool IsCPUSameAsNetOrder() {
- const uint32 kTestValue = 0x12345678;
+ const uint32_t kTestValue = 0x12345678;
return htonl(kTestValue) == kTestValue;
}
@@ -71,7 +71,7 @@
};
TEST_F(ByteStringTest, Empty) {
- uint32 val;
+ uint32_t val;
ByteString bs1(0);
EXPECT_TRUE(bs1.IsEmpty());
@@ -83,7 +83,7 @@
TEST_F(ByteStringTest, NonEmpty) {
ByteString bs1(kTest1, sizeof(kTest1));
- uint32 val;
+ uint32_t val;
EXPECT_FALSE(bs1.IsEmpty());
ASSERT_TRUE(bs1.GetData() != NULL);
@@ -149,7 +149,7 @@
TEST_F(ByteStringTest, UInt32) {
ByteString bs1 = ByteString::CreateFromNetUInt32(kTest2Uint32);
- uint32 val;
+ uint32_t val;
EXPECT_EQ(4, bs1.GetLength());
ASSERT_TRUE(bs1.GetData() != NULL);
@@ -251,7 +251,7 @@
// test.
TEST_F(ByteStringTest, EmptyOffset) {
- uint32 val;
+ uint32_t val;
ByteString bs1(kTest1, sizeof(kTest1));
bs1.RemovePrefix(sizeof(kTest1));
@@ -275,7 +275,7 @@
for (unsigned int i = kOffset1; i < sizeof(kTest1); i++) {
EXPECT_EQ(bs1.GetData()[i - kOffset1], kTest1[i]);
}
- uint32 val;
+ uint32_t val;
EXPECT_FALSE(bs1.ConvertToNetUInt32(&val));
EXPECT_FALSE(bs1.IsZero());
}
diff --git a/callbacks.h b/callbacks.h
index ecfe203..ae15b3e 100644
--- a/callbacks.h
+++ b/callbacks.h
@@ -33,8 +33,8 @@
typedef base::Callback<void(
const std::vector<DBus::Path> &, const Error &)> DBusPathsCallback;
typedef base::Callback<void(const std::string &, const Error &)> StringCallback;
-typedef base::Callback<void(
- uint32, uint32, const DBusPropertiesMap &)> ActivationStateSignalCallback;
+typedef base::Callback<void(uint32_t, uint32_t, const DBusPropertiesMap &)>
+ ActivationStateSignalCallback;
typedef base::Callback<void(const Stringmaps &,
const Error &)> ResultStringmapsCallback;
diff --git a/cellular.cc b/cellular.cc
index 9a0fbec..630b9d3 100644
--- a/cellular.cc
+++ b/cellular.cc
@@ -55,7 +55,7 @@
// static
const char Cellular::kAllowRoaming[] = "AllowRoaming";
-const int64 Cellular::kDefaultScanningTimeoutMilliseconds = 60000;
+const int64_t Cellular::kDefaultScanningTimeoutMilliseconds = 60000;
const char Cellular::kGenericServiceNamePrefix[] = "MobileNetwork";
unsigned int Cellular::friendly_service_name_id_ = 1;
@@ -619,7 +619,7 @@
manager()->UpdateService(service_);
}
-void Cellular::HandleNewSignalQuality(uint32 strength) {
+void Cellular::HandleNewSignalQuality(uint32_t strength) {
SLOG(Cellular, 2) << "Signal strength: " << strength;
if (service_) {
service_->SetStrength(strength);
@@ -1471,7 +1471,7 @@
supported_carriers_);
}
-void Cellular::set_prl_version(uint16 prl_version) {
+void Cellular::set_prl_version(uint16_t prl_version) {
if (prl_version_ == prl_version)
return;
diff --git a/cellular.h b/cellular.h
index fd81ae2..efd8dfb 100644
--- a/cellular.h
+++ b/cellular.h
@@ -175,7 +175,7 @@
bool IsModemRegistered() const;
static bool IsEnabledModemState(ModemState state);
- void HandleNewSignalQuality(uint32 strength);
+ void HandleNewSignalQuality(uint32_t strength);
// Processes a change in the modem registration state, possibly creating,
// destroying or updating the CellularService.
@@ -283,7 +283,7 @@
const std::string &sim_identifier() const { return sim_identifier_; }
const Strings &supported_carriers() const { return supported_carriers_; }
- uint16 prl_version() const { return prl_version_; }
+ uint16_t prl_version() const { return prl_version_; }
// setters
void set_home_provider(const Operator &home_provider);
@@ -311,7 +311,7 @@
void set_sim_identifier(const std::string &sim_identifier);
void set_supported_carriers(const Strings &supported_carriers);
- void set_prl_version(uint16 prl_version);
+ void set_prl_version(uint16_t prl_version);
// Takes ownership.
void set_home_provider_info(MobileOperatorInfo *home_provider_info);
@@ -441,7 +441,7 @@
// the |kScanningProperty| exposed by Cellular device is sticky false. Every
// time it is set to true, it must be reset to false after a time equal to
// this constant.
- static const int64 kDefaultScanningTimeoutMilliseconds;
+ static const int64_t kDefaultScanningTimeoutMilliseconds;
// Generic service name prefix, shown when the correct carrier name is
// unknown.
@@ -551,13 +551,13 @@
std::string selected_network_;
Stringmaps found_networks_;
bool provider_requires_roaming_;
- uint16 scan_interval_;
+ uint16_t scan_interval_;
bool sim_present_;
Stringmaps apn_list_;
std::string sim_identifier_;
// CDMA only properties.
- uint16 prl_version_;
+ uint16_t prl_version_;
// This property is specific to Gobi modems.
Strings supported_carriers_;
@@ -589,7 +589,7 @@
// the Device.Scanning property as |true| causes a bad user experience.
// This callback sets it to |false| after a timeout period has passed.
base::CancelableClosure scanning_timeout_callback_;
- int64 scanning_timeout_milliseconds_;
+ int64_t scanning_timeout_milliseconds_;
DISALLOW_COPY_AND_ASSIGN(Cellular);
};
diff --git a/cellular_bearer.cc b/cellular_bearer.cc
index b4d0546..e8f5c1f 100644
--- a/cellular_bearer.cc
+++ b/cellular_bearer.cc
@@ -28,7 +28,7 @@
const char kPropertyMethod[] = "method";
const char kPropertyPrefix[] = "prefix";
-IPConfig::Method ConvertMMBearerIPConfigMethod(uint32 method) {
+IPConfig::Method ConvertMMBearerIPConfigMethod(uint32_t method) {
switch (method) {
case MM_BEARER_IP_METHOD_PPP:
return IPConfig::kMethodPPP;
@@ -85,7 +85,7 @@
DCHECK(ipconfig_method);
DCHECK(ipconfig_properties);
- uint32 method;
+ uint32_t method;
if (!DBusProperties::GetUint32(properties, kPropertyMethod, &method)) {
SLOG(Cellular, 2) << "Bearer '" << dbus_path_
<< "' does not specify an IP configuration method.";
@@ -112,7 +112,7 @@
(*ipconfig_properties)->address = address;
(*ipconfig_properties)->gateway = gateway;
- uint32 prefix;
+ uint32_t prefix;
if (!DBusProperties::GetUint32(properties, kPropertyPrefix, &prefix)) {
prefix = IPAddress::GetMaxPrefixLength(address_family);
}
diff --git a/cellular_capability_cdma.cc b/cellular_capability_cdma.cc
index 5c316fa..d07b785 100644
--- a/cellular_capability_cdma.cc
+++ b/cellular_capability_cdma.cc
@@ -107,7 +107,7 @@
// match flimflam. In the future, get these from an alternative source (e.g.,
// database, carrier-specific properties, etc.).
UpdateOnlinePortal(properties);
- uint16 prl_version;
+ uint16_t prl_version;
if (DBusProperties::GetUint16(properties, "prl_version", &prl_version))
cellular()->set_prl_version(prl_version);
}
@@ -165,7 +165,7 @@
}
}
-void CellularCapabilityCDMA::HandleNewActivationState(uint32 error) {
+void CellularCapabilityCDMA::HandleNewActivationState(uint32_t error) {
SLOG(Cellular, 2) << __func__ << "(" << error << ")";
if (!cellular()->service().get()) {
LOG(ERROR) << "In " << __func__ << "(): service is null.";
@@ -202,7 +202,7 @@
}
// static
-string CellularCapabilityCDMA::GetActivationStateString(uint32 state) {
+string CellularCapabilityCDMA::GetActivationStateString(uint32_t state) {
switch (state) {
case MM_MODEM_CDMA_ACTIVATION_STATE_ACTIVATED:
return kActivationStateActivated;
@@ -218,7 +218,7 @@
}
// static
-string CellularCapabilityCDMA::GetActivationErrorString(uint32 error) {
+string CellularCapabilityCDMA::GetActivationErrorString(uint32_t error) {
switch (error) {
case MM_MODEM_CDMA_ACTIVATION_ERROR_WRONG_RADIO_INTERFACE:
return kErrorNeedEvdo;
@@ -278,7 +278,7 @@
}
string CellularCapabilityCDMA::GetRoamingStateString() const {
- uint32 state = registration_state_evdo_;
+ uint32_t state = registration_state_evdo_;
if (state == MM_MODEM_CDMA_REGISTRATION_STATE_UNKNOWN) {
state = registration_state_1x_;
}
@@ -313,7 +313,7 @@
}
void CellularCapabilityCDMA::OnActivateReply(
- const ResultCallback &callback, uint32 status, const Error &error) {
+ const ResultCallback &callback, uint32_t status, const Error &error) {
activation_starting_ = false;
if (error.IsSuccess()) {
if (status == MM_MODEM_CDMA_ACTIVATION_ERROR_NO_ERROR) {
@@ -330,21 +330,21 @@
}
void CellularCapabilityCDMA::OnGetRegistrationStateReply(
- uint32 state_1x, uint32 state_evdo, const Error &error) {
+ uint32_t state_1x, uint32_t state_evdo, const Error &error) {
SLOG(Cellular, 2) << __func__;
if (error.IsSuccess())
OnRegistrationStateChangedSignal(state_1x, state_evdo);
}
-void CellularCapabilityCDMA::OnGetSignalQualityReply(uint32 quality,
+void CellularCapabilityCDMA::OnGetSignalQualityReply(uint32_t quality,
const Error &error) {
if (error.IsSuccess())
OnSignalQualitySignal(quality);
}
void CellularCapabilityCDMA::OnActivationStateChangedSignal(
- uint32 activation_state,
- uint32 activation_error,
+ uint32_t activation_state,
+ uint32_t activation_error,
const DBusPropertiesMap &status_changes) {
SLOG(Cellular, 2) << __func__;
string prop_value;
@@ -360,14 +360,14 @@
}
void CellularCapabilityCDMA::OnRegistrationStateChangedSignal(
- uint32 state_1x, uint32 state_evdo) {
+ uint32_t state_1x, uint32_t state_evdo) {
SLOG(Cellular, 2) << __func__;
registration_state_1x_ = state_1x;
registration_state_evdo_ = state_evdo;
cellular()->HandleNewRegistrationState();
}
-void CellularCapabilityCDMA::OnSignalQualitySignal(uint32 strength) {
+void CellularCapabilityCDMA::OnSignalQualitySignal(uint32_t strength) {
cellular()->HandleNewSignalQuality(strength);
}
diff --git a/cellular_capability_cdma.h b/cellular_capability_cdma.h
index 051cefa..f070399 100644
--- a/cellular_capability_cdma.h
+++ b/cellular_capability_cdma.h
@@ -53,9 +53,9 @@
virtual void GetMEID(const ResultCallback &callback);
- uint32 activation_state() const { return activation_state_; }
- uint32 registration_state_evdo() const { return registration_state_evdo_; }
- uint32 registration_state_1x() const { return registration_state_1x_; }
+ uint32_t activation_state() const { return activation_state_; }
+ uint32_t registration_state_evdo() const { return registration_state_evdo_; }
+ uint32_t registration_state_1x() const { return registration_state_1x_; }
protected:
// Inherited from CellularCapabilityClassic.
@@ -75,27 +75,27 @@
static const char kPhoneNumber[];
- void HandleNewActivationState(uint32 error);
+ void HandleNewActivationState(uint32_t error);
- static std::string GetActivationStateString(uint32 state);
- static std::string GetActivationErrorString(uint32 error);
+ static std::string GetActivationStateString(uint32_t state);
+ static std::string GetActivationErrorString(uint32_t error);
// Signal callbacks from the Modem.CDMA interface
void OnActivationStateChangedSignal(
- uint32 activation_state,
- uint32 activation_error,
+ uint32_t activation_state,
+ uint32_t activation_error,
const DBusPropertiesMap &status_changes);
void OnRegistrationStateChangedSignal(
- uint32 state_1x, uint32 state_evdo);
- void OnSignalQualitySignal(uint32 strength);
+ uint32_t state_1x, uint32_t state_evdo);
+ void OnSignalQualitySignal(uint32_t strength);
// Method reply callbacks from the Modem.CDMA interface
void OnActivateReply(const ResultCallback &callback,
- uint32 status, const Error &error);
+ uint32_t status, const Error &error);
- void OnGetRegistrationStateReply(uint32 state_1x, uint32 state_evdo,
+ void OnGetRegistrationStateReply(uint32_t state_1x, uint32_t state_evdo,
const Error &error);
- void OnGetSignalQualityReply(uint32 strength, const Error &error);
+ void OnGetSignalQualityReply(uint32_t strength, const Error &error);
scoped_ptr<ModemCDMAProxyInterface> proxy_;
base::WeakPtrFactory<CellularCapabilityCDMA> weak_ptr_factory_;
@@ -107,9 +107,9 @@
bool activation_starting_;
ResultCallback pending_activation_callback_;
std::string pending_activation_carrier_;
- uint32 activation_state_;
- uint32 registration_state_evdo_;
- uint32 registration_state_1x_;
+ uint32_t activation_state_;
+ uint32_t registration_state_evdo_;
+ uint32_t registration_state_1x_;
std::string usage_url_;
DISALLOW_COPY_AND_ASSIGN(CellularCapabilityCDMA);
diff --git a/cellular_capability_cdma_unittest.cc b/cellular_capability_cdma_unittest.cc
index 802edb4..f650866 100644
--- a/cellular_capability_cdma_unittest.cc
+++ b/cellular_capability_cdma_unittest.cc
@@ -106,11 +106,11 @@
return capability_->activation_starting_;
}
- void SetRegistrationStateEVDO(uint32 state) {
+ void SetRegistrationStateEVDO(uint32_t state) {
capability_->registration_state_evdo_ = state;
}
- void SetRegistrationState1x(uint32 state) {
+ void SetRegistrationState1x(uint32_t state) {
capability_->registration_state_1x_ = state;
}
diff --git a/cellular_capability_classic.cc b/cellular_capability_classic.cc
index 3e802fd..818ac93 100644
--- a/cellular_capability_classic.cc
+++ b/cellular_capability_classic.cc
@@ -31,7 +31,7 @@
const char CellularCapabilityClassic::kModemPropertyEnabled[] = "Enabled";
const int CellularCapabilityClassic::kTimeoutSetCarrierMilliseconds = 120000;
-static Cellular::ModemState ConvertClassicToModemState(uint32 classic_state) {
+static Cellular::ModemState ConvertClassicToModemState(uint32_t classic_state) {
ModemClassicState cstate = static_cast<ModemClassicState>(classic_state);
switch (cstate) {
case kModemClassicStateUnknown:
@@ -334,7 +334,7 @@
}
void CellularCapabilityClassic::OnModemStateChangedSignal(
- uint32 old_state, uint32 new_state, uint32 reason) {
+ uint32_t old_state, uint32_t new_state, uint32_t reason) {
SLOG(Cellular, 2) << __func__ << "(" << old_state << ", " << new_state << ", "
<< reason << ")";
cellular()->OnModemStateChanged(ConvertClassicToModemState(new_state));
diff --git a/cellular_capability_classic.h b/cellular_capability_classic.h
index b2838b7..228fc3a 100644
--- a/cellular_capability_classic.h
+++ b/cellular_capability_classic.h
@@ -144,9 +144,9 @@
FRIEND_TEST(CellularTest, ModemStateChangeDisable);
// Method reply and signal callbacks from Modem interface
- void OnModemStateChangedSignal(uint32 old_state,
- uint32 new_state,
- uint32 reason);
+ void OnModemStateChangedSignal(uint32_t old_state,
+ uint32_t new_state,
+ uint32_t reason);
void OnGetModemInfoReply(const ResultCallback &callback,
const ModemHardwareInfo &info,
const Error &error);
diff --git a/cellular_capability_gsm.cc b/cellular_capability_gsm.cc
index 54c9072..0a5bb0a 100644
--- a/cellular_capability_gsm.cc
+++ b/cellular_capability_gsm.cc
@@ -44,7 +44,7 @@
const char CellularCapabilityGSM::kPropertyUnlockRetries[] = "UnlockRetries";
const int CellularCapabilityGSM::kGetIMSIRetryLimit = 40;
-const int64 CellularCapabilityGSM::kGetIMSIRetryDelayMilliseconds = 500;
+const int64_t CellularCapabilityGSM::kGetIMSIRetryDelayMilliseconds = 500;
CellularCapabilityGSM::CellularCapabilityGSM(Cellular *cellular,
@@ -407,12 +407,12 @@
SLOG(Cellular, 2) << __func__;
// TODO(petkov): Switch to asynchronous calls (crbug.com/200687).
- uint32 tech = network_proxy_->AccessTechnology();
+ uint32_t tech = network_proxy_->AccessTechnology();
SetAccessTechnology(tech);
SLOG(Cellular, 2) << "GSM AccessTechnology: " << tech;
// TODO(petkov): Switch to asynchronous calls (crbug.com/200687).
- uint32 locks = card_proxy_->EnabledFacilityLocks();
+ uint32_t locks = card_proxy_->EnabledFacilityLocks();
sim_lock_status_.enabled = locks & MM_MODEM_GSM_FACILITY_SIM;
SLOG(Cellular, 2) << "GSM EnabledFacilityLocks: " << locks;
@@ -594,7 +594,7 @@
return parsed;
}
-void CellularCapabilityGSM::SetAccessTechnology(uint32 access_technology) {
+void CellularCapabilityGSM::SetAccessTechnology(uint32_t access_technology) {
access_technology_ = access_technology;
if (cellular()->service().get()) {
cellular()->service()->SetNetworkTechnology(GetNetworkTechnologyString());
@@ -644,7 +644,7 @@
properties,
invalidated_properties);
if (interface == MM_MODEM_GSM_NETWORK_INTERFACE) {
- uint32 access_technology = MM_MODEM_GSM_ACCESS_TECH_UNKNOWN;
+ uint32_t access_technology = MM_MODEM_GSM_ACCESS_TECH_UNKNOWN;
if (DBusProperties::GetUint32(properties,
kPropertyAccessTechnology,
&access_technology)) {
@@ -653,7 +653,7 @@
} else {
bool emit = false;
if (interface == MM_MODEM_GSM_CARD_INTERFACE) {
- uint32 locks = 0;
+ uint32_t locks = 0;
if (DBusProperties::GetUint32(
properties, kPropertyEnabledFacilityLocks, &locks)) {
sim_lock_status_.enabled = locks & MM_MODEM_GSM_FACILITY_SIM;
@@ -679,13 +679,13 @@
}
}
-void CellularCapabilityGSM::OnNetworkModeSignal(uint32 /*mode*/) {
+void CellularCapabilityGSM::OnNetworkModeSignal(uint32_t /*mode*/) {
// TODO(petkov): Implement this.
NOTIMPLEMENTED();
}
void CellularCapabilityGSM::OnRegistrationInfoSignal(
- uint32 status, const string &operator_code, const string &operator_name) {
+ uint32_t status, const string &operator_code, const string &operator_name) {
SLOG(Cellular, 2) << __func__ << ": regstate=" << status
<< ", opercode=" << operator_code
<< ", opername=" << operator_name;
@@ -697,18 +697,18 @@
cellular()->HandleNewRegistrationState();
}
-void CellularCapabilityGSM::OnSignalQualitySignal(uint32 quality) {
+void CellularCapabilityGSM::OnSignalQualitySignal(uint32_t quality) {
cellular()->HandleNewSignalQuality(quality);
}
void CellularCapabilityGSM::OnGetRegistrationInfoReply(
- uint32 status, const string &operator_code, const string &operator_name,
+ uint32_t status, const string &operator_code, const string &operator_name,
const Error &error) {
if (error.IsSuccess())
OnRegistrationInfoSignal(status, operator_code, operator_name);
}
-void CellularCapabilityGSM::OnGetSignalQualityReply(uint32 quality,
+void CellularCapabilityGSM::OnGetSignalQualityReply(uint32_t quality,
const Error &error) {
if (error.IsSuccess())
OnSignalQualitySignal(quality);
diff --git a/cellular_capability_gsm.h b/cellular_capability_gsm.h
index fe313da..d3d688d 100644
--- a/cellular_capability_gsm.h
+++ b/cellular_capability_gsm.h
@@ -132,7 +132,7 @@
bool enabled;
std::string lock_type;
- uint32 retries_left;
+ uint32_t retries_left;
};
static const char kNetworkPropertyAccessTechnology[];
@@ -150,9 +150,9 @@
static const int kGetIMSIRetryLimit;
// This much time will pass between retries of GetIMSI().
- static const int64 kGetIMSIRetryDelayMilliseconds;
+ static const int64_t kGetIMSIRetryDelayMilliseconds;
- void SetAccessTechnology(uint32 access_technology);
+ void SetAccessTechnology(uint32_t access_technology);
Stringmap ParseScanResult(const GSMScanResult &result);
@@ -168,18 +168,18 @@
bool IsUnderlyingDeviceRegistered() const;
// Signal callbacks
- void OnNetworkModeSignal(uint32 mode);
- void OnRegistrationInfoSignal(uint32 status,
+ void OnNetworkModeSignal(uint32_t mode);
+ void OnRegistrationInfoSignal(uint32_t status,
const std::string &operator_code,
const std::string &operator_name);
- void OnSignalQualitySignal(uint32 quality);
+ void OnSignalQualitySignal(uint32_t quality);
// Method callbacks
- void OnGetRegistrationInfoReply(uint32 status,
+ void OnGetRegistrationInfoReply(uint32_t status,
const std::string &operator_code,
const std::string &operator_name,
const Error &error);
- void OnGetSignalQualityReply(uint32 quality, const Error &error);
+ void OnGetSignalQualityReply(uint32_t quality, const Error &error);
void OnRegisterReply(const ResultCallback &callback,
const Error &error);
void OnGetIMEIReply(const ResultCallback &callback,
@@ -207,8 +207,8 @@
// once the context has been separated out. (crbug.com/363874)
scoped_ptr<MobileOperatorInfo> mobile_operator_info_;
- uint32 registration_state_;
- uint32 access_technology_;
+ uint32_t registration_state_;
+ uint32_t access_technology_;
Cellular::Operator serving_operator_;
std::string spn_;
mobile_provider *home_provider_info_;
@@ -219,7 +219,7 @@
// Amount of time to wait between retries of GetIMSI. Defaults to
// kGetIMSIRetryDelayMilliseconds, but can be altered by a unit test.
- int64 get_imsi_retry_delay_milliseconds_;
+ int64_t get_imsi_retry_delay_milliseconds_;
// Properties.
std::deque<Stringmap> apn_try_list_;
diff --git a/cellular_capability_gsm_unittest.cc b/cellular_capability_gsm_unittest.cc
index a8e336f..9cf7fe9 100644
--- a/cellular_capability_gsm_unittest.cc
+++ b/cellular_capability_gsm_unittest.cc
@@ -227,11 +227,11 @@
capability_->network_proxy_.reset(network_proxy_.release());
}
- void SetAccessTechnology(uint32 technology) {
+ void SetAccessTechnology(uint32_t technology) {
capability_->access_technology_ = technology;
}
- void SetRegistrationState(uint32 state) {
+ void SetRegistrationState(uint32_t state) {
capability_->registration_state_ = state;
}
diff --git a/cellular_capability_universal.cc b/cellular_capability_universal.cc
index 2055c09..52cb1f1 100644
--- a/cellular_capability_universal.cc
+++ b/cellular_capability_universal.cc
@@ -47,11 +47,11 @@
const char CellularCapabilityUniversal::kConnectAllowRoaming[] =
"allow-roaming";
const char CellularCapabilityUniversal::kConnectRMProtocol[] = "rm-protocol";
-const int64
+const int64_t
CellularCapabilityUniversal::kActivationRegistrationTimeoutMilliseconds =
20000;
-const int64 CellularCapabilityUniversal::kEnterPinTimeoutMilliseconds = 20000;
-const int64
+const int64_t CellularCapabilityUniversal::kEnterPinTimeoutMilliseconds = 20000;
+const int64_t
CellularCapabilityUniversal::kRegistrationDroppedUpdateTimeoutMilliseconds =
15000;
const char CellularCapabilityUniversal::kRootPath[] = "/";
@@ -77,7 +77,7 @@
const char kVzwIdentifier[] = "c83d6597-dc91-4d48-a3a7-d86b80123751";
const size_t kVzwMdnLength = 10;
-string AccessTechnologyToString(uint32 access_technologies) {
+string AccessTechnologyToString(uint32_t access_technologies) {
if (access_technologies & MM_MODEM_ACCESS_TECHNOLOGY_LTE)
return kNetworkTechnologyLte;
if (access_technologies & (MM_MODEM_ACCESS_TECHNOLOGY_EVDO0 |
@@ -104,7 +104,7 @@
return "";
}
-string AccessTechnologyToTechnologyFamily(uint32 access_technologies) {
+string AccessTechnologyToTechnologyFamily(uint32_t access_technologies) {
if (access_technologies & (MM_MODEM_ACCESS_TECHNOLOGY_LTE |
MM_MODEM_ACCESS_TECHNOLOGY_HSPA_PLUS |
MM_MODEM_ACCESS_TECHNOLOGY_HSPA |
@@ -1092,7 +1092,7 @@
*/
Stringmap parsed;
- uint32 status;
+ uint32_t status;
if (DBusProperties::GetUint32(result, kStatusProperty, &status)) {
// numerical values are taken from 3GPP TS 27.007 Section 7.3.
static const char * const kStatusString[] = {
@@ -1104,7 +1104,7 @@
parsed[kStatusProperty] = kStatusString[status];
}
- uint32 tech; // MMModemAccessTechnology
+ uint32_t tech; // MMModemAccessTechnology
if (DBusProperties::GetUint32(result, kOperatorAccessTechnologyProperty,
&tech)) {
parsed[kTechnologyProperty] = AccessTechnologyToString(tech);
@@ -1201,7 +1201,7 @@
// is Unknown), we simply update the state, and rely on the Manager to
// enable the device when it is registered with the Manager. On subsequent
// changes to State, we need to explicitly enable the device ourselves.
- int32 istate;
+ int32_t istate;
if (DBusProperties::GetInt32(properties, MM_MODEM_PROPERTY_STATE, &istate)) {
Cellular::ModemState state = static_cast<Cellular::ModemState>(istate);
OnModemStateChanged(state);
@@ -1214,11 +1214,11 @@
DBusPropertiesMap::const_iterator it =
properties.find(MM_MODEM_PROPERTY_SUPPORTEDCAPABILITIES);
if (it != properties.end()) {
- const vector<uint32> &supported_capabilities = it->second;
+ const vector<uint32_t> &supported_capabilities = it->second;
OnSupportedCapabilitesChanged(supported_capabilities);
}
- uint32 uint_value;
+ uint32_t uint_value;
if (DBusProperties::GetUint32(properties,
MM_MODEM_PROPERTY_CURRENTCAPABILITIES,
&uint_value))
@@ -1249,7 +1249,7 @@
// not needed: MM_MODEM_PROPERTY_EQUIPMENTIDENTIFIER
// Unlock required and SimLock
- uint32 unlock_required; // This is really of type MMModemLock
+ uint32_t unlock_required; // This is really of type MMModemLock
bool lock_status_changed = false;
if (DBusProperties::GetUint32(properties,
MM_MODEM_PROPERTY_UNLOCKREQUIRED,
@@ -1290,7 +1290,8 @@
it = properties.find(MM_MODEM_PROPERTY_SUPPORTEDMODES);
if (it != properties.end()) {
- const vector<DBus::Struct<uint32, uint32>> &mm_supported_modes = it->second;
+ const vector<DBus::Struct<uint32_t, uint32_t>> &mm_supported_modes =
+ it->second;
vector<ModemModes> supported_modes;
for (const auto &modes : mm_supported_modes) {
supported_modes.push_back(
@@ -1301,7 +1302,7 @@
it = properties.find(MM_MODEM_PROPERTY_CURRENTMODES);
if (it != properties.end()) {
- const DBus::Struct<uint32, uint32> ¤t_modes = it->second;
+ const DBus::Struct<uint32_t, uint32_t> ¤t_modes = it->second;
OnCurrentModesChanged(ModemModes(
current_modes._1, static_cast<MMModemMode>(current_modes._2)));
}
@@ -1341,7 +1342,7 @@
return false;
}
-void CellularCapabilityUniversal::OnNetworkModeSignal(uint32 /*mode*/) {
+void CellularCapabilityUniversal::OnNetworkModeSignal(uint32_t /*mode*/) {
// TODO(petkov): Implement this.
NOTIMPLEMENTED();
}
@@ -1392,12 +1393,12 @@
}
void CellularCapabilityUniversal::OnSupportedCapabilitesChanged(
- const vector<uint32> &supported_capabilities) {
+ const vector<uint32_t> &supported_capabilities) {
supported_capabilities_ = supported_capabilities;
}
void CellularCapabilityUniversal::OnModemCurrentCapabilitiesChanged(
- uint32 current_capabilities) {
+ uint32_t current_capabilities) {
current_capabilities_ = current_capabilities;
// Only allow network scan when the modem's current capabilities support
@@ -1443,7 +1444,7 @@
}
void CellularCapabilityUniversal::OnAccessTechnologiesChanged(
- uint32 access_technologies) {
+ uint32_t access_technologies) {
if (access_technologies_ != access_technologies) {
const string old_type_string(GetTypeString());
access_technologies_ = access_technologies;
@@ -1532,7 +1533,7 @@
const DBusPropertiesMap &properties,
const vector<string> &/* invalidated_properties */) {
SLOG(Cellular, 3) << __func__;
- uint32 uint_value;
+ uint32_t uint_value;
string imei;
if (DBusProperties::GetString(properties,
MM_MODEM_MODEM3GPP_PROPERTY_IMEI,
@@ -1566,7 +1567,7 @@
On3GPPSubscriptionStateChanged(
static_cast<MMModem3gppSubscriptionState>(uint_value));
- uint32 subscription_state;
+ uint32_t subscription_state;
CellularServiceRefPtr service = cellular()->service();
if (service.get() &&
DBusProperties::GetUint32(properties,
@@ -1578,7 +1579,7 @@
subscription_state);
}
- uint32 locks = 0;
+ uint32_t locks = 0;
if (DBusProperties::GetUint32(
properties, MM_MODEM_MODEM3GPP_PROPERTY_ENABLEDFACILITYLOCKS,
&locks))
@@ -1691,7 +1692,7 @@
}
void CellularCapabilityUniversal::OnModemStateChangedSignal(
- int32 old_state, int32 new_state, uint32 reason) {
+ int32_t old_state, int32_t new_state, uint32_t reason) {
Cellular::ModemState old_modem_state =
static_cast<Cellular::ModemState>(old_state);
Cellular::ModemState new_modem_state =
@@ -1702,11 +1703,11 @@
<< reason << ")";
}
-void CellularCapabilityUniversal::OnSignalQualityChanged(uint32 quality) {
+void CellularCapabilityUniversal::OnSignalQualityChanged(uint32_t quality) {
cellular()->HandleNewSignalQuality(quality);
}
-void CellularCapabilityUniversal::OnFacilityLocksChanged(uint32 locks) {
+void CellularCapabilityUniversal::OnFacilityLocksChanged(uint32_t locks) {
bool sim_enabled = !!(locks & MM_MODEM_3GPP_FACILITY_SIM);
if (sim_lock_status_.enabled != sim_enabled) {
sim_lock_status_.enabled = sim_enabled;
diff --git a/cellular_capability_universal.h b/cellular_capability_universal.h
index a20d30a..0ae2ac1 100644
--- a/cellular_capability_universal.h
+++ b/cellular_capability_universal.h
@@ -139,11 +139,11 @@
: allowed_modes(MM_MODEM_MODE_NONE),
preferred_mode(MM_MODEM_MODE_NONE) {}
- ModemModes(uint32 allowed, MMModemMode preferred)
+ ModemModes(uint32_t allowed, MMModemMode preferred)
: allowed_modes(allowed),
preferred_mode(preferred) {}
- uint32 allowed_modes; // Bits based on MMModemMode.
+ uint32_t allowed_modes; // Bits based on MMModemMode.
MMModemMode preferred_mode; // A single MMModemMode bit.
};
@@ -162,9 +162,9 @@
// Plugin strings via modemmanager.
static const char kAltairLTEMMPlugin[];
- static const int64 kActivationRegistrationTimeoutMilliseconds;
- static const int64 kEnterPinTimeoutMilliseconds;
- static const int64 kRegistrationDroppedUpdateTimeoutMilliseconds;
+ static const int64_t kActivationRegistrationTimeoutMilliseconds;
+ static const int64_t kEnterPinTimeoutMilliseconds;
+ static const int64_t kRegistrationDroppedUpdateTimeoutMilliseconds;
static const int kSetPowerStateTimeoutMilliseconds;
@@ -251,7 +251,7 @@
bool enabled;
MMModemLock lock_type;
- uint32 retries_left;
+ uint32_t retries_left;
};
// SubscriptionState represents the provisioned state of SIM. It is used
@@ -303,25 +303,25 @@
bool RetriableConnectError(const Error &error) const;
// Signal callbacks
- void OnNetworkModeSignal(uint32 mode);
- void OnModemStateChangedSignal(int32 old_state,
- int32 new_state,
- uint32 reason);
+ void OnNetworkModeSignal(uint32_t mode);
+ void OnModemStateChangedSignal(int32_t old_state,
+ int32_t new_state,
+ uint32_t reason);
// Property Change notification handlers
void OnModemPropertiesChanged(
const DBusPropertiesMap &properties,
const std::vector<std::string> &invalidated_properties);
- void OnSignalQualityChanged(uint32 quality);
+ void OnSignalQualityChanged(uint32_t quality);
void OnSupportedCapabilitesChanged(
- const std::vector<uint32> &supported_capabilities);
- void OnModemCurrentCapabilitiesChanged(uint32 current_capabilities);
+ const std::vector<uint32_t> &supported_capabilities);
+ void OnModemCurrentCapabilitiesChanged(uint32_t current_capabilities);
void OnMdnChanged(const std::string &mdn);
void OnModemRevisionChanged(const std::string &revision);
void OnModemStateChanged(Cellular::ModemState state);
- void OnAccessTechnologiesChanged(uint32 access_technologies);
+ void OnAccessTechnologiesChanged(uint32_t access_technologies);
void OnSupportedModesChanged(const std::vector<ModemModes> &supported_modes);
void OnCurrentModesChanged(const ModemModes ¤t_modes);
void OnBearersChanged(const RpcIdentifiers &bearers);
@@ -344,7 +344,7 @@
std::string updated_operator_code,
std::string updated_operator_name);
void On3GPPSubscriptionStateChanged(MMModem3gppSubscriptionState state);
- void OnFacilityLocksChanged(uint32 locks);
+ void OnFacilityLocksChanged(uint32_t locks);
// SIM property change handlers
// TODO(armansito): Put these methods in a 3GPP-only subclass.
@@ -409,9 +409,9 @@
MMModem3gppRegistrationState registration_state_;
// Bits based on MMModemCapabilities
- std::vector<uint32> supported_capabilities_; // Technologies supported
- uint32 current_capabilities_; // Technologies supported without a reload
- uint32 access_technologies_; // Bits based on MMModemAccessTechnology
+ std::vector<uint32_t> supported_capabilities_; // Technologies supported
+ uint32_t current_capabilities_; // Technologies supported without a reload
+ uint32_t access_technologies_; // Bits based on MMModemAccessTechnology
std::vector<ModemModes> supported_modes_;
ModemModes current_modes_;
@@ -434,13 +434,13 @@
base::Closure deferred_enable_modem_callback_;
base::CancelableClosure activation_wait_for_registration_callback_;
- int64 activation_registration_timeout_milliseconds_;
+ int64_t activation_registration_timeout_milliseconds_;
// Sometimes flaky cellular network causes the 3GPP registration state to
// rapidly change from registered --> searching and back. Delay such updates
// a little to smooth over temporary registration loss.
base::CancelableClosure registration_dropped_update_callback_;
- int64 registration_dropped_update_timeout_milliseconds_;
+ int64_t registration_dropped_update_timeout_milliseconds_;
DISALLOW_COPY_AND_ASSIGN(CellularCapabilityUniversal);
};
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_;
}
diff --git a/cellular_capability_universal_cdma.h b/cellular_capability_universal_cdma.h
index e2973d4..dea4e31 100644
--- a/cellular_capability_universal_cdma.h
+++ b/cellular_capability_universal_cdma.h
@@ -99,17 +99,17 @@
// CDMA activation handlers
void ActivateAutomatic();
- void OnActivationStateChangedSignal(uint32 activation_state,
- uint32 activation_error,
+ void OnActivationStateChangedSignal(uint32_t activation_state,
+ uint32_t activation_error,
const DBusPropertiesMap &status_changes);
void OnActivateReply(const ResultCallback &callback,
const Error &error);
- void HandleNewActivationStatus(uint32 error);
+ void HandleNewActivationStatus(uint32_t error);
void UpdateServiceActivationStateProperty();
- static std::string GetActivationStateString(uint32 state);
- static std::string GetActivationErrorString(uint32 error);
+ static std::string GetActivationStateString(uint32_t state);
+ static std::string GetActivationErrorString(uint32_t error);
scoped_ptr<mm1::ModemModemCdmaProxyInterface> modem_cdma_proxy_;
// TODO(armansito): Should probably call this |weak_ptr_factory_| after
diff --git a/cellular_capability_universal_unittest.cc b/cellular_capability_universal_unittest.cc
index 906700f..ee405dd 100644
--- a/cellular_capability_universal_unittest.cc
+++ b/cellular_capability_universal_unittest.cc
@@ -224,7 +224,7 @@
capability_->ReleaseProxies();
}
- void SetRegistrationDroppedUpdateTimeout(int64 timeout_milliseconds) {
+ void SetRegistrationDroppedUpdateTimeout(int64_t timeout_milliseconds) {
capability_->registration_dropped_update_timeout_milliseconds_ =
timeout_milliseconds;
}
@@ -244,7 +244,7 @@
static const char kImei[];
static const char kInactiveBearerPathPrefix[];
static const char kSimPath[];
- static const uint32 kAccessTechnologies;
+ static const uint32_t kAccessTechnologies;
static const char kTestMobileProviderDBPath[];
class TestProxyFactory : public ProxyFactory {
@@ -379,7 +379,7 @@
const char CellularCapabilityUniversalTest::kInactiveBearerPathPrefix[] =
"/bearer/inactive";
const char CellularCapabilityUniversalTest::kSimPath[] = "/foo/sim";
-const uint32 CellularCapabilityUniversalTest::kAccessTechnologies =
+const uint32_t CellularCapabilityUniversalTest::kAccessTechnologies =
MM_MODEM_ACCESS_TECHNOLOGY_LTE |
MM_MODEM_ACCESS_TECHNOLOGY_HSPA_PLUS;
const char CellularCapabilityUniversalTest::kTestMobileProviderDBPath[] =
@@ -2072,7 +2072,7 @@
TEST_F(CellularCapabilityUniversalMainTest, OnLockRetriesChanged) {
CellularCapabilityUniversal::LockRetryData data;
- const uint32 kDefaultRetries = 999;
+ const uint32_t kDefaultRetries = 999;
capability_->OnLockRetriesChanged(data);
EXPECT_EQ(kDefaultRetries, capability_->sim_lock_status_.retries_left);
@@ -2139,7 +2139,7 @@
// Unlock retries changed and the SIM got locked.
variant.clear();
writer = variant.writer();
- writer << static_cast<uint32>(MM_MODEM_LOCK_SIM_PIN);
+ writer << static_cast<uint32_t>(MM_MODEM_LOCK_SIM_PIN);
changed[MM_MODEM_PROPERTY_UNLOCKREQUIRED] = variant;
capability_->OnModemPropertiesChanged(changed, invalidated);
EXPECT_EQ(MM_MODEM_LOCK_SIM_PIN, capability_->sim_lock_status_.lock_type);
diff --git a/cellular_unittest.cc b/cellular_unittest.cc
index 9a1b0bc..b20da44 100644
--- a/cellular_unittest.cc
+++ b/cellular_unittest.cc
@@ -2078,7 +2078,7 @@
IPAddress::Family kAddressFamily = IPAddress::kFamilyIPv4;
const char kAddress[] = "10.0.0.1";
const char kGateway[] = "10.0.0.254";
- const int32 kSubnetPrefix = 16;
+ const int32_t kSubnetPrefix = 16;
const char *const kDNS[] = {"10.0.0.2", "8.8.4.4", "8.8.8.8"};
scoped_ptr<IPConfig::Properties> ipconfig_properties(
diff --git a/connection.cc b/connection.cc
index 00ec748..9125422 100644
--- a/connection.cc
+++ b/connection.cc
@@ -26,9 +26,9 @@
namespace shill {
// static
-const uint32 Connection::kDefaultMetric = 1;
+const uint32_t Connection::kDefaultMetric = 1;
// static
-const uint32 Connection::kNonDefaultMetricBase = 10;
+const uint32_t Connection::kNonDefaultMetricBase = 10;
Connection::Binder::Binder(const string &name,
const Closure &disconnect_callback)
@@ -413,7 +413,7 @@
return true;
}
-uint32 Connection::GetMetric(bool is_default) {
+uint32_t Connection::GetMetric(bool is_default) {
// If this is not the default route, assign a metric based on the interface
// index. This way all non-default routes (even to the same gateway IP) end
// up with unique metrics so they do not collide.
diff --git a/connection.h b/connection.h
index 6ed93ac..b484e94 100644
--- a/connection.h
+++ b/connection.h
@@ -134,8 +134,8 @@
FRIEND_TEST(ConnectionTest, UpdateDNSServers);
FRIEND_TEST(VPNServiceTest, OnConnectionDisconnected);
- static const uint32 kDefaultMetric;
- static const uint32 kNonDefaultMetricBase;
+ static const uint32_t kDefaultMetric;
+ static const uint32_t kNonDefaultMetricBase;
// Work around misconfigured servers which provide a gateway address that
// is unreachable with the provided netmask.
@@ -143,7 +143,7 @@
IPAddress *peer,
IPAddress *gateway,
const IPAddress &trusted_ip);
- uint32 GetMetric(bool is_default);
+ uint32_t GetMetric(bool is_default);
bool PinHostRoute(const IPAddress &trusted_ip, const IPAddress &gateway);
void OnRouteQueryResponse(int interface_index,
diff --git a/connection_health_checker.cc b/connection_health_checker.cc
index 3d78097..f1dc483 100644
--- a/connection_health_checker.cc
+++ b/connection_health_checker.cc
@@ -59,7 +59,7 @@
// static
const int ConnectionHealthChecker::kTCPStateUpdateWaitMilliseconds = 5000;
// static
-const uint16 ConnectionHealthChecker::kRemotePort = 80;
+const uint16_t ConnectionHealthChecker::kRemotePort = 80;
ConnectionHealthChecker::ConnectionHealthChecker(
ConnectionRefPtr connection,
@@ -377,7 +377,7 @@
CHECK_EQ(sizeof(struct sockaddr_in), addrlen);
struct sockaddr_in *addr_in = reinterpret_cast<sockaddr_in *>(&addr);
- uint16 local_port = ntohs(addr_in->sin_port);
+ uint16_t local_port = ntohs(addr_in->sin_port);
char ipstr[INET_ADDRSTRLEN];
const char *res = inet_ntop(AF_INET, &addr_in->sin_addr,
ipstr, sizeof(ipstr));
diff --git a/connection_health_checker.h b/connection_health_checker.h
index 0ca2685..38a7229 100644
--- a/connection_health_checker.h
+++ b/connection_health_checker.h
@@ -119,7 +119,7 @@
void set_num_successful_sends(int16_t val) {
num_successful_sends_ = val;
}
- void set_old_transmit_queue_value(uint64 val) {
+ void set_old_transmit_queue_value(uint64_t val) {
old_transmit_queue_value_ = val;
}
Result health_check_result() const { return health_check_result_; }
@@ -154,7 +154,7 @@
static const int kMinSuccessfulSendAttempts;
// Number of DNS queries to be spawned when a new remote URL is added.
static const int kNumDNSQueries;
- static const uint16 kRemotePort;
+ static const uint16_t kRemotePort;
// Time to wait before testing successful data transfer / disconnect after
// request is made on the device.
static const int kTCPStateUpdateWaitMilliseconds;
@@ -205,7 +205,7 @@
// Store the old value of the transmit queue to verify that data sent on the
// connection is actually transmitted.
- uint64 old_transmit_queue_value_;
+ uint64_t old_transmit_queue_value_;
// Callback to post a delayed check on whether data sent on the TCP connection
// was successfully transmitted.
base::CancelableClosure verify_sent_data_callback_;
diff --git a/connection_health_checker_unittest.cc b/connection_health_checker_unittest.cc
index 84c650d..6b9d0cf 100644
--- a/connection_health_checker_unittest.cc
+++ b/connection_health_checker_unittest.cc
@@ -214,7 +214,7 @@
}
SocketInfo CreateSocketInfoProxy(SocketInfo::ConnectionState state,
SocketInfo::TimerState timer_state,
- uint64 transmit_queue_value) {
+ uint64_t transmit_queue_value) {
return SocketInfo(
state,
StringToIPv4Address(kProxyIPAddressLocal),
diff --git a/connection_info.cc b/connection_info.cc
index b0e86c8..4e5eda8 100644
--- a/connection_info.cc
+++ b/connection_info.cc
@@ -23,16 +23,16 @@
}
ConnectionInfo::ConnectionInfo(int protocol,
- int64 time_to_expire_seconds,
+ int64_t time_to_expire_seconds,
bool is_unreplied,
IPAddress original_source_ip_address,
- uint16 original_source_port,
+ uint16_t original_source_port,
IPAddress original_destination_ip_address,
- uint16 original_destination_port,
+ uint16_t original_destination_port,
IPAddress reply_source_ip_address,
- uint16 reply_source_port,
+ uint16_t reply_source_port,
IPAddress reply_destination_ip_address,
- uint16 reply_destination_port)
+ uint16_t reply_destination_port)
: protocol_(protocol),
time_to_expire_seconds_(time_to_expire_seconds),
is_unreplied_(is_unreplied),
diff --git a/connection_info.h b/connection_info.h
index 3375da6..3bc32f7 100644
--- a/connection_info.h
+++ b/connection_info.h
@@ -15,16 +15,16 @@
public:
ConnectionInfo();
ConnectionInfo(int protocol,
- int64 time_to_expire_seconds,
+ int64_t time_to_expire_seconds,
bool is_unreplied,
IPAddress original_source_ip_address,
- uint16 original_source_port,
+ uint16_t original_source_port,
IPAddress original_destination_ip_address,
- uint16 original_destination_port,
+ uint16_t original_destination_port,
IPAddress reply_source_ip_address,
- uint16 reply_source_port,
+ uint16_t reply_source_port,
IPAddress reply_destination_ip_address,
- uint16 reply_destination_port);
+ uint16_t reply_destination_port);
ConnectionInfo(const ConnectionInfo &info);
~ConnectionInfo();
@@ -33,8 +33,8 @@
int protocol() const { return protocol_; }
void set_protocol(int protocol) { protocol_ = protocol; }
- int64 time_to_expire_seconds() const { return time_to_expire_seconds_; }
- void set_time_to_expire_seconds(int64 time_to_expire_seconds) {
+ int64_t time_to_expire_seconds() const { return time_to_expire_seconds_; }
+ void set_time_to_expire_seconds(int64_t time_to_expire_seconds) {
time_to_expire_seconds_ = time_to_expire_seconds;
}
@@ -49,8 +49,8 @@
original_source_ip_address_ = original_source_ip_address;
}
- uint16 original_source_port() const { return original_source_port_; }
- void set_original_source_port(uint16 original_source_port) {
+ uint16_t original_source_port() const { return original_source_port_; }
+ void set_original_source_port(uint16_t original_source_port) {
original_source_port_ = original_source_port;
}
@@ -62,10 +62,10 @@
original_destination_ip_address_ = original_destination_ip_address;
}
- uint16 original_destination_port() const {
+ uint16_t original_destination_port() const {
return original_destination_port_;
}
- void set_original_destination_port(uint16 original_destination_port) {
+ void set_original_destination_port(uint16_t original_destination_port) {
original_destination_port_ = original_destination_port;
}
@@ -77,8 +77,8 @@
reply_source_ip_address_ = reply_source_ip_address;
}
- uint16 reply_source_port() const { return reply_source_port_; }
- void set_reply_source_port(uint16 reply_source_port) {
+ uint16_t reply_source_port() const { return reply_source_port_; }
+ void set_reply_source_port(uint16_t reply_source_port) {
reply_source_port_ = reply_source_port;
}
@@ -90,25 +90,25 @@
reply_destination_ip_address_ = reply_destination_ip_address;
}
- uint16 reply_destination_port() const { return reply_destination_port_; }
- void set_reply_destination_port(uint16 reply_destination_port) {
+ uint16_t reply_destination_port() const { return reply_destination_port_; }
+ void set_reply_destination_port(uint16_t reply_destination_port) {
reply_destination_port_ = reply_destination_port;
}
private:
int protocol_;
- int64 time_to_expire_seconds_;
+ int64_t time_to_expire_seconds_;
bool is_unreplied_;
IPAddress original_source_ip_address_;
- uint16 original_source_port_;
+ uint16_t original_source_port_;
IPAddress original_destination_ip_address_;
- uint16 original_destination_port_;
+ uint16_t original_destination_port_;
IPAddress reply_source_ip_address_;
- uint16 reply_source_port_;
+ uint16_t reply_source_port_;
IPAddress reply_destination_ip_address_;
- uint16 reply_destination_port_;
+ uint16_t reply_destination_port_;
// No DISALLOW_COPY_AND_ASSIGN(ConnectionInfo) as ConnectionInfo needs to be
// kept in STL containers.
diff --git a/connection_info_reader.cc b/connection_info_reader.cc
index 00872ab..e79b704 100644
--- a/connection_info_reader.cc
+++ b/connection_info_reader.cc
@@ -77,7 +77,7 @@
}
info->set_protocol(protocol);
- int64 time_to_expire_seconds = 0;
+ int64_t time_to_expire_seconds = 0;
if (!ParseTimeToExpireSeconds(tokens[++index], &time_to_expire_seconds)) {
return false;
}
@@ -87,7 +87,7 @@
++index;
IPAddress ip_address(IPAddress::kFamilyUnknown);
- uint16 port = 0;
+ uint16_t port = 0;
bool is_source = false;
if (!ParseIPAddress(tokens[++index], &ip_address, &is_source) || !is_source) {
@@ -145,7 +145,7 @@
}
bool ConnectionInfoReader::ParseTimeToExpireSeconds(
- const string &input, int64 *time_to_expire_seconds) {
+ const string &input, int64_t *time_to_expire_seconds) {
if (!base::StringToInt64(input, time_to_expire_seconds) ||
*time_to_expire_seconds < 0) {
return false;
@@ -183,7 +183,7 @@
}
bool ConnectionInfoReader::ParsePort(
- const string &input, uint16 *port, bool *is_source) {
+ const string &input, uint16_t *port, bool *is_source) {
int result = 0;
string port_string;
@@ -198,7 +198,7 @@
}
if (!base::StringToInt(port_string, &result) ||
- result < 0 || result > std::numeric_limits<uint16>::max()) {
+ result < 0 || result > std::numeric_limits<uint16_t>::max()) {
return false;
}
diff --git a/connection_info_reader.h b/connection_info_reader.h
index 5cb75bc..08fa67b 100644
--- a/connection_info_reader.h
+++ b/connection_info_reader.h
@@ -42,11 +42,11 @@
bool ParseConnectionInfo(const std::string &input, ConnectionInfo *info);
bool ParseProtocol(const std::string &input, int *protocol);
bool ParseTimeToExpireSeconds(const std::string &input,
- int64 *time_to_expire_seconds);
+ int64_t *time_to_expire_seconds);
bool ParseIsUnreplied(const std::string &input, bool *is_unreplied);
bool ParseIPAddress(const std::string &input,
IPAddress *ip_address, bool *is_source);
- bool ParsePort(const std::string &input, uint16 *port, bool *is_source);
+ bool ParsePort(const std::string &input, uint16_t *port, bool *is_source);
DISALLOW_COPY_AND_ASSIGN(ConnectionInfoReader);
};
diff --git a/connection_info_reader_unittest.cc b/connection_info_reader_unittest.cc
index 92d90c4..eed9621 100644
--- a/connection_info_reader_unittest.cc
+++ b/connection_info_reader_unittest.cc
@@ -179,7 +179,7 @@
}
TEST_F(ConnectionInfoReaderTest, ParseTimeToExpireSeconds) {
- int64 time_to_expire = 0;
+ int64_t time_to_expire = 0;
EXPECT_FALSE(reader_.ParseTimeToExpireSeconds("", &time_to_expire));
EXPECT_FALSE(reader_.ParseTimeToExpireSeconds("a", &time_to_expire));
@@ -211,7 +211,7 @@
}
TEST_F(ConnectionInfoReaderTest, ParsePort) {
- uint16 port = 0;
+ uint16_t port = 0;
bool is_source = false;
EXPECT_FALSE(reader_.ParsePort("", &port, &is_source));
diff --git a/connection_info_unittest.cc b/connection_info_unittest.cc
index da949cd..fed0e7f 100644
--- a/connection_info_unittest.cc
+++ b/connection_info_unittest.cc
@@ -16,10 +16,10 @@
const unsigned char kIPAddress2[] = { 192, 168, 1, 2 };
const unsigned char kIPAddress3[] = { 192, 168, 1, 3 };
const unsigned char kIPAddress4[] = { 192, 168, 1, 4 };
-const uint16 kPort1 = 1000;
-const uint16 kPort2 = 2000;
-const uint16 kPort3 = 3000;
-const uint16 kPort4 = 4000;
+const uint16_t kPort1 = 1000;
+const uint16_t kPort2 = 2000;
+const uint16_t kPort3 = 3000;
+const uint16_t kPort4 = 4000;
} // namespace
diff --git a/connection_unittest.cc b/connection_unittest.cc
index f236264..c30d914 100644
--- a/connection_unittest.cc
+++ b/connection_unittest.cc
@@ -46,8 +46,8 @@
const char kBroadcastAddress0[] = "192.168.1.255";
const char kNameServer0[] = "8.8.8.8";
const char kNameServer1[] = "8.8.9.9";
-const int32 kPrefix0 = 24;
-const int32 kPrefix1 = 31;
+const int32_t kPrefix0 = 24;
+const int32_t kPrefix1 = 31;
const char kSearchDomain0[] = "chromium.org";
const char kSearchDomain1[] = "google.com";
} // namespace
@@ -121,11 +121,11 @@
return connection->has_broadcast_domain_;
}
- uint32 GetDefaultMetric() {
+ uint32_t GetDefaultMetric() {
return Connection::kDefaultMetric;
}
- uint32 GetNonDefaultMetricBase() {
+ uint32_t GetNonDefaultMetricBase() {
return Connection::kNonDefaultMetricBase;
}
diff --git a/dbus_adaptor.cc b/dbus_adaptor.cc
index 753052c..c22929c 100644
--- a/dbus_adaptor.cc
+++ b/dbus_adaptor.cc
@@ -68,7 +68,8 @@
} else if (DBusAdaptor::IsUint16(value.signature())) {
ret = store->SetUint16Property(name, value.reader().get_uint16(), &e);
} else if (DBusAdaptor::IsUint16s(value.signature())) {
- ret = store->SetUint16sProperty(name, value.operator vector<uint16>(), &e);
+ ret =
+ store->SetUint16sProperty(name, value.operator vector<uint16_t>(), &e);
} else if (DBusAdaptor::IsUint32(value.signature())) {
ret = store->SetUint32Property(name, value.reader().get_uint32(), &e);
} else if (DBusAdaptor::IsUint64(value.signature())) {
@@ -101,13 +102,13 @@
}
}
{
- ReadablePropertyConstIterator<int16> it = store.GetInt16PropertiesIter();
+ ReadablePropertyConstIterator<int16_t> it = store.GetInt16PropertiesIter();
for ( ; !it.AtEnd(); it.Advance()) {
(*out)[it.Key()] = Int16ToVariant(it.value());
}
}
{
- ReadablePropertyConstIterator<int32> it = store.GetInt32PropertiesIter();
+ ReadablePropertyConstIterator<int32_t> it = store.GetInt32PropertiesIter();
for ( ; !it.AtEnd(); it.Advance()) {
(*out)[it.Key()] = Int32ToVariant(it.value());
}
@@ -158,13 +159,14 @@
}
}
{
- ReadablePropertyConstIterator<uint8> it = store.GetUint8PropertiesIter();
+ ReadablePropertyConstIterator<uint8_t> it = store.GetUint8PropertiesIter();
for ( ; !it.AtEnd(); it.Advance()) {
(*out)[it.Key()] = ByteToVariant(it.value());
}
}
{
- ReadablePropertyConstIterator<uint16> it = store.GetUint16PropertiesIter();
+ ReadablePropertyConstIterator<uint16_t> it =
+ store.GetUint16PropertiesIter();
for ( ; !it.AtEnd(); it.Advance()) {
(*out)[it.Key()] = Uint16ToVariant(it.value());
}
@@ -177,13 +179,15 @@
}
}
{
- ReadablePropertyConstIterator<uint32> it = store.GetUint32PropertiesIter();
+ ReadablePropertyConstIterator<uint32_t> it =
+ store.GetUint32PropertiesIter();
for ( ; !it.AtEnd(); it.Advance()) {
(*out)[it.Key()] = Uint32ToVariant(it.value());
}
}
{
- ReadablePropertyConstIterator<uint64> it = store.GetUint64PropertiesIter();
+ ReadablePropertyConstIterator<uint64_t> it =
+ store.GetUint64PropertiesIter();
for ( ; !it.AtEnd(); it.Advance()) {
(*out)[it.Key()] = Uint64ToVariant(it.value());
}
@@ -221,13 +225,13 @@
string key = key_value_pair.first;
DBus::type<string> string_type;
DBus::type<bool> bool_type;
- DBus::type<int32> int32_type;
+ DBus::type<int32_t> int32_type;
if (key_value_pair.second.signature() == bool_type.sig()) {
SLOG(DBus, 5) << "Got bool property " << key;
out->SetBool(key, key_value_pair.second.reader().get_bool());
} else if (key_value_pair.second.signature() == int32_type.sig()) {
- SLOG(DBus, 5) << "Got int32 property " << key;
+ SLOG(DBus, 5) << "Got int32_t property " << key;
out->SetInt(key, key_value_pair.second.reader().get_int32());
} else if (key_value_pair.second.signature() == string_type.sig()) {
SLOG(DBus, 5) << "Got string property " << key;
@@ -278,21 +282,21 @@
}
// static
-::DBus::Variant DBusAdaptor::ByteToVariant(uint8 value) {
+::DBus::Variant DBusAdaptor::ByteToVariant(uint8_t value) {
::DBus::Variant v;
v.writer().append_byte(value);
return v;
}
// static
-::DBus::Variant DBusAdaptor::Int16ToVariant(int16 value) {
+::DBus::Variant DBusAdaptor::Int16ToVariant(int16_t value) {
::DBus::Variant v;
v.writer().append_int16(value);
return v;
}
// static
-::DBus::Variant DBusAdaptor::Int32ToVariant(int32 value) {
+::DBus::Variant DBusAdaptor::Int32ToVariant(int32_t value) {
::DBus::Variant v;
v.writer().append_int32(value);
return v;
@@ -360,7 +364,7 @@
}
// static
-::DBus::Variant DBusAdaptor::Uint16ToVariant(uint16 value) {
+::DBus::Variant DBusAdaptor::Uint16ToVariant(uint16_t value) {
::DBus::Variant v;
v.writer().append_uint16(value);
return v;
@@ -375,14 +379,14 @@
}
// static
-::DBus::Variant DBusAdaptor::Uint32ToVariant(uint32 value) {
+::DBus::Variant DBusAdaptor::Uint32ToVariant(uint32_t value) {
::DBus::Variant v;
v.writer().append_uint32(value);
return v;
}
// static
-::DBus::Variant DBusAdaptor::Uint64ToVariant(uint64 value) {
+::DBus::Variant DBusAdaptor::Uint64ToVariant(uint64_t value) {
::DBus::Variant v;
v.writer().append_uint64(value);
return v;
@@ -395,7 +399,7 @@
// static
bool DBusAdaptor::IsByte(::DBus::Signature signature) {
- return signature == ::DBus::type<uint8>::sig();
+ return signature == ::DBus::type<uint8_t>::sig();
}
// static
@@ -405,12 +409,12 @@
// static
bool DBusAdaptor::IsInt16(::DBus::Signature signature) {
- return signature == ::DBus::type<int16>::sig();
+ return signature == ::DBus::type<int16_t>::sig();
}
// static
bool DBusAdaptor::IsInt32(::DBus::Signature signature) {
- return signature == ::DBus::type<int32>::sig();
+ return signature == ::DBus::type<int32_t>::sig();
}
// static
@@ -445,7 +449,7 @@
// static
bool DBusAdaptor::IsUint16(::DBus::Signature signature) {
- return signature == ::DBus::type<uint16>::sig();
+ return signature == ::DBus::type<uint16_t>::sig();
}
// static
@@ -455,12 +459,12 @@
// static
bool DBusAdaptor::IsUint32(::DBus::Signature signature) {
- return signature == ::DBus::type<uint32>::sig();
+ return signature == ::DBus::type<uint32_t>::sig();
}
// static
bool DBusAdaptor::IsUint64(::DBus::Signature signature) {
- return signature == ::DBus::type<uint64>::sig();
+ return signature == ::DBus::type<uint64_t>::sig();
}
// static
diff --git a/dbus_adaptor.h b/dbus_adaptor.h
index e29feb0..78c15df 100644
--- a/dbus_adaptor.h
+++ b/dbus_adaptor.h
@@ -65,9 +65,9 @@
static ::DBus::Variant BoolToVariant(bool value);
static ::DBus::Variant ByteArraysToVariant(const ByteArrays &value);
- static ::DBus::Variant ByteToVariant(uint8 value);
- static ::DBus::Variant Int16ToVariant(int16 value);
- static ::DBus::Variant Int32ToVariant(int32 value);
+ static ::DBus::Variant ByteToVariant(uint8_t value);
+ static ::DBus::Variant Int16ToVariant(int16_t value);
+ static ::DBus::Variant Int32ToVariant(int32_t value);
static ::DBus::Variant KeyValueStoreToVariant(const KeyValueStore &value);
static ::DBus::Variant PathToVariant(const ::DBus::Path &value);
static ::DBus::Variant PathsToVariant(
@@ -76,10 +76,10 @@
static ::DBus::Variant StringmapToVariant(const Stringmap &value);
static ::DBus::Variant StringmapsToVariant(const Stringmaps &value);
static ::DBus::Variant StringsToVariant(const Strings &value);
- static ::DBus::Variant Uint16ToVariant(uint16 value);
+ static ::DBus::Variant Uint16ToVariant(uint16_t value);
static ::DBus::Variant Uint16sToVariant(const Uint16s &value);
- static ::DBus::Variant Uint32ToVariant(uint32 value);
- static ::DBus::Variant Uint64ToVariant(uint64 value);
+ static ::DBus::Variant Uint32ToVariant(uint32_t value);
+ static ::DBus::Variant Uint64ToVariant(uint64_t value);
static bool IsBool(::DBus::Signature signature);
static bool IsByte(::DBus::Signature signature);
diff --git a/dbus_adaptor_unittest.cc b/dbus_adaptor_unittest.cc
index 76500ec..ea7ac3e 100644
--- a/dbus_adaptor_unittest.cc
+++ b/dbus_adaptor_unittest.cc
@@ -85,14 +85,14 @@
protected:
bool ex_bool_;
- uint8 ex_byte_;
+ uint8_t ex_byte_;
ByteArrays ex_bytearrays_;
- uint16 ex_uint16_;
- vector<uint16> ex_uint16s_;
- uint32 ex_uint32_;
- uint64 ex_uint64_;
- int16 ex_int16_;
- int32 ex_int32_;
+ uint16_t ex_uint16_;
+ vector<uint16_t> ex_uint16s_;
+ uint32_t ex_uint32_;
+ uint64_t ex_uint64_;
+ int16_t ex_int16_;
+ int32_t ex_int32_;
::DBus::Path ex_path_;
vector< ::DBus::Path> ex_paths_;
string ex_string_;
@@ -159,7 +159,7 @@
ex_stringmaps_,
ContainerEq(stringmaps_v_.operator vector<map<string, string> >()));
EXPECT_THAT(ex_uint16s_,
- ContainerEq(uint16s_v_.operator vector<uint16>()));
+ ContainerEq(uint16s_v_.operator vector<uint16_t>()));
}
TEST_F(DBusAdaptorTest, Signatures) {
@@ -313,7 +313,7 @@
const bool kBool = true;
const char kBoolKey[] = "bool_arg";
args[kBoolKey].writer().append_bool(kBool);
- const int32 kInt32 = 123;
+ const int32_t kInt32 = 123;
const char kInt32Key[] = "int32_arg";
args[kInt32Key].writer().append_int32(kInt32);
const char kString[] = "string";
diff --git a/dbus_properties.cc b/dbus_properties.cc
index ab68654..f7406d7 100644
--- a/dbus_properties.cc
+++ b/dbus_properties.cc
@@ -66,22 +66,22 @@
// static
bool DBusProperties::GetInt16(const DBusPropertiesMap &properties,
const string &key,
- int16 *value) {
- return GetValue<int16>(properties, key, value);
+ int16_t *value) {
+ return GetValue<int16_t>(properties, key, value);
}
// static
bool DBusProperties::GetInt32(const DBusPropertiesMap &properties,
const string &key,
- int32 *value) {
- return GetValue<int32>(properties, key, value);
+ int32_t *value) {
+ return GetValue<int32_t>(properties, key, value);
}
// static
bool DBusProperties::GetInt64(const DBusPropertiesMap &properties,
const string &key,
- int64 *value) {
- return GetValue<int64>(properties, key, value);
+ int64_t *value) {
+ return GetValue<int64_t>(properties, key, value);
}
// static
@@ -115,29 +115,29 @@
// static
bool DBusProperties::GetUint8(const DBusPropertiesMap &properties,
const string &key,
- uint8 *value) {
- return GetValue<uint8>(properties, key, value);
+ uint8_t *value) {
+ return GetValue<uint8_t>(properties, key, value);
}
// static
bool DBusProperties::GetUint16(const DBusPropertiesMap &properties,
const string &key,
- uint16 *value) {
- return GetValue<uint16>(properties, key, value);
+ uint16_t *value) {
+ return GetValue<uint16_t>(properties, key, value);
}
// static
bool DBusProperties::GetUint32(const DBusPropertiesMap &properties,
const string &key,
- uint32 *value) {
- return GetValue<uint32>(properties, key, value);
+ uint32_t *value) {
+ return GetValue<uint32_t>(properties, key, value);
}
// static
bool DBusProperties::GetUint64(const DBusPropertiesMap &properties,
const string &key,
- uint64 *value) {
- return GetValue<uint64>(properties, key, value);
+ uint64_t *value) {
+ return GetValue<uint64_t>(properties, key, value);
}
// static
diff --git a/dbus_properties.h b/dbus_properties.h
index 952af2d..1572294 100644
--- a/dbus_properties.h
+++ b/dbus_properties.h
@@ -18,7 +18,7 @@
namespace shill {
typedef std::map<std::string, DBus::Variant> DBusPropertiesMap;
-typedef std::map<uint32, DBus::Variant> DBusEnumValueMap;
+typedef std::map<uint32_t, DBus::Variant> DBusEnumValueMap;
class DBusProperties {
public:
@@ -36,15 +36,15 @@
static bool GetInt16(const DBusPropertiesMap &properties,
const std::string &key,
- int16 *value);
+ int16_t *value);
static bool GetInt32(const DBusPropertiesMap &properties,
const std::string &key,
- int32 *value);
+ int32_t *value);
static bool GetInt64(const DBusPropertiesMap &properties,
const std::string &key,
- int64 *value);
+ int64_t *value);
static bool GetObjectPath(const DBusPropertiesMap &properties,
const std::string &key,
@@ -64,19 +64,19 @@
static bool GetUint8(const DBusPropertiesMap &properties,
const std::string &key,
- uint8 *value);
+ uint8_t *value);
static bool GetUint16(const DBusPropertiesMap &properties,
const std::string &key,
- uint16 *value);
+ uint16_t *value);
static bool GetUint32(const DBusPropertiesMap &properties,
const std::string &key,
- uint32 *value);
+ uint32_t *value);
static bool GetUint64(const DBusPropertiesMap &properties,
const std::string &key,
- uint64 *value);
+ uint64_t *value);
static bool GetRpcIdentifiers(const DBusPropertiesMap &properties,
const std::string &key,
diff --git a/dbus_properties_unittest.cc b/dbus_properties_unittest.cc
index 9159e9a..9dbb8da 100644
--- a/dbus_properties_unittest.cc
+++ b/dbus_properties_unittest.cc
@@ -43,9 +43,9 @@
static const char kBoolKey[] = "BoolKey";
const bool kBoolValue = true;
static const char kInt32Key[] = "Int32Key";
- const int32 kInt32Value = 123;
+ const int32_t kInt32Value = 123;
static const char kUint32Key[] = "Uint32Key";
- const uint32 kUint32Value = 654;
+ const uint32_t kUint32Value = 654;
KeyValueStore store;
store.SetString(kStringKey, kStringValue);
store.SetStringmap(kStringmapKey, kStringmapValue);
@@ -70,10 +70,10 @@
bool bool_value = !kBoolValue;
EXPECT_TRUE(DBusProperties::GetBool(props, kBoolKey, &bool_value));
EXPECT_EQ(kBoolValue, bool_value);
- int32 int32_value = ~kInt32Value;
+ int32_t int32_value = ~kInt32Value;
EXPECT_TRUE(DBusProperties::GetInt32(props, kInt32Key, &int32_value));
EXPECT_EQ(kInt32Value, int32_value);
- uint32 uint32_value = ~kUint32Value;
+ uint32_t uint32_value = ~kUint32Value;
EXPECT_TRUE(DBusProperties::GetUint32(props, kUint32Key, &uint32_value));
EXPECT_EQ(kUint32Value, uint32_value);
}
@@ -108,31 +108,31 @@
static ValueT GetNewValue() { return numeric_limits<ValueT>::max(); }
};
-struct Int16TestTraits : public IntTestTraits<Int16TestTraits, int16> {
+struct Int16TestTraits : public IntTestTraits<Int16TestTraits, int16_t> {
static constexpr GetterType kMethodUnderTest = &DBusProperties::GetInt16;
};
-struct Int32TestTraits : public IntTestTraits<Int32TestTraits, int32> {
+struct Int32TestTraits : public IntTestTraits<Int32TestTraits, int32_t> {
static constexpr GetterType kMethodUnderTest = &DBusProperties::GetInt32;
};
-struct Int64TestTraits : public IntTestTraits<Int64TestTraits, int64> {
+struct Int64TestTraits : public IntTestTraits<Int64TestTraits, int64_t> {
static constexpr GetterType kMethodUnderTest = &DBusProperties::GetInt64;
};
-struct Uint8TestTraits : public IntTestTraits<Uint8TestTraits, uint8> {
+struct Uint8TestTraits : public IntTestTraits<Uint8TestTraits, uint8_t> {
static constexpr GetterType kMethodUnderTest = &DBusProperties::GetUint8;
};
-struct Uint16TestTraits : public IntTestTraits<Uint16TestTraits, uint16> {
+struct Uint16TestTraits : public IntTestTraits<Uint16TestTraits, uint16_t> {
static constexpr GetterType kMethodUnderTest = &DBusProperties::GetUint16;
};
-struct Uint32TestTraits : public IntTestTraits<Uint32TestTraits, uint32> {
+struct Uint32TestTraits : public IntTestTraits<Uint32TestTraits, uint32_t> {
static constexpr GetterType kMethodUnderTest = &DBusProperties::GetUint32;
};
-struct Uint64TestTraits : public IntTestTraits<Uint64TestTraits, uint64> {
+struct Uint64TestTraits : public IntTestTraits<Uint64TestTraits, uint64_t> {
static constexpr GetterType kMethodUnderTest = &DBusProperties::GetUint64;
};
@@ -196,13 +196,13 @@
static DBusPropertiesMap GetNewValue() {
DBusPropertiesMap value;
value["BoolKey"].writer().append_bool(true);
- value["Int16Key"].writer().append_int16(numeric_limits<int16>::max());
- value["Int32Key"].writer().append_int32(numeric_limits<int32>::max());
- value["Int64Key"].writer().append_int64(numeric_limits<int64>::max());
- value["Uint8Key"].writer().append_byte(numeric_limits<uint8>::max());
- value["Uint16Key"].writer().append_uint16(numeric_limits<uint16>::max());
- value["Uint32Key"].writer().append_uint32(numeric_limits<uint32>::max());
- value["Uint64Key"].writer().append_uint64(numeric_limits<uint64>::max());
+ value["Int16Key"].writer().append_int16(numeric_limits<int16_t>::max());
+ value["Int32Key"].writer().append_int32(numeric_limits<int32_t>::max());
+ value["Int64Key"].writer().append_int64(numeric_limits<int64_t>::max());
+ value["Uint8Key"].writer().append_byte(numeric_limits<uint8_t>::max());
+ value["Uint16Key"].writer().append_uint16(numeric_limits<uint16_t>::max());
+ value["Uint32Key"].writer().append_uint32(numeric_limits<uint32_t>::max());
+ value["Uint64Key"].writer().append_uint64(numeric_limits<uint64_t>::max());
value["DoubleKey"].writer().append_double(3.14);
value["StringKey"].writer().append_string("new");
return value;
@@ -237,20 +237,20 @@
if (expected_signature == DBus::type<bool>::sig()) {
CheckDBusVariantEqual<bool>(key, expected_value, actual_value);
- } else if (expected_signature == DBus::type<int16>::sig()) {
- CheckDBusVariantEqual<int16>(key, expected_value, actual_value);
- } else if (expected_signature == DBus::type<int32>::sig()) {
- CheckDBusVariantEqual<int32>(key, expected_value, actual_value);
- } else if (expected_signature == DBus::type<int64>::sig()) {
- CheckDBusVariantEqual<int64>(key, expected_value, actual_value);
- } else if (expected_signature == DBus::type<uint8>::sig()) {
- CheckDBusVariantEqual<uint8>(key, expected_value, actual_value);
- } else if (expected_signature == DBus::type<uint16>::sig()) {
- CheckDBusVariantEqual<uint16>(key, expected_value, actual_value);
- } else if (expected_signature == DBus::type<uint32>::sig()) {
- CheckDBusVariantEqual<uint32>(key, expected_value, actual_value);
- } else if (expected_signature == DBus::type<uint64>::sig()) {
- CheckDBusVariantEqual<uint64>(key, expected_value, actual_value);
+ } else if (expected_signature == DBus::type<int16_t>::sig()) {
+ CheckDBusVariantEqual<int16_t>(key, expected_value, actual_value);
+ } else if (expected_signature == DBus::type<int32_t>::sig()) {
+ CheckDBusVariantEqual<int32_t>(key, expected_value, actual_value);
+ } else if (expected_signature == DBus::type<int64_t>::sig()) {
+ CheckDBusVariantEqual<int64_t>(key, expected_value, actual_value);
+ } else if (expected_signature == DBus::type<uint8_t>::sig()) {
+ CheckDBusVariantEqual<uint8_t>(key, expected_value, actual_value);
+ } else if (expected_signature == DBus::type<uint16_t>::sig()) {
+ CheckDBusVariantEqual<uint16_t>(key, expected_value, actual_value);
+ } else if (expected_signature == DBus::type<uint32_t>::sig()) {
+ CheckDBusVariantEqual<uint32_t>(key, expected_value, actual_value);
+ } else if (expected_signature == DBus::type<uint64_t>::sig()) {
+ CheckDBusVariantEqual<uint64_t>(key, expected_value, actual_value);
} else if (expected_signature == DBus::type<double>::sig()) {
CheckDBusVariantEqual<double>(key, expected_value, actual_value);
} else if (expected_signature == DBus::type<string>::sig()) {
diff --git a/device.cc b/device.cc
index 1c1f0a8..66b568f 100644
--- a/device.cc
+++ b/device.cc
@@ -335,7 +335,7 @@
}
enabled_persistent_ = true;
storage->GetBool(id, kStoragePowered, &enabled_persistent_);
- uint64 rx_byte_count = 0, tx_byte_count = 0;
+ uint64_t rx_byte_count = 0, tx_byte_count = 0;
manager_->device_info()->GetByteCounts(
interface_index_, &rx_byte_count, &tx_byte_count);
@@ -344,7 +344,7 @@
// whatever additional bytes we receive since time-of-load. We
// accomplish this by the subtractions below, which can validly
// roll over "negative" in the subtractions below and in Get*ByteCount.
- uint64 profile_byte_count;
+ uint64_t profile_byte_count;
if (storage->GetUint64(id, kStorageReceiveByteCount, &profile_byte_count)) {
receive_byte_offset_ = rx_byte_count - profile_byte_count;
}
@@ -500,11 +500,11 @@
void Device::HelpRegisterConstDerivedUint64(
const string &name,
- uint64(Device::*get)(Error *)) {
+ uint64_t(Device::*get)(Error *)) {
store_.RegisterDerivedUint64(
name,
Uint64Accessor(
- new CustomAccessor<Device, uint64>(this, get, NULL)));
+ new CustomAccessor<Device, uint64_t>(this, get, NULL)));
}
void Device::ConfigureStaticIPTask() {
@@ -1133,7 +1133,7 @@
return adaptor_->GetRpcConnectionIdentifier();
}
-uint64 Device::GetLinkMonitorResponseTime(Error *error) {
+uint64_t Device::GetLinkMonitorResponseTime(Error *error) {
if (!link_monitor_.get()) {
// It is not strictly an error that the link monitor does not
// exist, but returning an error here allows the GetProperties
@@ -1144,25 +1144,25 @@
return link_monitor_->GetResponseTimeMilliseconds();
}
-uint64 Device::GetReceiveByteCount() {
- uint64 rx_byte_count = 0, tx_byte_count = 0;
+uint64_t Device::GetReceiveByteCount() {
+ uint64_t rx_byte_count = 0, tx_byte_count = 0;
manager_->device_info()->GetByteCounts(
interface_index_, &rx_byte_count, &tx_byte_count);
return rx_byte_count - receive_byte_offset_;
}
-uint64 Device::GetTransmitByteCount() {
- uint64 rx_byte_count = 0, tx_byte_count = 0;
+uint64_t Device::GetTransmitByteCount() {
+ uint64_t rx_byte_count = 0, tx_byte_count = 0;
manager_->device_info()->GetByteCounts(
interface_index_, &rx_byte_count, &tx_byte_count);
return tx_byte_count - transmit_byte_offset_;
}
-uint64 Device::GetReceiveByteCountProperty(Error */*error*/) {
+uint64_t Device::GetReceiveByteCountProperty(Error */*error*/) {
return GetReceiveByteCount();
}
-uint64 Device::GetTransmitByteCountProperty(Error */*error*/) {
+uint64_t Device::GetTransmitByteCountProperty(Error */*error*/) {
return GetTransmitByteCount();
}
diff --git a/device.h b/device.h
index 07eb5cb..f09da2a 100644
--- a/device.h
+++ b/device.h
@@ -174,8 +174,8 @@
virtual bool RestartPortalDetection();
// Get receive and transmit byte counters.
- virtual uint64 GetReceiveByteCount();
- virtual uint64 GetTransmitByteCount();
+ virtual uint64_t GetReceiveByteCount();
+ virtual uint64_t GetTransmitByteCount();
// Perform a TDLS |operation| on the underlying device, with respect
// to a given |peer|. The string returned is empty for any operation
@@ -489,7 +489,7 @@
void HelpRegisterConstDerivedUint64(
const std::string &name,
- uint64(Device::*get)(Error *));
+ uint64_t(Device::*get)(Error *));
// Property getters reserved for subclasses
ControlInterface *control_interface() const { return control_interface_; }
@@ -550,13 +550,13 @@
std::string GetRpcConnectionIdentifier();
// Get the LinkMonitor's average response time.
- uint64 GetLinkMonitorResponseTime(Error *error);
+ uint64_t GetLinkMonitorResponseTime(Error *error);
// Get receive and transmit byte counters. These methods simply wrap
// GetReceiveByteCount and GetTransmitByteCount in order to be used by
// HelpRegisterConstDerivedUint64.
- uint64 GetReceiveByteCountProperty(Error *error);
- uint64 GetTransmitByteCountProperty(Error *error);
+ uint64_t GetReceiveByteCountProperty(Error *error);
+ uint64_t GetTransmitByteCountProperty(Error *error);
// Emit a property change signal for the "IPConfigs" property of this device.
void UpdateIPConfigsProperty();
@@ -634,8 +634,8 @@
// Keep track of the offset between the interface-reported byte counters
// and our persisted value.
- uint64 receive_byte_offset_;
- uint64 transmit_byte_offset_;
+ uint64_t receive_byte_offset_;
+ uint64_t transmit_byte_offset_;
// Maintain a reference to the connected / connecting service
ServiceRefPtr selected_service_;
diff --git a/device_dbus_adaptor.cc b/device_dbus_adaptor.cc
index 6a9863e..deffa76 100644
--- a/device_dbus_adaptor.cc
+++ b/device_dbus_adaptor.cc
@@ -46,13 +46,14 @@
PropertyChanged(name, DBusAdaptor::BoolToVariant(value));
}
-void DeviceDBusAdaptor::EmitUintChanged(const std::string& name, uint32 value) {
+void DeviceDBusAdaptor::EmitUintChanged(const std::string &name,
+ uint32_t value) {
SLOG(DBus, 2) << __func__ << ": Device " << device_->UniqueName()
<< " " << name;
PropertyChanged(name, DBusAdaptor::Uint32ToVariant(value));
}
-void DeviceDBusAdaptor::EmitUint16Changed(const string &name, uint16 value) {
+void DeviceDBusAdaptor::EmitUint16Changed(const string &name, uint16_t value) {
SLOG(DBus, 2) << __func__ << ": Device " << device_->UniqueName()
<< " " << name;
PropertyChanged(name, DBusAdaptor::Uint16ToVariant(value));
diff --git a/device_dbus_adaptor.h b/device_dbus_adaptor.h
index 1f76e2a..646a76e 100644
--- a/device_dbus_adaptor.h
+++ b/device_dbus_adaptor.h
@@ -36,8 +36,8 @@
virtual const std::string &GetRpcIdentifier();
virtual const std::string &GetRpcConnectionIdentifier();
virtual void EmitBoolChanged(const std::string& name, bool value);
- virtual void EmitUintChanged(const std::string& name, uint32 value);
- virtual void EmitUint16Changed(const std::string& name, uint16 value);
+ virtual void EmitUintChanged(const std::string& name, uint32_t value);
+ virtual void EmitUint16Changed(const std::string& name, uint16_t value);
virtual void EmitIntChanged(const std::string& name, int value);
virtual void EmitStringChanged(const std::string& name,
const std::string& value);
diff --git a/device_info.cc b/device_info.cc
index a9f53c5..62b79ed 100644
--- a/device_info.cc
+++ b/device_info.cc
@@ -784,7 +784,7 @@
bool DeviceInfo::GetIPv6DnsServerAddresses(int interface_index,
std::vector<IPAddress> *address_list,
- uint32 *life_time) {
+ uint32_t *life_time) {
const Info *info = GetInfo(interface_index);
if (!info || info->ipv6_dns_server_addresses.empty()) {
return false;
@@ -798,7 +798,7 @@
if (!time_->GetSecondsBoottime(&cur_time)) {
NOTREACHED();
}
- uint32 time_elapsed = static_cast<uint32>(
+ uint32_t time_elapsed = static_cast<uint32_t>(
cur_time - info->ipv6_dns_server_received_time_seconds);
if (time_elapsed >= info->ipv6_dns_server_lifetime_seconds) {
*life_time = 0;
@@ -838,8 +838,8 @@
}
bool DeviceInfo::GetByteCounts(int interface_index,
- uint64 *rx_bytes,
- uint64 *tx_bytes) const {
+ uint64_t *rx_bytes,
+ uint64_t *tx_bytes) const {
const Info *info = GetInfo(interface_index);
if (!info) {
return false;
diff --git a/device_info.h b/device_info.h
index 134e32d..5450d1f 100644
--- a/device_info.h
+++ b/device_info.h
@@ -96,7 +96,7 @@
virtual bool GetFlags(int interface_index, unsigned int *flags) const;
virtual bool GetByteCounts(int interface_index,
- uint64 *rx_bytes, uint64 *tx_bytes) const;
+ uint64_t *rx_bytes, uint64_t *tx_bytes) const;
virtual bool GetAddresses(int interface_index,
std::vector<AddressData> *addresses) const;
@@ -122,7 +122,7 @@
// forever.
virtual bool GetIPv6DnsServerAddresses(int interface_index,
std::vector<IPAddress> *address_list,
- uint32 *life_time_seconds);
+ uint32_t *life_time_seconds);
// Returns true if any of the addresses on |interface_index| are on the
// same network prefix as |address|.
@@ -162,11 +162,11 @@
ByteString mac_address;
std::vector<AddressData> ip_addresses;
std::vector<IPAddress> ipv6_dns_server_addresses;
- uint32 ipv6_dns_server_lifetime_seconds;
+ uint32_t ipv6_dns_server_lifetime_seconds;
time_t ipv6_dns_server_received_time_seconds;
unsigned int flags;
- uint64 rx_bytes;
- uint64 tx_bytes;
+ uint64_t rx_bytes;
+ uint64_t tx_bytes;
// This flag indicates that link information has not been retrieved yet;
// only the ip_addresses field is valid.
diff --git a/device_info_unittest.cc b/device_info_unittest.cc
index 246b3f7..43a3361 100644
--- a/device_info_unittest.cc
+++ b/device_info_unittest.cc
@@ -75,7 +75,7 @@
return NULL;
}
MOCK_METHOD2(PostDelayedTask, bool(const base::Closure &task,
- int64 delay_ms));
+ int64_t delay_ms));
};
class DeviceInfoTest : public Test {
@@ -159,7 +159,7 @@
unsigned char flags,
unsigned char scope);
RTNLMessage *BuildRdnssMessage(RTNLMessage::Mode mode,
- uint32 lifetime,
+ uint32_t lifetime,
const vector<IPAddress> &dns_servers);
void SendMessageToDeviceInfo(const RTNLMessage &message);
@@ -202,7 +202,7 @@
0,
kTestDeviceIndex,
IPAddress::kFamilyIPv4);
- message->SetAttribute(static_cast<uint16>(IFLA_IFNAME),
+ message->SetAttribute(static_cast<uint16_t>(IFLA_IFNAME),
ByteString(interface_name, true));
ByteString test_address(kTestMACAddress, sizeof(kTestMACAddress));
message->SetAttribute(IFLA_ADDRESS, test_address);
@@ -232,7 +232,7 @@
}
RTNLMessage *DeviceInfoTest::BuildRdnssMessage(RTNLMessage::Mode mode,
- uint32 lifetime, const vector<IPAddress> &dns_servers) {
+ uint32_t lifetime, const vector<IPAddress> &dns_servers) {
RTNLMessage *message = new RTNLMessage(
RTNLMessage::kTypeRdnss,
mode,
@@ -374,7 +374,7 @@
}
TEST_F(DeviceInfoTest, GetByteCounts) {
- uint64 rx_bytes, tx_bytes;
+ uint64_t rx_bytes, tx_bytes;
EXPECT_FALSE(device_info_.GetByteCounts(
kTestDeviceIndex, &rx_bytes, &tx_bytes));
@@ -1178,7 +1178,7 @@
"null0", "addr0", kTestDeviceIndex));
device_info_.time_ = &time_;
vector<IPAddress> dns_server_addresses_out;
- uint32 lifetime_out;
+ uint32_t lifetime_out;
// Device info entry does not exist.
EXPECT_FALSE(device_info_.GetIPv6DnsServerAddresses(
@@ -1200,7 +1200,7 @@
dns_server_addresses_in.push_back(ipv6_address2);
// Infinite lifetime
- const uint32 kInfiniteLifetime = 0xffffffff;
+ const uint32_t kInfiniteLifetime = 0xffffffff;
auto message(make_scoped_ptr(BuildRdnssMessage(
RTNLMessage::kModeAdd, kInfiniteLifetime, dns_server_addresses_in)));
EXPECT_CALL(time_, GetSecondsBoottime(_)).
@@ -1217,8 +1217,8 @@
EXPECT_EQ(kTestIPAddress2, dns_server_addresses_out.at(1).ToString());
// Lifetime of 120, retrieve DNS server addresses after 10 seconds.
- const uint32 kLifetime120 = 120;
- const uint32 kElapseTime10 = 10;
+ const uint32_t kLifetime120 = 120;
+ const uint32_t kElapseTime10 = 10;
auto message1(make_scoped_ptr(BuildRdnssMessage(
RTNLMessage::kModeAdd, kLifetime120, dns_server_addresses_in)));
EXPECT_CALL(time_, GetSecondsBoottime(_)).
diff --git a/device_unittest.cc b/device_unittest.cc
index 65df677..f1550e1 100644
--- a/device_unittest.cc
+++ b/device_unittest.cc
@@ -211,7 +211,7 @@
device_->StopLinkMonitor();
}
- uint64 GetLinkMonitorResponseTime(Error *error) {
+ uint64_t GetLinkMonitorResponseTime(Error *error) {
return device_->GetLinkMonitorResponseTime(error);
}
@@ -1482,23 +1482,23 @@
Invoke(this, &DeviceByteCountTest::GetStoredTransmitCount));
}
- bool ReturnByteCounts(int interface_index, uint64 *rx, uint64 *tx) {
+ bool ReturnByteCounts(int interface_index, uint64_t *rx, uint64_t *tx) {
*rx = rx_byte_count_;
*tx = tx_byte_count_;
return true;
}
bool ExpectByteCounts(DeviceRefPtr device,
- int64 expected_rx, int64 expected_tx) {
- int64 actual_rx = device->GetReceiveByteCount();
- int64 actual_tx = device->GetTransmitByteCount();
+ int64_t expected_rx, int64_t expected_tx) {
+ int64_t actual_rx = device->GetReceiveByteCount();
+ int64_t actual_tx = device->GetTransmitByteCount();
EXPECT_EQ(expected_rx, actual_rx);
EXPECT_EQ(expected_tx, actual_tx);
return expected_rx == actual_rx && expected_tx == actual_tx;
}
void ExpectSavedCounts(DeviceRefPtr device,
- int64 expected_rx, int64 expected_tx) {
+ int64_t expected_rx, int64_t expected_tx) {
EXPECT_CALL(storage_,
SetUint64(_, Device::kStorageReceiveByteCount, expected_rx))
.WillOnce(Return(true));
@@ -1510,7 +1510,7 @@
bool GetStoredReceiveCount(const string &group, const string &key,
- uint64 *value) {
+ uint64_t *value) {
if (!rx_stored_byte_count_) {
return false;
}
@@ -1519,7 +1519,7 @@
}
bool GetStoredTransmitCount(const string &group, const string &key,
- uint64 *value) {
+ uint64_t *value) {
if (!tx_stored_byte_count_) {
return false;
}
@@ -1530,10 +1530,10 @@
protected:
NiceMock<MockManager> manager_;
NiceMock<MockStore> storage_;
- uint64 rx_byte_count_;
- uint64 tx_byte_count_;
- uint64 rx_stored_byte_count_;
- uint64 tx_stored_byte_count_;
+ uint64_t rx_byte_count_;
+ uint64_t tx_byte_count_;
+ uint64_t rx_stored_byte_count_;
+ uint64_t tx_stored_byte_count_;
};
@@ -1554,8 +1554,8 @@
// Device should report any increase in the byte counts reported in the
// interface.
- const int64 delta_rx_count = 789;
- const int64 delta_tx_count = 12;
+ const int64_t delta_rx_count = 789;
+ const int64_t delta_tx_count = 12;
rx_byte_count_ += delta_rx_count;
tx_byte_count_ += delta_tx_count;
EXPECT_TRUE(ExpectByteCounts(device, delta_rx_count, delta_tx_count));
diff --git a/dhcp_config.cc b/dhcp_config.cc
index 51899a7..c6a3ff6 100644
--- a/dhcp_config.cc
+++ b/dhcp_config.cc
@@ -586,7 +586,7 @@
}
}
-void DHCPConfig::StartExpirationTimeout(uint32 lease_duration_seconds) {
+void DHCPConfig::StartExpirationTimeout(uint32_t lease_duration_seconds) {
CHECK(lease_acquisition_timeout_callback_.IsCancelled());
SLOG(DHCP, 2) << __func__ << ": " << device_name()
<< ": " << "Lease timeout is " << lease_duration_seconds
diff --git a/dhcp_config.h b/dhcp_config.h
index 6eefb62..1931352 100644
--- a/dhcp_config.h
+++ b/dhcp_config.h
@@ -204,7 +204,7 @@
// Initialize a callback that will invoke ProcessExpirationTimeout if we
// do not renew a lease in a |lease_duration_seconds|.
- void StartExpirationTimeout(uint32 lease_duration_seconds);
+ void StartExpirationTimeout(uint32_t lease_duration_seconds);
// Cancel callback created by StartExpirationTimeout. One-liner included
// for symmetry.
void StopExpirationTimeout();
diff --git a/dhcp_config_unittest.cc b/dhcp_config_unittest.cc
index 63e4471..9202c07 100644
--- a/dhcp_config_unittest.cc
+++ b/dhcp_config_unittest.cc
@@ -435,7 +435,7 @@
conf[DHCPConfig::kConfigurationKeyIPAddress].writer().append_uint32(
++address_octet);
if (lease_time_given) {
- const uint32 kLeaseTime = 1;
+ const uint32_t kLeaseTime = 1;
conf[DHCPConfig::kConfigurationKeyLeaseTime].writer().append_uint32(
kLeaseTime);
config_->lease_expiration_callback_.Cancel();
@@ -482,7 +482,7 @@
DHCPConfig::Configuration conf;
conf[DHCPConfig::kConfigurationKeyIPAddress].writer().append_uint32(
0x01020304);
- const uint32 kLeaseTime = 1;
+ const uint32_t kLeaseTime = 1;
conf[DHCPConfig::kConfigurationKeyLeaseTime].writer().append_uint32(
kLeaseTime);
// Stop the DHCP config while it is calling the success callback. This
diff --git a/diagnostics_reporter.cc b/diagnostics_reporter.cc
index 9f4e73e..eb7fcc9 100644
--- a/diagnostics_reporter.cc
+++ b/diagnostics_reporter.cc
@@ -50,7 +50,7 @@
time_->GetTimeMonotonic(&now);
if (last_log_stash_ &&
last_log_stash_ + kLogStashThrottleSeconds >
- static_cast<uint64>(now.tv_sec)) {
+ static_cast<uint64_t>(now.tv_sec)) {
LOG(INFO) << "Diagnostics throttled.";
return;
}
diff --git a/diagnostics_reporter.h b/diagnostics_reporter.h
index 1d358bc..b6720f5 100644
--- a/diagnostics_reporter.h
+++ b/diagnostics_reporter.h
@@ -44,7 +44,7 @@
chromeos::Minijail *minijail_;
ProcessKiller *process_killer_;
Time *time_;
- uint64 last_log_stash_; // Monotonic time seconds.
+ uint64_t last_log_stash_; // Monotonic time seconds.
base::FilePath stashed_net_log_;
DISALLOW_COPY_AND_ASSIGN(DiagnosticsReporter);
diff --git a/diagnostics_reporter_unittest.cc b/diagnostics_reporter_unittest.cc
index 2b6ce61..ede0d27 100644
--- a/diagnostics_reporter_unittest.cc
+++ b/diagnostics_reporter_unittest.cc
@@ -52,9 +52,9 @@
return DiagnosticsReporter::GetInstance()->IsReportingEnabled();
}
- void SetLastLogStash(uint64 time) { reporter_.last_log_stash_ = time; }
- uint64 GetLastLogStash() { return reporter_.last_log_stash_; }
- uint64 GetLogStashThrottleSeconds() {
+ void SetLastLogStash(uint64_t time) { reporter_.last_log_stash_ = time; }
+ uint64_t GetLastLogStash() { return reporter_.last_log_stash_; }
+ uint64_t GetLogStashThrottleSeconds() {
return DiagnosticsReporter::kLogStashThrottleSeconds;
}
@@ -87,7 +87,7 @@
TEST_F(DiagnosticsReporterTest, OnConnectivityEvent) {
using timeval_seconds_t = decltype(timeval::tv_sec);
- const uint64 kInitStash = 0;
+ const uint64_t kInitStash = 0;
SetLastLogStash(kInitStash);
// Test that the initial call is not throttled.
auto kNow0 = static_cast<timeval_seconds_t>(kInitStash + 1);
diff --git a/eap_credentials.cc b/eap_credentials.cc
index d0c7abe..dd29479 100644
--- a/eap_credentials.cc
+++ b/eap_credentials.cc
@@ -124,7 +124,7 @@
WPASupplicant::kNetworkPropertyEngineId,
WPASupplicant::kEnginePKCS11));
// We can't use the propertyvals vector for this since this argument
- // is a uint32, not a string.
+ // is a uint32_t, not a string.
(*params)[WPASupplicant::kNetworkPropertyEngine].writer().
append_uint32(WPASupplicant::kDefaultEngine);
}
diff --git a/eap_listener_unittest.cc b/eap_listener_unittest.cc
index 0ec5771..8f480b4 100644
--- a/eap_listener_unittest.cc
+++ b/eap_listener_unittest.cc
@@ -56,7 +56,7 @@
protected:
static const int kInterfaceIndex;
static const int kSocketFD;
- static const uint8 kEapPacketPayload[];
+ static const uint8_t kEapPacketPayload[];
bool CreateSocket() { return listener_.CreateSocket(); }
int GetInterfaceIndex() { return listener_.interface_index_; }
@@ -80,7 +80,7 @@
// static
const int EapListenerTest::kInterfaceIndex = 123;
const int EapListenerTest::kSocketFD = 456;
-const uint8 EapListenerTest::kEapPacketPayload[] = {
+const uint8_t EapListenerTest::kEapPacketPayload[] = {
eap_protocol::kIeee8021xEapolVersion2,
eap_protocol::kIIeee8021xTypeEapPacket,
0x00, 0x00, // Payload length (should be 5, but unparsed by EapListener).
@@ -223,7 +223,7 @@
StartListener();
// We're partially initializing this field, just making sure at least one
// part of it is incorrect.
- uint8 bad_payload[sizeof(kEapPacketPayload)] = {
+ uint8_t bad_payload[sizeof(kEapPacketPayload)] = {
eap_protocol::kIeee8021xEapolVersion1 - 1
};
recvfrom_reply_data_ = ByteString(bad_payload, sizeof(bad_payload));
diff --git a/eap_protocol.h b/eap_protocol.h
index 619dbd2..6468a5d 100644
--- a/eap_protocol.h
+++ b/eap_protocol.h
@@ -13,9 +13,9 @@
namespace eap_protocol {
struct ALIGNAS(1) Ieee8021xHdr {
- uint8 version;
- uint8 type;
- uint16 length;
+ uint8_t version;
+ uint8_t type;
+ uint16_t length;
};
enum IeeeEapolVersion {
@@ -32,9 +32,9 @@
};
struct ALIGNAS(1) EapHeader {
- uint8 code;
- uint8 identifier;
- uint16 length; // including code and identifier; network byte order
+ uint8_t code;
+ uint8_t identifier;
+ uint16_t length; // including code and identifier; network byte order
};
enum EapCode {
diff --git a/ethernet.cc b/ethernet.cc
index 4c1d8a0..5c5d9e2 100644
--- a/ethernet.cc
+++ b/ethernet.cc
@@ -169,7 +169,7 @@
void Ethernet::Certification(const map<string, ::DBus::Variant> &properties) {
string subject;
- uint32 depth;
+ uint32_t depth;
if (WPASupplicant::ExtractRemoteCertification(properties, &subject, &depth)) {
dispatcher()->PostTask(Bind(&Ethernet::CertificationTask,
weak_ptr_factory_.GetWeakPtr(),
@@ -322,7 +322,7 @@
is_eap_authenticated_);
}
-void Ethernet::CertificationTask(const string &subject, uint32 depth) {
+void Ethernet::CertificationTask(const string &subject, uint32_t depth) {
if (!service_) {
LOG(ERROR) << "Ethernet " << link_name() << " " << __func__
<< " with no service.";
diff --git a/ethernet.h b/ethernet.h
index 8eaafbb..8191d67 100644
--- a/ethernet.h
+++ b/ethernet.h
@@ -91,7 +91,7 @@
void SetIsEapAuthenticated(bool is_eap_authenticated);
// Callback tasks run as a result of event delegate methods.
- void CertificationTask(const std::string &subject, uint32 depth);
+ void CertificationTask(const std::string &subject, uint32_t depth);
void EAPEventTask(const std::string &status, const std::string ¶meter);
void SupplicantStateChangedTask(const std::string &state);
diff --git a/ethernet_unittest.cc b/ethernet_unittest.cc
index e999ec1..547b897 100644
--- a/ethernet_unittest.cc
+++ b/ethernet_unittest.cc
@@ -160,7 +160,7 @@
EXPECT_EQ(kInterfacePath, GetSupplicantInterfacePath());
}
void TriggerOnEapDetected() { ethernet_->OnEapDetected(); }
- void TriggerCertification(const string &subject, uint32 depth) {
+ void TriggerCertification(const string &subject, uint32_t depth) {
ethernet_->CertificationTask(subject, depth);
}
void TriggerTryEapAuthentication() {
@@ -490,7 +490,7 @@
TEST_F(EthernetTest, Certification) {
const string kSubjectName("subject-name");
- const uint32 kDepth = 123;
+ const uint32_t kDepth = 123;
// Should not crash due to no service_.
TriggerCertification(kSubjectName, kDepth);
EXPECT_CALL(*mock_service_, AddEAPCertification(kSubjectName, kDepth));
diff --git a/event_dispatcher.cc b/event_dispatcher.cc
index f7b4076..4113d68 100644
--- a/event_dispatcher.cc
+++ b/event_dispatcher.cc
@@ -40,7 +40,7 @@
return message_loop_proxy_->PostTask(FROM_HERE, task);
}
-bool EventDispatcher::PostDelayedTask(const Closure &task, int64 delay_ms) {
+bool EventDispatcher::PostDelayedTask(const Closure &task, int64_t delay_ms) {
return message_loop_proxy_->PostDelayedTask(
FROM_HERE, task, base::TimeDelta::FromMilliseconds(delay_ms));
}
diff --git a/event_dispatcher.h b/event_dispatcher.h
index 39b3cc2..27023fe 100644
--- a/event_dispatcher.h
+++ b/event_dispatcher.h
@@ -36,7 +36,7 @@
// These are thin wrappers around calls of the same name in
// <base/message_loop_proxy.h>
virtual bool PostTask(const base::Closure &task);
- virtual bool PostDelayedTask(const base::Closure &task, int64 delay_ms);
+ virtual bool PostDelayedTask(const base::Closure &task, int64_t delay_ms);
virtual IOHandler *CreateInputHandler(
int fd,
diff --git a/generic_netlink_message.h b/generic_netlink_message.h
index a426c58..8daff4d 100644
--- a/generic_netlink_message.h
+++ b/generic_netlink_message.h
@@ -56,7 +56,7 @@
class GenericNetlinkMessage : public NetlinkMessage {
public:
- GenericNetlinkMessage(uint16_t my_message_type, uint8 command,
+ GenericNetlinkMessage(uint16_t my_message_type, uint8_t command,
const char *command_string)
: NetlinkMessage(my_message_type),
attributes_(new AttributeList),
@@ -66,7 +66,7 @@
virtual ByteString Encode(uint32_t sequence_number);
- uint8 command() const { return command_; }
+ uint8_t command() const { return command_; }
const char *command_string() const { return command_string_; }
AttributeListConstRefPtr const_attributes() const { return attributes_; }
AttributeListRefPtr attributes() { return attributes_; }
@@ -82,7 +82,7 @@
virtual bool InitAndStripHeader(ByteString *input);
AttributeListRefPtr attributes_;
- const uint8 command_;
+ const uint8_t command_;
const char *command_string_;
private:
@@ -94,7 +94,7 @@
class ControlNetlinkMessage : public GenericNetlinkMessage {
public:
static const uint16_t kMessageType;
- ControlNetlinkMessage(uint8 command, const char *command_string)
+ ControlNetlinkMessage(uint8_t command, const char *command_string)
: GenericNetlinkMessage(kMessageType, command, command_string) {}
static uint16_t GetMessageType() { return kMessageType; }
diff --git a/ipconfig.h b/ipconfig.h
index dbcbee6..c32910c 100644
--- a/ipconfig.h
+++ b/ipconfig.h
@@ -43,7 +43,7 @@
IPAddress::Family address_family;
std::string address;
- int32 subnet_prefix;
+ int32_t subnet_prefix;
std::string broadcast_address;
std::vector<std::string> dns_servers;
std::string domain_name;
@@ -56,14 +56,14 @@
// server.
std::string trusted_ip;
bool blackhole_ipv6;
- int32 mtu;
+ int32_t mtu;
std::vector<Route> routes;
// Vendor encapsulated option string gained from DHCP.
std::string vendor_encapsulated_options;
// Web Proxy Auto Discovery (WPAD) URL gained from DHCP.
std::string web_proxy_auto_discovery;
// Length of time the lease was granted.
- uint32 lease_duration_seconds;
+ uint32_t lease_duration_seconds;
};
enum Method {
diff --git a/ipconfig_dbus_adaptor.cc b/ipconfig_dbus_adaptor.cc
index 7162e60..cd76be1 100644
--- a/ipconfig_dbus_adaptor.cc
+++ b/ipconfig_dbus_adaptor.cc
@@ -45,7 +45,7 @@
}
void IPConfigDBusAdaptor::EmitUintChanged(const string &name,
- uint32 value) {
+ uint32_t value) {
SLOG(DBus, 2) << __func__ << ": " << name;
PropertyChanged(name, DBusAdaptor::Uint32ToVariant(value));
}
diff --git a/ipconfig_dbus_adaptor.h b/ipconfig_dbus_adaptor.h
index 0bf1ec7..7b7208c 100644
--- a/ipconfig_dbus_adaptor.h
+++ b/ipconfig_dbus_adaptor.h
@@ -38,7 +38,7 @@
// Implementation of IPConfigAdaptorInterface.
virtual const std::string &GetRpcIdentifier() { return path(); }
virtual void EmitBoolChanged(const std::string &name, bool value);
- virtual void EmitUintChanged(const std::string &name, uint32 value);
+ virtual void EmitUintChanged(const std::string &name, uint32_t value);
virtual void EmitIntChanged(const std::string &name, int value);
virtual void EmitStringChanged(const std::string &name,
const std::string &value);
diff --git a/key_file_store.cc b/key_file_store.cc
index d0eb5c7..0293156 100644
--- a/key_file_store.cc
+++ b/key_file_store.cc
@@ -44,7 +44,7 @@
}
bool KeyFileStore::IsNonEmpty() const {
- int64 file_size = 0;
+ int64_t file_size = 0;
return base::GetFileSize(path_, &file_size) && file_size != 0;
}
@@ -279,8 +279,8 @@
}
bool KeyFileStore::GetUint64(
- const string &group, const string &key, uint64 *value) const {
- // Read the value in as a string and then convert to uint64 because glib's
+ const string &group, const string &key, uint64_t *value) const {
+ // Read the value in as a string and then convert to uint64_t because glib's
// g_key_file_set_uint64 appears not to work correctly on 32-bit platforms
// in unit tests.
string data_string;
@@ -288,10 +288,10 @@
return false;
}
- uint64 data;
+ uint64_t data;
if (!base::StringToUint64(data_string, &data)) {
SLOG(Storage, 10) << "Failed to convert (" << group << ":" << key << "): "
- << "string to uint64 conversion failed";
+ << "string to uint64_t conversion failed";
return false;
}
@@ -303,7 +303,7 @@
}
bool KeyFileStore::SetUint64(
- const string &group, const string &key, uint64 value) {
+ const string &group, const string &key, uint64_t value) {
// Convert the value to a string first, then save the value because glib's
// g_key_file_get_uint64 appears not to work on 32-bit platforms in our
// unit tests.
diff --git a/key_file_store.h b/key_file_store.h
index 9c60069..9717559 100644
--- a/key_file_store.h
+++ b/key_file_store.h
@@ -82,10 +82,10 @@
int value) override;
virtual bool GetUint64(const std::string &group,
const std::string &key,
- uint64 *value) const override;
+ uint64_t *value) const override;
virtual bool SetUint64(const std::string &group,
const std::string &key,
- uint64 value) override;
+ uint64_t value) override;
virtual bool GetStringList(const std::string &group,
const std::string &key,
std::vector<std::string> *value) const override;
diff --git a/key_file_store_unittest.cc b/key_file_store_unittest.cc
index 957fe4b..2586ff0 100644
--- a/key_file_store_unittest.cc
+++ b/key_file_store_unittest.cc
@@ -447,7 +447,7 @@
static const char kGroup[] = "numbers";
static const char kKeyGood[] = "good";
static const char kKeyBad[] = "bad";
- const uint64 kValueGood = 0xFEDCBA9876543210LL;
+ const uint64_t kValueGood = 0xFEDCBA9876543210LL;
static const char kValueBad[] = "nan";
// Use base::Uint64ToString() instead of using something like "%llu"
// (not correct for native 64 bit architectures) or PRIu64 (does not
@@ -461,12 +461,12 @@
kKeyBad, kValueBad));
ASSERT_TRUE(store_.Open());
{
- uint64 value = 0;
+ uint64_t value = 0;
EXPECT_TRUE(store_.GetUint64(kGroup, kKeyGood, &value));
EXPECT_EQ(kValueGood, value);
}
{
- uint64 value;
+ uint64_t value;
EXPECT_FALSE(store_.GetUint64(kGroup, kKeyBad, &value));
EXPECT_FALSE(store_.GetUint64(kGroup, "invalid", &value));
EXPECT_FALSE(store_.GetUint64("invalid", kKeyGood, &value));
@@ -478,7 +478,7 @@
TEST_F(KeyFileStoreTest, SetUint64) {
static const char kGroup[] = "int-group";
static const char kKey[] = "test-int";
- const uint64 kValue = 0xFEDCBA9876543210LL;
+ const uint64_t kValue = 0xFEDCBA9876543210LL;
ASSERT_TRUE(store_.Open());
ASSERT_TRUE(store_.SetUint64(kGroup, kKey, kValue));
ASSERT_TRUE(store_.Close());
diff --git a/key_value_store.cc b/key_value_store.cc
index d5cbb7c..d670af3 100644
--- a/key_value_store.cc
+++ b/key_value_store.cc
@@ -92,7 +92,7 @@
return it->second;
}
-int32 KeyValueStore::GetInt(const string &name) const {
+int32_t KeyValueStore::GetInt(const string &name) const {
const auto it(int_properties_.find(name));
CHECK(it != int_properties_.end()) << "for int property " << name;
return it->second;
@@ -118,7 +118,7 @@
return it->second;
}
-uint32 KeyValueStore::GetUint(const string &name) const {
+uint32_t KeyValueStore::GetUint(const string &name) const {
const auto it(uint_properties_.find(name));
CHECK(it != uint_properties_.end()) << "for uint property " << name;
return it->second;
@@ -128,7 +128,7 @@
bool_properties_[name] = value;
}
-void KeyValueStore::SetInt(const string &name, int32 value) {
+void KeyValueStore::SetInt(const string &name, int32_t value) {
int_properties_[name] = value;
}
@@ -146,7 +146,7 @@
strings_properties_[name] = value;
}
-void KeyValueStore::SetUint(const string &name, uint32 value) {
+void KeyValueStore::SetUint(const string &name, uint32_t value) {
uint_properties_[name] = value;
}
diff --git a/key_value_store.h b/key_value_store.h
index a9b88a6..4f8775a 100644
--- a/key_value_store.h
+++ b/key_value_store.h
@@ -43,21 +43,21 @@
bool ContainsUint(const std::string &name) const;
bool GetBool(const std::string &name) const;
- int32 GetInt(const std::string &name) const;
+ int32_t GetInt(const std::string &name) const;
const std::string &GetString(const std::string &name) const;
const std::map<std::string, std::string> &GetStringmap(
const std::string &name) const;
const std::vector<std::string> &GetStrings(const std::string &name) const;
- uint32 GetUint(const std::string &name) const;
+ uint32_t GetUint(const std::string &name) const;
void SetBool(const std::string &name, bool value);
- void SetInt(const std::string &name, int32 value);
+ void SetInt(const std::string &name, int32_t value);
void SetString(const std::string &name, const std::string &value);
void SetStringmap(const std::string &name,
const std::map<std::string, std::string> &value);
void SetStrings(const std::string &name,
const std::vector<std::string> &value);
- void SetUint(const std::string &name, uint32 value);
+ void SetUint(const std::string &name, uint32_t value);
void RemoveString(const std::string &name);
void RemoveStringmap(const std::string &name);
@@ -74,7 +74,7 @@
const std::map<std::string, bool> &bool_properties() const {
return bool_properties_;
}
- const std::map<std::string, int32> &int_properties() const {
+ const std::map<std::string, int32_t> &int_properties() const {
return int_properties_;
}
const std::map<std::string, std::string> &string_properties() const {
@@ -89,18 +89,18 @@
std::vector<std::string>> &strings_properties() const {
return strings_properties_;
}
- const std::map<std::string, uint32> &uint_properties() const {
+ const std::map<std::string, uint32_t> &uint_properties() const {
return uint_properties_;
}
private:
std::map<std::string, bool> bool_properties_;
- std::map<std::string, int32> int_properties_;
+ std::map<std::string, int32_t> int_properties_;
std::map<std::string, std::string> string_properties_;
std::map<std::string,
std::map<std::string, std::string>> stringmap_properties_;
std::map<std::string, std::vector<std::string>> strings_properties_;
- std::map<std::string, uint32> uint_properties_;
+ std::map<std::string, uint32_t> uint_properties_;
};
} // namespace shill
diff --git a/key_value_store_unittest.cc b/key_value_store_unittest.cc
index 21c2ab9..ebac9d0 100644
--- a/key_value_store_unittest.cc
+++ b/key_value_store_unittest.cc
@@ -91,7 +91,7 @@
TEST_F(KeyValueStoreTest, Uint) {
const string kKey("foo");
- const uint32 kValue = 456;
+ const uint32_t kValue = 456;
EXPECT_FALSE(store_.ContainsUint(kKey));
store_.SetUint(kKey, kValue);
EXPECT_TRUE(store_.ContainsUint(kKey));
@@ -126,7 +126,7 @@
const vector<string> kStringsValue;
store_.SetStrings(kStringsKey, kStringsValue);
const string kUintKey("bun");
- const uint32 kUintValue = 456;
+ const uint32_t kUintValue = 456;
store_.SetUint(kUintKey, kUintValue);
EXPECT_TRUE(store_.ContainsBool(kBoolKey));
@@ -277,7 +277,7 @@
const vector<string> kStringsValue{ "string0", "string1" };
donor.SetStrings(kStringsKey, kStringsValue);
const string kUintKey("bun");
- const uint32 kUintValue = 456;
+ const uint32_t kUintValue = 456;
donor.SetUint(kUintKey, kUintValue);
EXPECT_TRUE(store_.IsEmpty());
diff --git a/link_monitor_unittest.cc b/link_monitor_unittest.cc
index 2c34c3a..4c2fa4a 100644
--- a/link_monitor_unittest.cc
+++ b/link_monitor_unittest.cc
@@ -42,9 +42,9 @@
namespace {
const char kLocalIPAddress[] = "10.0.1.1";
-const uint8 kLocalMACAddress[] = { 0, 1, 2, 3, 4, 5 };
+const uint8_t kLocalMACAddress[] = { 0, 1, 2, 3, 4, 5 };
const char kRemoteIPAddress[] = "10.0.1.2";
-const uint8 kRemoteMACAddress[] = { 6, 7, 8, 9, 10, 11 };
+const uint8_t kRemoteMACAddress[] = { 6, 7, 8, 9, 10, 11 };
} // namespace
@@ -803,10 +803,10 @@
}
TEST_F(LinkMonitorTest, HardwareAddressToString) {
- const uint8 address0[] = { 0, 1, 2, 3, 4, 5 };
+ const uint8_t address0[] = { 0, 1, 2, 3, 4, 5 };
EXPECT_EQ("00:01:02:03:04:05",
HardwareAddressToString(ByteString(address0, arraysize(address0))));
- const uint8 address1[] = { 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd };
+ const uint8_t address1[] = { 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd };
EXPECT_EQ("88:99:aa:bb:cc:dd",
HardwareAddressToString(ByteString(address1, arraysize(address1))));
}
diff --git a/manager.h b/manager.h
index b5aaf44..980f7c2 100644
--- a/manager.h
+++ b/manager.h
@@ -62,7 +62,7 @@
bool offline_mode;
std::string check_portal_list;
std::string country;
- int32 portal_check_interval_seconds;
+ int32_t portal_check_interval_seconds;
std::string portal_url;
std::string host_name;
// Whether to ARP for the default gateway in the DHCP client after
diff --git a/manager_dbus_adaptor.cc b/manager_dbus_adaptor.cc
index 96ca287..a8db870 100644
--- a/manager_dbus_adaptor.cc
+++ b/manager_dbus_adaptor.cc
@@ -47,7 +47,7 @@
}
void ManagerDBusAdaptor::EmitUintChanged(const string &name,
- uint32 value) {
+ uint32_t value) {
SLOG(DBus, 2) << __func__ << ": " << name;
PropertyChanged(name, DBusAdaptor::Uint32ToVariant(value));
}
diff --git a/manager_dbus_adaptor.h b/manager_dbus_adaptor.h
index d1871f5..55fdeaf 100644
--- a/manager_dbus_adaptor.h
+++ b/manager_dbus_adaptor.h
@@ -39,7 +39,7 @@
virtual const std::string &GetRpcIdentifier() { return path(); }
void UpdateRunning();
void EmitBoolChanged(const std::string &name, bool value);
- void EmitUintChanged(const std::string &name, uint32 value);
+ void EmitUintChanged(const std::string &name, uint32_t value);
void EmitIntChanged(const std::string &name, int value);
void EmitStringChanged(const std::string &name, const std::string &value);
void EmitStringsChanged(const std::string &name,
diff --git a/metrics.cc b/metrics.cc
index facd006..a46665d 100644
--- a/metrics.cc
+++ b/metrics.cc
@@ -161,20 +161,20 @@
const char Metrics::kMetricServiceFixupEntriesSuffix[] = "ServiceFixupEntries";
// static
-const uint16 Metrics::kWiFiBandwidth5MHz = 5;
-const uint16 Metrics::kWiFiBandwidth20MHz = 20;
-const uint16 Metrics::kWiFiFrequency2412 = 2412;
-const uint16 Metrics::kWiFiFrequency2472 = 2472;
-const uint16 Metrics::kWiFiFrequency2484 = 2484;
-const uint16 Metrics::kWiFiFrequency5170 = 5170;
-const uint16 Metrics::kWiFiFrequency5180 = 5180;
-const uint16 Metrics::kWiFiFrequency5230 = 5230;
-const uint16 Metrics::kWiFiFrequency5240 = 5240;
-const uint16 Metrics::kWiFiFrequency5320 = 5320;
-const uint16 Metrics::kWiFiFrequency5500 = 5500;
-const uint16 Metrics::kWiFiFrequency5700 = 5700;
-const uint16 Metrics::kWiFiFrequency5745 = 5745;
-const uint16 Metrics::kWiFiFrequency5825 = 5825;
+const uint16_t Metrics::kWiFiBandwidth5MHz = 5;
+const uint16_t Metrics::kWiFiBandwidth20MHz = 20;
+const uint16_t Metrics::kWiFiFrequency2412 = 2412;
+const uint16_t Metrics::kWiFiFrequency2472 = 2472;
+const uint16_t Metrics::kWiFiFrequency2484 = 2484;
+const uint16_t Metrics::kWiFiFrequency5170 = 5170;
+const uint16_t Metrics::kWiFiFrequency5180 = 5180;
+const uint16_t Metrics::kWiFiFrequency5230 = 5230;
+const uint16_t Metrics::kWiFiFrequency5240 = 5240;
+const uint16_t Metrics::kWiFiFrequency5320 = 5320;
+const uint16_t Metrics::kWiFiFrequency5500 = 5500;
+const uint16_t Metrics::kWiFiFrequency5700 = 5700;
+const uint16_t Metrics::kWiFiFrequency5745 = 5745;
+const uint16_t Metrics::kWiFiFrequency5825 = 5825;
// static
const char Metrics::kMetricPowerManagerKey[] = "metrics";
@@ -339,7 +339,7 @@
Metrics::~Metrics() {}
// static
-Metrics::WiFiChannel Metrics::WiFiFrequencyToChannel(uint16 frequency) {
+Metrics::WiFiChannel Metrics::WiFiFrequencyToChannel(uint16_t frequency) {
WiFiChannel channel = kWiFiChannelUndef;
if (kWiFiFrequency2412 <= frequency && frequency <= kWiFiFrequency2472) {
if (((frequency - kWiFiFrequency2412) % kWiFiBandwidth5MHz) == 0)
@@ -1020,7 +1020,7 @@
}
void Metrics::NotifyCellularDeviceDrop(const string &network_technology,
- uint16 signal_strength) {
+ uint16_t signal_strength) {
SLOG(Metrics, 2) << __func__ << ": " << network_technology
<< ", " << signal_strength;
CellularDropTechnology drop_technology = kCellularDropTechnologyUnknown;
diff --git a/metrics.h b/metrics.h
index 913786d..4eac003 100644
--- a/metrics.h
+++ b/metrics.h
@@ -551,7 +551,7 @@
virtual ~Metrics();
// Converts the WiFi frequency into the associated UMA channel enumerator.
- static WiFiChannel WiFiFrequencyToChannel(uint16 frequency);
+ static WiFiChannel WiFiFrequencyToChannel(uint16_t frequency);
// Converts a flimflam security string into its UMA security enumerator.
static WiFiSecurity WiFiSecurityStringToEnum(const std::string &security);
@@ -691,7 +691,7 @@
// Notifies this object that a cellular device has been dropped by the
// network.
void NotifyCellularDeviceDrop(const std::string &network_technology,
- uint16 signal_strength);
+ uint16_t signal_strength);
// Notifies this object about 3GPP registration drop events.
virtual void Notify3GPPRegistrationDelayedDropPosted();
@@ -802,20 +802,20 @@
typedef std::map<const int, std::shared_ptr<DeviceMetrics> >
DeviceMetricsLookupMap;
- static const uint16 kWiFiBandwidth5MHz;
- static const uint16 kWiFiBandwidth20MHz;
- static const uint16 kWiFiFrequency2412;
- static const uint16 kWiFiFrequency2472;
- static const uint16 kWiFiFrequency2484;
- static const uint16 kWiFiFrequency5170;
- static const uint16 kWiFiFrequency5180;
- static const uint16 kWiFiFrequency5230;
- static const uint16 kWiFiFrequency5240;
- static const uint16 kWiFiFrequency5320;
- static const uint16 kWiFiFrequency5500;
- static const uint16 kWiFiFrequency5700;
- static const uint16 kWiFiFrequency5745;
- static const uint16 kWiFiFrequency5825;
+ static const uint16_t kWiFiBandwidth5MHz;
+ static const uint16_t kWiFiBandwidth20MHz;
+ static const uint16_t kWiFiFrequency2412;
+ static const uint16_t kWiFiFrequency2472;
+ static const uint16_t kWiFiFrequency2484;
+ static const uint16_t kWiFiFrequency5170;
+ static const uint16_t kWiFiFrequency5180;
+ static const uint16_t kWiFiFrequency5230;
+ static const uint16_t kWiFiFrequency5240;
+ static const uint16_t kWiFiFrequency5320;
+ static const uint16_t kWiFiFrequency5500;
+ static const uint16_t kWiFiFrequency5700;
+ static const uint16_t kWiFiFrequency5745;
+ static const uint16_t kWiFiFrequency5825;
void InitializeCommonServiceMetrics(const Service &service);
void UpdateServiceStateTransitionMetrics(ServiceMetrics *service_metrics,
diff --git a/metrics_unittest.cc b/metrics_unittest.cc
index 816a246..0161597 100644
--- a/metrics_unittest.cc
+++ b/metrics_unittest.cc
@@ -627,7 +627,7 @@
kNetworkTechnologyUmts,
"Unknown" };
- const uint16 signal_strength = 100;
+ const uint16_t signal_strength = 100;
const int kInterfaceIndex = 1;
metrics_.RegisterDevice(kInterfaceIndex, Technology::kCellular);
for (size_t index = 0; index < arraysize(kUMATechnologyStrings); ++index) {
diff --git a/mm1_modem_proxy_interface.h b/mm1_modem_proxy_interface.h
index f9bced0..7e12914 100644
--- a/mm1_modem_proxy_interface.h
+++ b/mm1_modem_proxy_interface.h
@@ -17,8 +17,8 @@
namespace mm1 {
-typedef base::Callback<void(int32,
- int32, uint32)> ModemStateChangedSignalCallback;
+typedef base::Callback<void(int32_t,
+ int32_t, uint32_t)> ModemStateChangedSignalCallback;
// These are the methods that a org.freedesktop.ModemManager1.Modem
// proxy must support. The interface is provided so that it can be
diff --git a/mock_adaptors.h b/mock_adaptors.h
index 42d17e9..90af145 100644
--- a/mock_adaptors.h
+++ b/mock_adaptors.h
@@ -27,8 +27,9 @@
virtual const std::string &GetRpcConnectionIdentifier();
MOCK_METHOD2(EmitBoolChanged, void(const std::string &name, bool value));
- MOCK_METHOD2(EmitUintChanged, void(const std::string &name, uint32 value));
- MOCK_METHOD2(EmitUint16Changed, void(const std::string &name, uint16 value));
+ MOCK_METHOD2(EmitUintChanged, void(const std::string &name, uint32_t value));
+ MOCK_METHOD2(EmitUint16Changed,
+ void(const std::string &name, uint16_t value));
MOCK_METHOD2(EmitIntChanged, void(const std::string &name, int value));
MOCK_METHOD2(EmitStringChanged, void(const std::string &name,
const std::string &value));
@@ -59,7 +60,7 @@
virtual const std::string &GetRpcIdentifier();
MOCK_METHOD2(EmitBoolChanged, void(const std::string&, bool));
- MOCK_METHOD2(EmitUintChanged, void(const std::string&, uint32));
+ MOCK_METHOD2(EmitUintChanged, void(const std::string&, uint32_t));
MOCK_METHOD2(EmitIntChanged, void(const std::string&, int));
MOCK_METHOD2(EmitStringChanged, void(const std::string&, const std::string&));
MOCK_METHOD2(EmitStringsChanged,
@@ -80,7 +81,7 @@
MOCK_METHOD0(UpdateRunning, void(void));
MOCK_METHOD2(EmitBoolChanged, void(const std::string&, bool));
- MOCK_METHOD2(EmitUintChanged, void(const std::string&, uint32));
+ MOCK_METHOD2(EmitUintChanged, void(const std::string&, uint32_t));
MOCK_METHOD2(EmitIntChanged, void(const std::string&, int));
MOCK_METHOD2(EmitStringChanged, void(const std::string&, const std::string&));
MOCK_METHOD2(EmitStringsChanged,
@@ -106,7 +107,7 @@
virtual const std::string &GetRpcIdentifier();
MOCK_METHOD2(EmitBoolChanged, void(const std::string&, bool));
- MOCK_METHOD2(EmitUintChanged, void(const std::string&, uint32));
+ MOCK_METHOD2(EmitUintChanged, void(const std::string&, uint32_t));
MOCK_METHOD2(EmitIntChanged, void(const std::string&, int));
MOCK_METHOD2(EmitStringChanged, void(const std::string&, const std::string&));
@@ -145,11 +146,12 @@
MOCK_METHOD0(UpdateConnected, void());
MOCK_METHOD2(EmitBoolChanged, void(const std::string &name, bool value));
- MOCK_METHOD2(EmitUint8Changed, void(const std::string &name, uint8 value));
- MOCK_METHOD2(EmitUint16Changed, void(const std::string &name, uint16 value));
+ MOCK_METHOD2(EmitUint8Changed, void(const std::string &name, uint8_t value));
+ MOCK_METHOD2(EmitUint16Changed,
+ void(const std::string &name, uint16_t value));
MOCK_METHOD2(EmitUint16sChanged, void(const std::string &name,
const Uint16s &value));
- MOCK_METHOD2(EmitUintChanged, void(const std::string &name, uint32 value));
+ MOCK_METHOD2(EmitUintChanged, void(const std::string &name, uint32_t value));
MOCK_METHOD2(EmitIntChanged, void(const std::string &name, int value));
MOCK_METHOD2(EmitRpcIdentifierChanged,
void(const std::string &name, const std::string &value));
diff --git a/mock_device.h b/mock_device.h
index 2f2f3b2..8596acb 100644
--- a/mock_device.h
+++ b/mock_device.h
@@ -46,8 +46,8 @@
MOCK_METHOD0(EnableReversePathFilter, void());
MOCK_METHOD0(RestartPortalDetection, bool());
MOCK_METHOD0(RequestPortalDetection, bool());
- MOCK_METHOD0(GetReceiveByteCount, uint64());
- MOCK_METHOD0(GetTransmitByteCount, uint64());
+ MOCK_METHOD0(GetReceiveByteCount, uint64_t());
+ MOCK_METHOD0(GetTransmitByteCount, uint64_t());
MOCK_CONST_METHOD1(IsConnectedToService, bool(const ServiceRefPtr &service));
MOCK_CONST_METHOD0(technology, Technology::Identifier());
MOCK_METHOD0(OnBeforeSuspend, void());
diff --git a/mock_device_info.h b/mock_device_info.h
index 9b8c299..baba61f 100644
--- a/mock_device_info.h
+++ b/mock_device_info.h
@@ -41,8 +41,8 @@
const IPAddress &peer,
ByteString *address));
MOCK_CONST_METHOD3(GetByteCounts, bool(int interface_index,
- uint64 *rx_bytes,
- uint64 *tx_bytes));
+ uint64_t *rx_bytes,
+ uint64_t *tx_bytes));
MOCK_CONST_METHOD2(GetFlags, bool(int interface_index,
unsigned int* flags));
MOCK_CONST_METHOD2(GetAddresses, bool(int interface_index,
diff --git a/mock_event_dispatcher.h b/mock_event_dispatcher.h
index 3f521f4..bf959a7 100644
--- a/mock_event_dispatcher.h
+++ b/mock_event_dispatcher.h
@@ -21,7 +21,7 @@
MOCK_METHOD0(DispatchPendingEvents, void());
MOCK_METHOD1(PostTask, bool(const base::Closure &task));
MOCK_METHOD2(PostDelayedTask, bool(const base::Closure &task,
- int64 delay_ms));
+ int64_t delay_ms));
MOCK_METHOD3(CreateInputHandler, IOHandler *(
int fd,
const IOHandler::InputCallback &input_callback,
diff --git a/mock_modem_gsm_card_proxy.h b/mock_modem_gsm_card_proxy.h
index 1e2cbdf..840f24a 100644
--- a/mock_modem_gsm_card_proxy.h
+++ b/mock_modem_gsm_card_proxy.h
@@ -45,7 +45,7 @@
const std::string &new_pin,
Error *error, const ResultCallback &callback,
int timeout));
- MOCK_METHOD0(EnabledFacilityLocks, uint32());
+ MOCK_METHOD0(EnabledFacilityLocks, uint32_t());
private:
DISALLOW_COPY_AND_ASSIGN(MockModemGSMCardProxy);
diff --git a/mock_modem_gsm_network_proxy.h b/mock_modem_gsm_network_proxy.h
index 0b623db..63dcb3a 100644
--- a/mock_modem_gsm_network_proxy.h
+++ b/mock_modem_gsm_network_proxy.h
@@ -29,7 +29,7 @@
const ResultCallback &callback, int timeout));
MOCK_METHOD3(Scan, void(Error *error, const ScanResultsCallback &callback,
int timeout));
- MOCK_METHOD0(AccessTechnology, uint32());
+ MOCK_METHOD0(AccessTechnology, uint32_t());
MOCK_METHOD1(set_signal_quality_callback,
void(const SignalQualitySignalCallback &callback));
MOCK_METHOD1(set_network_mode_callback,
diff --git a/mock_netlink_socket.h b/mock_netlink_socket.h
index d5740bb..38da65c 100644
--- a/mock_netlink_socket.h
+++ b/mock_netlink_socket.h
@@ -20,7 +20,7 @@
MockNetlinkSocket() {}
MOCK_METHOD0(Init, bool());
- uint32 GetLastSequenceNumber() const { return sequence_number_; }
+ uint32_t GetLastSequenceNumber() const { return sequence_number_; }
MOCK_CONST_METHOD0(file_descriptor, int());
MOCK_METHOD1(SendMessage, bool(const ByteString &out_string));
MOCK_METHOD1(SubscribeToEvents, bool(uint32_t group_id));
diff --git a/mock_out_of_credits_detector.h b/mock_out_of_credits_detector.h
index 1fc6dad..cbc61d4 100644
--- a/mock_out_of_credits_detector.h
+++ b/mock_out_of_credits_detector.h
@@ -25,7 +25,7 @@
void(Service::ConnectState old_state,
Service::ConnectState new_state));
MOCK_METHOD1(NotifySubscriptionStateChanged,
- void(uint32 subscription_state));
+ void(uint32_t subscription_state));
MOCK_CONST_METHOD0(out_of_credits, bool());
private:
diff --git a/mock_property_store.h b/mock_property_store.h
index 985f21c..fa52421 100644
--- a/mock_property_store.h
+++ b/mock_property_store.h
@@ -21,8 +21,8 @@
MOCK_CONST_METHOD1(Contains, bool(const std::string&));
MOCK_METHOD3(SetBoolProperty, bool(const std::string&, bool, Error*));
- MOCK_METHOD3(SetInt16Property, bool(const std::string&, int16, Error*));
- MOCK_METHOD3(SetInt32Property, bool(const std::string&, int32, Error*));
+ MOCK_METHOD3(SetInt16Property, bool(const std::string&, int16_t, Error*));
+ MOCK_METHOD3(SetInt32Property, bool(const std::string&, int32_t, Error*));
MOCK_METHOD3(SetStringProperty, bool(const std::string&,
const std::string&,
Error*));
@@ -32,12 +32,12 @@
MOCK_METHOD3(SetStringsProperty, bool(const std::string&,
const Strings&,
Error*));
- MOCK_METHOD3(SetUint8Property, bool(const std::string&, uint8, Error*));
- MOCK_METHOD3(SetUint16Property, bool(const std::string&, uint16, Error*));
+ MOCK_METHOD3(SetUint8Property, bool(const std::string&, uint8_t, Error*));
+ MOCK_METHOD3(SetUint16Property, bool(const std::string&, uint16_t, Error*));
MOCK_METHOD3(SetUint16sProperty, bool(const std::string&,
const Uint16s &, Error*));
- MOCK_METHOD3(SetUint32Property, bool(const std::string&, uint32, Error*));
- MOCK_METHOD3(SetUint64Property, bool(const std::string&, uint64, Error*));
+ MOCK_METHOD3(SetUint32Property, bool(const std::string&, uint32_t, Error*));
+ MOCK_METHOD3(SetUint64Property, bool(const std::string&, uint64_t, Error*));
MOCK_METHOD2(ClearProperty, bool(const std::string&, Error*));
private:
diff --git a/mock_routing_table.h b/mock_routing_table.h
index fa7a61e..d04831c 100644
--- a/mock_routing_table.h
+++ b/mock_routing_table.h
@@ -26,13 +26,13 @@
RoutingTableEntry *entry));
MOCK_METHOD3(SetDefaultRoute, bool(int interface_index,
const IPAddress &gateway_address,
- uint32 metric));
+ uint32_t metric));
MOCK_METHOD3(ConfigureRoutes, bool(int interface_index,
const IPConfigRefPtr &ipconfig,
- uint32 metric));
+ uint32_t metric));
MOCK_METHOD3(CreateBlackholeRoute, bool(int interface_index,
IPAddress::Family family,
- uint32 metric));
+ uint32_t metric));
MOCK_METHOD3(CreateLinkRoute, bool(int interface_index,
const IPAddress &local_address,
const IPAddress &remote_address));
@@ -40,7 +40,7 @@
MOCK_METHOD1(FlushRoutesWithTag, void(int tag));
MOCK_METHOD0(FlushCache, bool());
MOCK_METHOD1(ResetTable, void(int interface_index));
- MOCK_METHOD2(SetDefaultMetric, void(int interface_index, uint32 metric));
+ MOCK_METHOD2(SetDefaultMetric, void(int interface_index, uint32_t metric));
MOCK_METHOD4(RequestRouteToHost, bool(const IPAddress &addresss,
int interface_index,
int tag,
diff --git a/mock_store.h b/mock_store.h
index 44e1a04..9c6a473 100644
--- a/mock_store.h
+++ b/mock_store.h
@@ -53,10 +53,10 @@
int value));
MOCK_CONST_METHOD3(GetUint64, bool(const std::string &group,
const std::string &key,
- uint64 *value));
+ uint64_t *value));
MOCK_METHOD3(SetUint64, bool(const std::string &group,
const std::string &key,
- uint64 value));
+ uint64_t value));
MOCK_CONST_METHOD3(GetStringList, bool(const std::string &group,
const std::string &key,
std::vector<std::string> *value));
diff --git a/mock_wifi_provider.h b/mock_wifi_provider.h
index 880ed2f..6b1953c 100644
--- a/mock_wifi_provider.h
+++ b/mock_wifi_provider.h
@@ -39,7 +39,7 @@
MOCK_METHOD2(LoadAndFixupServiceEntries, void(StoreInterface *storage,
bool is_default_profile));
MOCK_CONST_METHOD1(Save, bool(StoreInterface *storage));
- MOCK_METHOD1(IncrementConnectCount, void(uint16 frequency));
+ MOCK_METHOD1(IncrementConnectCount, void(uint16_t frequency));
private:
DISALLOW_COPY_AND_ASSIGN(MockWiFiProvider);
diff --git a/mock_wimax_device_proxy.h b/mock_wimax_device_proxy.h
index 3cab77d..8f59773 100644
--- a/mock_wimax_device_proxy.h
+++ b/mock_wimax_device_proxy.h
@@ -40,7 +40,7 @@
void(const NetworksChangedCallback &callback));
MOCK_METHOD1(set_status_changed_callback,
void(const StatusChangedCallback &callback));
- MOCK_METHOD1(Index, uint8(Error *error));
+ MOCK_METHOD1(Index, uint8_t(Error *error));
MOCK_METHOD1(Name, std::string(Error *error));
MOCK_METHOD1(Networks, RpcIdentifiers(Error *error));
diff --git a/mock_wimax_network_proxy.h b/mock_wimax_network_proxy.h
index 40f90cc..b4de2c4 100644
--- a/mock_wimax_network_proxy.h
+++ b/mock_wimax_network_proxy.h
@@ -21,7 +21,7 @@
MOCK_CONST_METHOD0(path, RpcIdentifier());
MOCK_METHOD1(set_signal_strength_changed_callback,
void(const SignalStrengthChangedCallback &callback));
- MOCK_METHOD1(Identifier, uint32(Error *error));
+ MOCK_METHOD1(Identifier, uint32_t(Error *error));
MOCK_METHOD1(Name, std::string(Error *error));
MOCK_METHOD1(Type, int(Error *error));
MOCK_METHOD1(CINR, int(Error *error));
diff --git a/modem_1.cc b/modem_1.cc
index 9524380..85c633b 100644
--- a/modem_1.cc
+++ b/modem_1.cc
@@ -33,7 +33,7 @@
return false;
}
- vector<DBus::Struct<string, uint32>> ports = props_it->second;
+ vector<DBus::Struct<string, uint32_t>> ports = props_it->second;
for (const auto &port_pair : ports) {
if (port_pair._2 == MM_MODEM_PORT_TYPE_NET) {
net_port = port_pair._1;
@@ -52,7 +52,7 @@
void Modem1::CreateDeviceMM1(const DBusInterfaceToProperties &properties) {
Init();
- uint32 capabilities = kuint32max;
+ uint32_t capabilities = kuint32max;
DBusInterfaceToProperties::const_iterator it =
properties.find(MM_DBUS_INTERFACE_MODEM);
if (it == properties.end()) {
diff --git a/modem_cdma_proxy.cc b/modem_cdma_proxy.cc
index b250705..4222c3c 100644
--- a/modem_cdma_proxy.cc
+++ b/modem_cdma_proxy.cc
@@ -92,8 +92,8 @@
}
void ModemCDMAProxy::Proxy::ActivationStateChanged(
- const uint32 &activation_state,
- const uint32 &activation_error,
+ const uint32_t &activation_state,
+ const uint32_t &activation_error,
const DBusPropertiesMap &status_changes) {
SLOG(DBus, 2) << __func__ << "(" << activation_state << ", "
<< activation_error << ")";
@@ -102,14 +102,14 @@
status_changes);
}
-void ModemCDMAProxy::Proxy::SignalQuality(const uint32 &quality) {
+void ModemCDMAProxy::Proxy::SignalQuality(const uint32_t &quality) {
SLOG(DBus, 2) << __func__ << "(" << quality << ")";
signal_quality_callback_.Run(quality);
}
void ModemCDMAProxy::Proxy::RegistrationStateChanged(
- const uint32 &cdma_1x_state,
- const uint32 &evdo_state) {
+ const uint32_t &cdma_1x_state,
+ const uint32_t &evdo_state) {
SLOG(DBus, 2) << __func__ << "(" << cdma_1x_state << ", "
<< evdo_state << ")";
registration_state_callback_.Run(cdma_1x_state, evdo_state);
@@ -127,7 +127,7 @@
}
void ModemCDMAProxy::Proxy::GetRegistrationStateCallback(
- const uint32 &state_1x, const uint32 &state_evdo,
+ const uint32_t &state_1x, const uint32_t &state_evdo,
const DBus::Error &dberror, void *data) {
SLOG(DBus, 2) << __func__ << "(" << state_1x << ", " << state_evdo << ")";
scoped_ptr<RegistrationStateCallback> callback(
@@ -138,7 +138,7 @@
}
-void ModemCDMAProxy::Proxy::GetSignalQualityCallback(const uint32 &quality,
+void ModemCDMAProxy::Proxy::GetSignalQualityCallback(const uint32_t &quality,
const DBus::Error &dberror,
void *data) {
SLOG(DBus, 2) << __func__ << "(" << quality << ")";
diff --git a/modem_cdma_proxy.h b/modem_cdma_proxy.h
index 01c2ed9..4c8eb2a 100644
--- a/modem_cdma_proxy.h
+++ b/modem_cdma_proxy.h
@@ -61,21 +61,21 @@
private:
// Signal callbacks inherited from ModemManager::Modem::Cdma_proxy.
virtual void ActivationStateChanged(
- const uint32 &activation_state,
- const uint32 &activation_error,
+ const uint32_t &activation_state,
+ const uint32_t &activation_error,
const DBusPropertiesMap &status_changes);
- virtual void SignalQuality(const uint32 &quality);
- virtual void RegistrationStateChanged(const uint32 &cdma_1x_state,
- const uint32 &evdo_state);
+ virtual void SignalQuality(const uint32_t &quality);
+ virtual void RegistrationStateChanged(const uint32_t &cdma_1x_state,
+ const uint32_t &evdo_state);
// Method callbacks inherited from ModemManager::Modem::Cdma_proxy.
- virtual void ActivateCallback(const uint32 &status,
+ virtual void ActivateCallback(const uint32_t &status,
const DBus::Error &dberror, void *data);
- virtual void GetRegistrationStateCallback(const uint32 &state_1x,
- const uint32 &state_evdo,
+ virtual void GetRegistrationStateCallback(const uint32_t &state_1x,
+ const uint32_t &state_evdo,
const DBus::Error &error,
void *data);
- virtual void GetSignalQualityCallback(const uint32 &quality,
+ virtual void GetSignalQualityCallback(const uint32_t &quality,
const DBus::Error &dberror,
void *data);
diff --git a/modem_cdma_proxy_interface.h b/modem_cdma_proxy_interface.h
index e743dbf..26049d2 100644
--- a/modem_cdma_proxy_interface.h
+++ b/modem_cdma_proxy_interface.h
@@ -16,12 +16,13 @@
class Error;
-typedef base::Callback<void(uint32)> SignalQualitySignalCallback;
-typedef base::Callback<void(uint32, uint32)> RegistrationStateSignalCallback;
+typedef base::Callback<void(uint32_t)> SignalQualitySignalCallback;
+typedef base::Callback<void(uint32_t, uint32_t)>
+ RegistrationStateSignalCallback;
-typedef base::Callback<void(uint32, const Error &)> ActivationResultCallback;
-typedef base::Callback<void(uint32, const Error &)> SignalQualityCallback;
-typedef base::Callback<void(uint32, uint32,
+typedef base::Callback<void(uint32_t, const Error &)> ActivationResultCallback;
+typedef base::Callback<void(uint32_t, const Error &)> SignalQualityCallback;
+typedef base::Callback<void(uint32_t, uint32_t,
const Error &)> RegistrationStateCallback;
// These are the methods that a ModemManager.Modem.CDMA proxy must support.
diff --git a/modem_classic.cc b/modem_classic.cc
index 52e3929..8f085cc 100644
--- a/modem_classic.cc
+++ b/modem_classic.cc
@@ -29,7 +29,7 @@
void ModemClassic::CreateDeviceClassic(
const DBusPropertiesMap &modem_properties) {
Init();
- uint32 mm_type = kuint32max;
+ uint32_t mm_type = kuint32max;
DBusProperties::GetUint32(modem_properties, kPropertyType, &mm_type);
switch (mm_type) {
case MM_MODEM_TYPE_CDMA:
@@ -42,7 +42,7 @@
LOG(ERROR) << "Unsupported cellular modem type: " << mm_type;
return;
}
- uint32 ip_method = kuint32max;
+ uint32_t ip_method = kuint32max;
if (!DBusProperties::GetUint32(modem_properties,
kPropertyIPMethod,
&ip_method) ||
diff --git a/modem_gsm_card_proxy.cc b/modem_gsm_card_proxy.cc
index 1447c79..0fd627b 100644
--- a/modem_gsm_card_proxy.cc
+++ b/modem_gsm_card_proxy.cc
@@ -90,7 +90,7 @@
old_pin, new_pin);
}
-uint32 ModemGSMCardProxy::EnabledFacilityLocks() {
+uint32_t ModemGSMCardProxy::EnabledFacilityLocks() {
SLOG(DBus, 2) << __func__;
try {
return proxy_.EnabledFacilityLocks();
diff --git a/modem_gsm_card_proxy.h b/modem_gsm_card_proxy.h
index d26b69e..1c71e9b 100644
--- a/modem_gsm_card_proxy.h
+++ b/modem_gsm_card_proxy.h
@@ -46,7 +46,7 @@
const std::string &new_pin,
Error *error, const ResultCallback &callback,
int timeout);
- virtual uint32 EnabledFacilityLocks();
+ virtual uint32_t EnabledFacilityLocks();
private:
class Proxy
diff --git a/modem_gsm_card_proxy_interface.h b/modem_gsm_card_proxy_interface.h
index 91e93a0..37a076f 100644
--- a/modem_gsm_card_proxy_interface.h
+++ b/modem_gsm_card_proxy_interface.h
@@ -45,7 +45,7 @@
int timeout) = 0;
// Properties.
- virtual uint32 EnabledFacilityLocks() = 0;
+ virtual uint32_t EnabledFacilityLocks() = 0;
};
} // namespace shill
diff --git a/modem_gsm_network_proxy.cc b/modem_gsm_network_proxy.cc
index 7d19a2b..6a4acc3 100644
--- a/modem_gsm_network_proxy.cc
+++ b/modem_gsm_network_proxy.cc
@@ -54,7 +54,7 @@
error, &CellularError::FromDBusError, timeout);
}
-uint32 ModemGSMNetworkProxy::AccessTechnology() {
+uint32_t ModemGSMNetworkProxy::AccessTechnology() {
SLOG(DBus, 2) << __func__;
try {
return proxy_.AccessTechnology();
@@ -101,7 +101,7 @@
registration_info_callback_ = callback;
}
-void ModemGSMNetworkProxy::Proxy::SignalQuality(const uint32 &quality) {
+void ModemGSMNetworkProxy::Proxy::SignalQuality(const uint32_t &quality) {
SLOG(DBus, 2) << __func__ << "(" << quality << ")";
if (!signal_quality_callback_.is_null())
signal_quality_callback_.Run(quality);
@@ -143,7 +143,7 @@
}
void ModemGSMNetworkProxy::Proxy::GetSignalQualityCallback(
- const uint32 &quality, const DBus::Error &dberror, void *data) {
+ const uint32_t &quality, const DBus::Error &dberror, void *data) {
SLOG(DBus, 2) << __func__ << "(" << quality << ")";
scoped_ptr<SignalQualityCallback> callback(
reinterpret_cast<SignalQualityCallback *>(data));
diff --git a/modem_gsm_network_proxy.h b/modem_gsm_network_proxy.h
index 67ae37e..7b1b15e 100644
--- a/modem_gsm_network_proxy.h
+++ b/modem_gsm_network_proxy.h
@@ -34,7 +34,7 @@
int timeout);
virtual void Scan(Error *error, const ScanResultsCallback &callback,
int timeout);
- virtual uint32 AccessTechnology();
+ virtual uint32_t AccessTechnology();
virtual void set_signal_quality_callback(
const SignalQualitySignalCallback &callback);
@@ -62,7 +62,7 @@
private:
// Signal callbacks inherited from ModemManager::Modem::Gsm::Network_proxy.
- virtual void SignalQuality(const uint32 &quality);
+ virtual void SignalQuality(const uint32_t &quality);
virtual void RegistrationInfo(const uint32_t &status,
const std::string &operator_code,
const std::string &operator_name);
@@ -73,7 +73,7 @@
virtual void GetRegistrationInfoCallback(const GSMRegistrationInfo &info,
const DBus::Error &dberror,
void *data);
- virtual void GetSignalQualityCallback(const uint32 &quality,
+ virtual void GetSignalQualityCallback(const uint32_t &quality,
const DBus::Error &dberror,
void *data);
virtual void ScanCallback(const GSMScanResults &results,
diff --git a/modem_gsm_network_proxy_interface.h b/modem_gsm_network_proxy_interface.h
index 59752a7..7723f75 100644
--- a/modem_gsm_network_proxy_interface.h
+++ b/modem_gsm_network_proxy_interface.h
@@ -23,14 +23,14 @@
typedef std::map<std::string, std::string> GSMScanResult;
typedef std::vector<GSMScanResult> GSMScanResults;
-typedef base::Callback<void(uint32)> SignalQualitySignalCallback;
+typedef base::Callback<void(uint32_t)> SignalQualitySignalCallback;
typedef base::Callback<void(
uint32_t,
const std::string &,
const std::string &)> RegistrationInfoSignalCallback;
typedef base::Callback<void(uint32_t)> NetworkModeSignalCallback;
-typedef base::Callback<void(uint32, const Error &)> SignalQualityCallback;
+typedef base::Callback<void(uint32_t, const Error &)> SignalQualityCallback;
typedef base::Callback<void(uint32_t,
const std::string &,
const std::string &,
@@ -59,7 +59,7 @@
int timeout) = 0;
// Properties.
- virtual uint32 AccessTechnology() = 0;
+ virtual uint32_t AccessTechnology() = 0;
// Signal callbacks
virtual void set_signal_quality_callback(
const SignalQualitySignalCallback &callback) = 0;
diff --git a/modem_proxy.cc b/modem_proxy.cc
index f7895d9..5b47f96 100644
--- a/modem_proxy.cc
+++ b/modem_proxy.cc
@@ -68,7 +68,7 @@
}
void ModemProxy::Proxy::StateChanged(
- const uint32 &old, const uint32 &_new, const uint32 &reason) {
+ const uint32_t &old, const uint32_t &_new, const uint32_t &reason) {
SLOG(DBus, 2) << __func__ << "(" << old << ", " << _new << ", "
<< reason << ")";
state_changed_callback_.Run(old, _new, reason);
diff --git a/modem_proxy.h b/modem_proxy.h
index b941db3..46889c9 100644
--- a/modem_proxy.h
+++ b/modem_proxy.h
@@ -50,7 +50,7 @@
private:
// Signal callbacks inherited from ModemManager::Modem_proxy.
virtual void StateChanged(
- const uint32 &old, const uint32 &_new, const uint32 &reason);
+ const uint32_t &old, const uint32_t &_new, const uint32_t &reason);
// Method callbacks inherited from ModemManager::Modem_proxy.
virtual void EnableCallback(const DBus::Error &dberror, void *data);
diff --git a/modem_proxy_interface.h b/modem_proxy_interface.h
index 0eb36d5..f709159 100644
--- a/modem_proxy_interface.h
+++ b/modem_proxy_interface.h
@@ -19,8 +19,8 @@
typedef DBus::Struct<std::string, std::string, std::string> ModemHardwareInfo;
-typedef base::Callback<void(uint32,
- uint32, uint32)> ModemStateChangedSignalCallback;
+typedef base::Callback<void(uint32_t, uint32_t, uint32_t)>
+ ModemStateChangedSignalCallback;
typedef base::Callback<void(const ModemHardwareInfo &,
const Error &)> ModemInfoCallback;
diff --git a/modem_unittest.cc b/modem_unittest.cc
index 1f0b65e..beb07cf 100644
--- a/modem_unittest.cc
+++ b/modem_unittest.cc
@@ -99,7 +99,7 @@
TEST_F(ModemTest, PendingDevicePropertiesAndCreate) {
static const char kSentinel[] = "sentinel";
- static const uint32 kSentinelValue = 17;
+ static const uint32_t kSentinelValue = 17;
DBusInterfaceToProperties properties;
properties[MM_MODEM_INTERFACE][kSentinel].writer().append_uint32(
diff --git a/ndisc.h b/ndisc.h
index b845b24..4640bcd 100644
--- a/ndisc.h
+++ b/ndisc.h
@@ -16,10 +16,10 @@
NDUserOptionHeader() {
memset(this, 0, sizeof(*this));
}
- uint8 type;
- uint8 length;
- uint16 reserved;
- uint32 lifetime;
+ uint8_t type;
+ uint8_t length;
+ uint16_t reserved;
+ uint32_t lifetime;
} __attribute__((__packed__));
// Neighbor Discovery user option type definition.
diff --git a/netlink_manager.cc b/netlink_manager.cc
index b283560..114bb9c 100644
--- a/netlink_manager.cc
+++ b/netlink_manager.cc
@@ -532,7 +532,7 @@
LOG(ERROR) << __func__ << "() called with null header.";
return;
}
- const uint32 sequence_number = msg->nlmsg_seq;
+ const uint32_t sequence_number = msg->nlmsg_seq;
scoped_ptr<NetlinkMessage> message(message_factory_.CreateMessage(msg));
if (message == NULL) {
diff --git a/nl80211_message.h b/nl80211_message.h
index c6bbbee..1b336f2 100644
--- a/nl80211_message.h
+++ b/nl80211_message.h
@@ -24,7 +24,7 @@
public:
static const char kMessageTypeString[];
- Nl80211Message(uint8 command, const char *command_string)
+ Nl80211Message(uint8_t command, const char *command_string)
: GenericNetlinkMessage(nl80211_message_type_, command, command_string) {}
virtual ~Nl80211Message() {}
@@ -36,7 +36,7 @@
virtual bool InitFromNlmsg(const nlmsghdr *msg);
- uint8 command() const { return command_; }
+ uint8_t command() const { return command_; }
const char *command_string() const { return command_string_; }
uint16_t message_type() const { return message_type_; }
uint32_t sequence_number() const { return sequence_number_; }
diff --git a/no_out_of_credits_detector.h b/no_out_of_credits_detector.h
index d05c667..2b03d4b 100644
--- a/no_out_of_credits_detector.h
+++ b/no_out_of_credits_detector.h
@@ -31,7 +31,7 @@
Service::ConnectState new_state) override {}
// Notifies this object when the subscription state has changed.
virtual void NotifySubscriptionStateChanged(
- uint32 subscription_state) override {}
+ uint32_t subscription_state) override {}
private:
DISALLOW_COPY_AND_ASSIGN(NoOutOfCreditsDetector);
diff --git a/out_of_credits_detector.h b/out_of_credits_detector.h
index b8576a1..4a6f85c 100644
--- a/out_of_credits_detector.h
+++ b/out_of_credits_detector.h
@@ -57,7 +57,7 @@
virtual void NotifyServiceStateChanged(Service::ConnectState old_state,
Service::ConnectState new_state) = 0;
// Notifies this object when the subscription state has changed.
- virtual void NotifySubscriptionStateChanged(uint32 subscription_state) = 0;
+ virtual void NotifySubscriptionStateChanged(uint32_t subscription_state) = 0;
virtual bool out_of_credits() const { return out_of_credits_; }
diff --git a/portal_detector.cc b/portal_detector.cc
index c2b72d8..4748641 100644
--- a/portal_detector.cc
+++ b/portal_detector.cc
@@ -227,7 +227,7 @@
}
void PortalDetector::StartAttempt(int init_delay_seconds) {
- int64 next_attempt_delay = 0;
+ int64_t next_attempt_delay = 0;
if (attempt_count_ > 0) {
// Ensure that attempts are spaced at least by a minimal interval.
struct timeval now, elapsed_time;
diff --git a/profile_dbus_adaptor.cc b/profile_dbus_adaptor.cc
index 8d7846c..2372f76 100644
--- a/profile_dbus_adaptor.cc
+++ b/profile_dbus_adaptor.cc
@@ -40,7 +40,7 @@
}
void ProfileDBusAdaptor::EmitUintChanged(const string &name,
- uint32 value) {
+ uint32_t value) {
SLOG(DBus, 2) << __func__ << ": " << name;
PropertyChanged(name, DBusAdaptor::Uint32ToVariant(value));
}
diff --git a/profile_dbus_adaptor.h b/profile_dbus_adaptor.h
index 1c1f712..8d5075b 100644
--- a/profile_dbus_adaptor.h
+++ b/profile_dbus_adaptor.h
@@ -38,7 +38,7 @@
// Implementation of ProfileAdaptorInterface.
virtual const std::string &GetRpcIdentifier() { return path(); }
virtual void EmitBoolChanged(const std::string &name, bool value);
- virtual void EmitUintChanged(const std::string &name, uint32 value);
+ virtual void EmitUintChanged(const std::string &name, uint32_t value);
virtual void EmitIntChanged(const std::string &name, int value);
virtual void EmitStringChanged(const std::string &name,
const std::string &value);
diff --git a/profile_unittest.cc b/profile_unittest.cc
index 8fde516..435fa36 100644
--- a/profile_unittest.cc
+++ b/profile_unittest.cc
@@ -268,7 +268,7 @@
dispatcher(),
metrics(),
manager()));
- int32 orig_priority = service2->priority();
+ int32_t orig_priority = service2->priority();
ASSERT_TRUE(profile_->ConfigureService(service2));
ASSERT_EQ(service1->priority(), service2->priority());
ASSERT_NE(orig_priority, service2->priority());
diff --git a/property_accessor_unittest.cc b/property_accessor_unittest.cc
index 9cd0395..108b0a6 100644
--- a/property_accessor_unittest.cc
+++ b/property_accessor_unittest.cc
@@ -25,14 +25,14 @@
namespace shill {
TEST(PropertyAccessorTest, SignedIntCorrectness) {
- int32 int_store = 0;
+ int32_t int_store = 0;
{
Error error;
- int32 orig_value = int_store;
- Int32Accessor accessor(new PropertyAccessor<int32>(&int_store));
+ int32_t orig_value = int_store;
+ Int32Accessor accessor(new PropertyAccessor<int32_t>(&int_store));
EXPECT_EQ(int_store, accessor->Get(&error));
- int32 expected_int32 = 127;
+ int32_t expected_int32 = 127;
EXPECT_TRUE(accessor->Set(expected_int32, &error));
EXPECT_TRUE(error.IsSuccess());
EXPECT_EQ(expected_int32, accessor->Get(&error));
@@ -45,40 +45,40 @@
EXPECT_TRUE(error.IsSuccess());
EXPECT_EQ(orig_value, accessor->Get(&error));
- int_store = std::numeric_limits<int32>::max();
- EXPECT_EQ(std::numeric_limits<int32>::max(), accessor->Get(&error));
+ int_store = std::numeric_limits<int32_t>::max();
+ EXPECT_EQ(std::numeric_limits<int32_t>::max(), accessor->Get(&error));
}
{
Error error;
- Int32Accessor accessor(new ConstPropertyAccessor<int32>(&int_store));
+ Int32Accessor accessor(new ConstPropertyAccessor<int32_t>(&int_store));
EXPECT_EQ(int_store, accessor->Get(&error));
- int32 expected_int32 = 127;
+ int32_t expected_int32 = 127;
accessor->Set(expected_int32, &error);
ASSERT_FALSE(error.IsSuccess());
EXPECT_EQ(Error::kInvalidArguments, error.type());
EXPECT_EQ(int_store, accessor->Get(&error));
- int_store = std::numeric_limits<int32>::max();
- EXPECT_EQ(std::numeric_limits<int32>::max(), accessor->Get(&error));
+ int_store = std::numeric_limits<int32_t>::max();
+ EXPECT_EQ(std::numeric_limits<int32_t>::max(), accessor->Get(&error));
}
{
Error error;
- Int32Accessor accessor(new ConstPropertyAccessor<int32>(&int_store));
+ Int32Accessor accessor(new ConstPropertyAccessor<int32_t>(&int_store));
accessor->Clear(&error);
ASSERT_FALSE(error.IsSuccess());
}
{
Error error;
- Int32Accessor accessor(new WriteOnlyPropertyAccessor<int32>(&int_store));
+ Int32Accessor accessor(new WriteOnlyPropertyAccessor<int32_t>(&int_store));
accessor->Get(&error);
EXPECT_TRUE(error.IsFailure());
EXPECT_EQ(Error::kPermissionDenied, error.type());
}
{
Error error;
- int32 expected_int32 = 127;
- WriteOnlyPropertyAccessor<int32> accessor(&int_store);
+ int32_t expected_int32 = 127;
+ WriteOnlyPropertyAccessor<int32_t> accessor(&int_store);
EXPECT_TRUE(accessor.Set(expected_int32, &error));
EXPECT_TRUE(error.IsSuccess());
EXPECT_EQ(expected_int32, *accessor.property_);
@@ -87,16 +87,16 @@
EXPECT_FALSE(accessor.Set(expected_int32, &error));
EXPECT_TRUE(error.IsSuccess());
// As a write-only, the value can't be read.
- EXPECT_EQ(int32(), accessor.Get(&error));
+ EXPECT_EQ(int32_t(), accessor.Get(&error));
ASSERT_FALSE(error.IsSuccess());
- int_store = std::numeric_limits<int32>::max();
- EXPECT_EQ(std::numeric_limits<int32>::max(), *accessor.property_);
+ int_store = std::numeric_limits<int32_t>::max();
+ EXPECT_EQ(std::numeric_limits<int32_t>::max(), *accessor.property_);
}
{
Error error;
- int32 orig_value = int_store = 0;
- WriteOnlyPropertyAccessor<int32> accessor(&int_store);
+ int32_t orig_value = int_store = 0;
+ WriteOnlyPropertyAccessor<int32_t> accessor(&int_store);
EXPECT_TRUE(accessor.Set(127, &error));
accessor.Clear(&error);
@@ -106,14 +106,14 @@
}
TEST(PropertyAccessorTest, UnsignedIntCorrectness) {
- uint32 int_store = 0;
+ uint32_t int_store = 0;
{
Error error;
- uint32 orig_value = int_store;
- Uint32Accessor accessor(new PropertyAccessor<uint32>(&int_store));
+ uint32_t orig_value = int_store;
+ Uint32Accessor accessor(new PropertyAccessor<uint32_t>(&int_store));
EXPECT_EQ(int_store, accessor->Get(&error));
- uint32 expected_uint32 = 127;
+ uint32_t expected_uint32 = 127;
EXPECT_TRUE(accessor->Set(expected_uint32, &error));
EXPECT_TRUE(error.IsSuccess());
EXPECT_EQ(expected_uint32, accessor->Get(&error));
@@ -126,40 +126,41 @@
EXPECT_TRUE(error.IsSuccess());
EXPECT_EQ(orig_value, accessor->Get(&error));
- int_store = std::numeric_limits<uint32>::max();
- EXPECT_EQ(std::numeric_limits<uint32>::max(), accessor->Get(&error));
+ int_store = std::numeric_limits<uint32_t>::max();
+ EXPECT_EQ(std::numeric_limits<uint32_t>::max(), accessor->Get(&error));
}
{
Error error;
- Uint32Accessor accessor(new ConstPropertyAccessor<uint32>(&int_store));
+ Uint32Accessor accessor(new ConstPropertyAccessor<uint32_t>(&int_store));
EXPECT_EQ(int_store, accessor->Get(&error));
- uint32 expected_uint32 = 127;
+ uint32_t expected_uint32 = 127;
EXPECT_FALSE(accessor->Set(expected_uint32, &error));
ASSERT_FALSE(error.IsSuccess());
EXPECT_EQ(Error::kInvalidArguments, error.type());
EXPECT_EQ(int_store, accessor->Get(&error));
- int_store = std::numeric_limits<uint32>::max();
- EXPECT_EQ(std::numeric_limits<uint32>::max(), accessor->Get(&error));
+ int_store = std::numeric_limits<uint32_t>::max();
+ EXPECT_EQ(std::numeric_limits<uint32_t>::max(), accessor->Get(&error));
}
{
Error error;
- Uint32Accessor accessor(new ConstPropertyAccessor<uint32>(&int_store));
+ Uint32Accessor accessor(new ConstPropertyAccessor<uint32_t>(&int_store));
accessor->Clear(&error);
ASSERT_FALSE(error.IsSuccess());
}
{
Error error;
- Uint32Accessor accessor(new WriteOnlyPropertyAccessor<uint32>(&int_store));
+ Uint32Accessor accessor(
+ new WriteOnlyPropertyAccessor<uint32_t>(&int_store));
accessor->Get(&error);
EXPECT_TRUE(error.IsFailure());
EXPECT_EQ(Error::kPermissionDenied, error.type());
}
{
Error error;
- uint32 expected_uint32 = 127;
- WriteOnlyPropertyAccessor<uint32> accessor(&int_store);
+ uint32_t expected_uint32 = 127;
+ WriteOnlyPropertyAccessor<uint32_t> accessor(&int_store);
EXPECT_TRUE(accessor.Set(expected_uint32, &error));
EXPECT_TRUE(error.IsSuccess());
EXPECT_EQ(expected_uint32, *accessor.property_);
@@ -168,16 +169,16 @@
EXPECT_FALSE(accessor.Set(expected_uint32, &error));
EXPECT_TRUE(error.IsSuccess());
// As a write-only, the value can't be read.
- EXPECT_EQ(uint32(), accessor.Get(&error));
+ EXPECT_EQ(uint32_t(), accessor.Get(&error));
ASSERT_FALSE(error.IsSuccess());
- int_store = std::numeric_limits<uint32>::max();
- EXPECT_EQ(std::numeric_limits<uint32>::max(), *accessor.property_);
+ int_store = std::numeric_limits<uint32_t>::max();
+ EXPECT_EQ(std::numeric_limits<uint32_t>::max(), *accessor.property_);
}
{
Error error;
- uint32 orig_value = int_store = 0;
- WriteOnlyPropertyAccessor<uint32> accessor(&int_store);
+ uint32_t orig_value = int_store = 0;
+ WriteOnlyPropertyAccessor<uint32_t> accessor(&int_store);
EXPECT_TRUE(accessor.Set(127, &error));
accessor.Clear(&error);
diff --git a/property_store.cc b/property_store.cc
index 6bb5b18..f00b219 100644
--- a/property_store.cc
+++ b/property_store.cc
@@ -53,15 +53,15 @@
}
bool PropertyStore::GetInt16Property(const string &name,
- int16 *value,
+ int16_t *value,
Error *error) const {
- return GetProperty(name, value, error, int16_properties_, "an int16");
+ return GetProperty(name, value, error, int16_properties_, "an int16_t");
}
bool PropertyStore::GetInt32Property(const string &name,
- int32 *value,
+ int32_t *value,
Error *error) const {
- return GetProperty(name, value, error, int32_properties_, "an int32");
+ return GetProperty(name, value, error, int32_properties_, "an int32_t");
}
bool PropertyStore::GetKeyValueStoreProperty(const string &name,
@@ -105,33 +105,34 @@
}
bool PropertyStore::GetUint8Property(const string &name,
- uint8 *value,
+ uint8_t *value,
Error *error) const {
- return GetProperty(name, value, error, uint8_properties_, "a uint8");
+ return GetProperty(name, value, error, uint8_properties_, "a uint8_t");
}
bool PropertyStore::GetUint16Property(const string &name,
- uint16 *value,
+ uint16_t *value,
Error *error) const {
- return GetProperty(name, value, error, uint16_properties_, "a uint16");
+ return GetProperty(name, value, error, uint16_properties_, "a uint16_t");
}
bool PropertyStore::GetUint16sProperty(const string &name,
Uint16s *value,
Error *error) const {
- return GetProperty(name, value, error, uint16s_properties_, "a uint16 list");
+ return GetProperty(name, value, error, uint16s_properties_,
+ "a uint16_t list");
}
bool PropertyStore::GetUint32Property(const string &name,
- uint32 *value,
+ uint32_t *value,
Error *error) const {
- return GetProperty(name, value, error, uint32_properties_, "a uint32");
+ return GetProperty(name, value, error, uint32_properties_, "a uint32_t");
}
bool PropertyStore::GetUint64Property(const string &name,
- uint64 *value,
+ uint64_t *value,
Error *error) const {
- return GetProperty(name, value, error, uint64_properties_, "a uint64");
+ return GetProperty(name, value, error, uint64_properties_, "a uint64_t");
}
bool PropertyStore::SetBoolProperty(const string &name,
@@ -141,15 +142,15 @@
}
bool PropertyStore::SetInt16Property(const string &name,
- int16 value,
+ int16_t value,
Error *error) {
- return SetProperty(name, value, error, &int16_properties_, "an int16");
+ return SetProperty(name, value, error, &int16_properties_, "an int16_t");
}
bool PropertyStore::SetInt32Property(const string &name,
- int32 value,
+ int32_t value,
Error *error) {
- return SetProperty(name, value, error, &int32_properties_, "an int32.");
+ return SetProperty(name, value, error, &int32_properties_, "an int32_t.");
}
bool PropertyStore::SetStringProperty(const string &name,
@@ -181,33 +182,34 @@
}
bool PropertyStore::SetUint8Property(const string &name,
- uint8 value,
+ uint8_t value,
Error *error) {
- return SetProperty(name, value, error, &uint8_properties_, "a uint8");
+ return SetProperty(name, value, error, &uint8_properties_, "a uint8_t");
}
bool PropertyStore::SetUint16Property(const string &name,
- uint16 value,
+ uint16_t value,
Error *error) {
- return SetProperty(name, value, error, &uint16_properties_, "a uint16");
+ return SetProperty(name, value, error, &uint16_properties_, "a uint16_t");
}
bool PropertyStore::SetUint16sProperty(const string &name,
- const vector<uint16> &value,
+ const vector<uint16_t> &value,
Error *error) {
- return SetProperty(name, value, error, &uint16s_properties_, "a uint16 list");
+ return SetProperty(name, value, error, &uint16s_properties_,
+ "a uint16_t list");
}
bool PropertyStore::SetUint32Property(const string &name,
- uint32 value,
+ uint32_t value,
Error *error) {
- return SetProperty(name, value, error, &uint32_properties_, "a uint32");
+ return SetProperty(name, value, error, &uint32_properties_, "a uint32_t");
}
bool PropertyStore::SetUint64Property(const string &name,
- uint64 value,
+ uint64_t value,
Error *error) {
- return SetProperty(name, value, error, &uint64_properties_, "a uint64");
+ return SetProperty(name, value, error, &uint64_properties_, "a uint64_t");
}
bool PropertyStore::SetRpcIdentifierProperty(const string &name,
@@ -267,14 +269,14 @@
return ReadablePropertyConstIterator<bool>(bool_properties_);
}
-ReadablePropertyConstIterator<int16> PropertyStore::GetInt16PropertiesIter()
+ReadablePropertyConstIterator<int16_t> PropertyStore::GetInt16PropertiesIter()
const {
- return ReadablePropertyConstIterator<int16>(int16_properties_);
+ return ReadablePropertyConstIterator<int16_t>(int16_properties_);
}
-ReadablePropertyConstIterator<int32> PropertyStore::GetInt32PropertiesIter()
+ReadablePropertyConstIterator<int32_t> PropertyStore::GetInt32PropertiesIter()
const {
- return ReadablePropertyConstIterator<int32>(int32_properties_);
+ return ReadablePropertyConstIterator<int32_t>(int32_properties_);
}
ReadablePropertyConstIterator<KeyValueStore>
@@ -316,14 +318,14 @@
return ReadablePropertyConstIterator<Strings>(strings_properties_);
}
-ReadablePropertyConstIterator<uint8> PropertyStore::GetUint8PropertiesIter()
+ReadablePropertyConstIterator<uint8_t> PropertyStore::GetUint8PropertiesIter()
const {
- return ReadablePropertyConstIterator<uint8>(uint8_properties_);
+ return ReadablePropertyConstIterator<uint8_t>(uint8_properties_);
}
-ReadablePropertyConstIterator<uint16> PropertyStore::GetUint16PropertiesIter()
+ReadablePropertyConstIterator<uint16_t> PropertyStore::GetUint16PropertiesIter()
const {
- return ReadablePropertyConstIterator<uint16>(uint16_properties_);
+ return ReadablePropertyConstIterator<uint16_t>(uint16_properties_);
}
ReadablePropertyConstIterator<Uint16s> PropertyStore::GetUint16sPropertiesIter()
@@ -331,14 +333,14 @@
return ReadablePropertyConstIterator<Uint16s>(uint16s_properties_);
}
-ReadablePropertyConstIterator<uint32> PropertyStore::GetUint32PropertiesIter()
+ReadablePropertyConstIterator<uint32_t> PropertyStore::GetUint32PropertiesIter()
const {
- return ReadablePropertyConstIterator<uint32>(uint32_properties_);
+ return ReadablePropertyConstIterator<uint32_t>(uint32_properties_);
}
-ReadablePropertyConstIterator<uint64> PropertyStore::GetUint64PropertiesIter()
+ReadablePropertyConstIterator<uint64_t> PropertyStore::GetUint64PropertiesIter()
const {
- return ReadablePropertyConstIterator<uint64>(uint64_properties_);
+ return ReadablePropertyConstIterator<uint64_t>(uint64_properties_);
}
void PropertyStore::RegisterBool(const string &name, bool *prop) {
@@ -360,43 +362,45 @@
new WriteOnlyPropertyAccessor<bool>(prop));
}
-void PropertyStore::RegisterInt16(const string &name, int16 *prop) {
+void PropertyStore::RegisterInt16(const string &name, int16_t *prop) {
DCHECK(!Contains(name) || ContainsKey(int16_properties_, name))
<< "(Already registered " << name << ")";
- int16_properties_[name] = Int16Accessor(new PropertyAccessor<int16>(prop));
+ int16_properties_[name] = Int16Accessor(new PropertyAccessor<int16_t>(prop));
}
-void PropertyStore::RegisterConstInt16(const string &name, const int16 *prop) {
+void PropertyStore::RegisterConstInt16(const string &name,
+ const int16_t *prop) {
DCHECK(!Contains(name) || ContainsKey(int16_properties_, name))
<< "(Already registered " << name << ")";
int16_properties_[name] =
- Int16Accessor(new ConstPropertyAccessor<int16>(prop));
+ Int16Accessor(new ConstPropertyAccessor<int16_t>(prop));
}
-void PropertyStore::RegisterWriteOnlyInt16(const string &name, int16 *prop) {
+void PropertyStore::RegisterWriteOnlyInt16(const string &name, int16_t *prop) {
DCHECK(!Contains(name) || ContainsKey(int16_properties_, name))
<< "(Already registered " << name << ")";
int16_properties_[name] =
- Int16Accessor(new WriteOnlyPropertyAccessor<int16>(prop));
+ Int16Accessor(new WriteOnlyPropertyAccessor<int16_t>(prop));
}
-void PropertyStore::RegisterInt32(const string &name, int32 *prop) {
+void PropertyStore::RegisterInt32(const string &name, int32_t *prop) {
DCHECK(!Contains(name) || ContainsKey(int32_properties_, name))
<< "(Already registered " << name << ")";
- int32_properties_[name] = Int32Accessor(new PropertyAccessor<int32>(prop));
+ int32_properties_[name] = Int32Accessor(new PropertyAccessor<int32_t>(prop));
}
-void PropertyStore::RegisterConstInt32(const string &name, const int32 *prop) {
+void PropertyStore::RegisterConstInt32(const string &name,
+ const int32_t *prop) {
DCHECK(!Contains(name) || ContainsKey(int32_properties_, name))
<< "(Already registered " << name << ")";
int32_properties_[name] =
- Int32Accessor(new ConstPropertyAccessor<int32>(prop));
+ Int32Accessor(new ConstPropertyAccessor<int32_t>(prop));
}
-void PropertyStore::RegisterWriteOnlyInt32(const string &name, int32 *prop) {
+void PropertyStore::RegisterWriteOnlyInt32(const string &name, int32_t *prop) {
DCHECK(!Contains(name) || ContainsKey(int32_properties_, name))
<< "(Already registered " << name << ")";
int32_properties_[name] =
- Int32Accessor(new WriteOnlyPropertyAccessor<int32>(prop));
+ Int32Accessor(new WriteOnlyPropertyAccessor<int32_t>(prop));
}
void PropertyStore::RegisterString(const string &name, string *prop) {
@@ -489,30 +493,32 @@
StringsAccessor(new WriteOnlyPropertyAccessor<Strings>(prop));
}
-void PropertyStore::RegisterUint8(const string &name, uint8 *prop) {
+void PropertyStore::RegisterUint8(const string &name, uint8_t *prop) {
DCHECK(!Contains(name) || ContainsKey(uint8_properties_, name))
<< "(Already registered " << name << ")";
- uint8_properties_[name] = Uint8Accessor(new PropertyAccessor<uint8>(prop));
+ uint8_properties_[name] = Uint8Accessor(new PropertyAccessor<uint8_t>(prop));
}
-void PropertyStore::RegisterConstUint8(const string &name, const uint8 *prop) {
+void PropertyStore::RegisterConstUint8(const string &name,
+ const uint8_t *prop) {
DCHECK(!Contains(name) || ContainsKey(uint8_properties_, name))
<< "(Already registered " << name << ")";
uint8_properties_[name] =
- Uint8Accessor(new ConstPropertyAccessor<uint8>(prop));
+ Uint8Accessor(new ConstPropertyAccessor<uint8_t>(prop));
}
-void PropertyStore::RegisterWriteOnlyUint8(const string &name, uint8 *prop) {
+void PropertyStore::RegisterWriteOnlyUint8(const string &name, uint8_t *prop) {
DCHECK(!Contains(name) || ContainsKey(uint8_properties_, name))
<< "(Already registered " << name << ")";
uint8_properties_[name] =
- Uint8Accessor(new WriteOnlyPropertyAccessor<uint8>(prop));
+ Uint8Accessor(new WriteOnlyPropertyAccessor<uint8_t>(prop));
}
-void PropertyStore::RegisterUint16(const string &name, uint16 *prop) {
+void PropertyStore::RegisterUint16(const string &name, uint16_t *prop) {
DCHECK(!Contains(name) || ContainsKey(uint16_properties_, name))
<< "(Already registered " << name << ")";
- uint16_properties_[name] = Uint16Accessor(new PropertyAccessor<uint16>(prop));
+ uint16_properties_[name] =
+ Uint16Accessor(new PropertyAccessor<uint16_t>(prop));
}
void PropertyStore::RegisterUint16s(const string &name, Uint16s *prop) {
@@ -522,18 +528,19 @@
Uint16sAccessor(new PropertyAccessor<Uint16s>(prop));
}
-void PropertyStore::RegisterUint32(const std::string &name, uint32 *prop) {
+void PropertyStore::RegisterUint32(const std::string &name, uint32_t *prop) {
DCHECK(!Contains(name) || ContainsKey(uint32_properties_, name))
<< "(Already registered " << name << ")";
- uint32_properties_[name] = Uint32Accessor(new PropertyAccessor<uint32>(prop));
+ uint32_properties_[name] =
+ Uint32Accessor(new PropertyAccessor<uint32_t>(prop));
}
void PropertyStore::RegisterConstUint16(const string &name,
- const uint16 *prop) {
+ const uint16_t *prop) {
DCHECK(!Contains(name) || ContainsKey(uint16_properties_, name))
<< "(Already registered " << name << ")";
uint16_properties_[name] =
- Uint16Accessor(new ConstPropertyAccessor<uint16>(prop));
+ Uint16Accessor(new ConstPropertyAccessor<uint16_t>(prop));
}
void PropertyStore::RegisterConstUint16s(const string &name,
@@ -544,11 +551,12 @@
Uint16sAccessor(new ConstPropertyAccessor<Uint16s>(prop));
}
-void PropertyStore::RegisterWriteOnlyUint16(const string &name, uint16 *prop) {
+void PropertyStore::RegisterWriteOnlyUint16(const string &name,
+ uint16_t *prop) {
DCHECK(!Contains(name) || ContainsKey(uint16_properties_, name))
<< "(Already registered " << name << ")";
uint16_properties_[name] =
- Uint16Accessor(new WriteOnlyPropertyAccessor<uint16>(prop));
+ Uint16Accessor(new WriteOnlyPropertyAccessor<uint16_t>(prop));
}
void PropertyStore::RegisterDerivedBool(const string &name,
diff --git a/property_store.h b/property_store.h
index b1b20d9..674f7c6 100644
--- a/property_store.h
+++ b/property_store.h
@@ -34,9 +34,9 @@
// leave |value| untouched.
bool GetBoolProperty(const std::string &name, bool *value,
Error *error) const;
- bool GetInt16Property(const std::string &name, int16 *value,
+ bool GetInt16Property(const std::string &name, int16_t *value,
Error *error) const;
- bool GetInt32Property(const std::string &name, int32 *value,
+ bool GetInt32Property(const std::string &name, int32_t *value,
Error *error) const;
bool GetKeyValueStoreProperty(const std::string &name, KeyValueStore *value,
Error *error) const;
@@ -48,15 +48,15 @@
Error *error) const;
bool GetStringsProperty(const std::string &name, Strings *values,
Error *error) const;
- bool GetUint8Property(const std::string &name, uint8 *value,
+ bool GetUint8Property(const std::string &name, uint8_t *value,
Error *error) const;
- bool GetUint16Property(const std::string &name, uint16 *value,
+ bool GetUint16Property(const std::string &name, uint16_t *value,
Error *error) const;
bool GetUint16sProperty(const std::string &name, Uint16s *value,
Error *error) const;
- bool GetUint32Property(const std::string &name, uint32 *value,
+ bool GetUint32Property(const std::string &name, uint32_t *value,
Error *error) const;
- bool GetUint64Property(const std::string &name, uint64 *value,
+ bool GetUint64Property(const std::string &name, uint64_t *value,
Error *error) const;
bool GetRpcIdentifierProperty(const std::string &name, RpcIdentifier *value,
Error *error) const;
@@ -75,11 +75,11 @@
Error *error);
virtual bool SetInt16Property(const std::string &name,
- int16 value,
+ int16_t value,
Error *error);
virtual bool SetInt32Property(const std::string &name,
- int32 value,
+ int32_t value,
Error *error);
virtual bool SetStringProperty(const std::string &name,
@@ -101,23 +101,23 @@
Error *error);
virtual bool SetUint8Property(const std::string &name,
- uint8 value,
+ uint8_t value,
Error *error);
virtual bool SetUint16Property(const std::string &name,
- uint16 value,
+ uint16_t value,
Error *error);
virtual bool SetUint16sProperty(const std::string &name,
- const std::vector<uint16> &value,
+ const std::vector<uint16_t> &value,
Error *error);
virtual bool SetUint32Property(const std::string &name,
- uint32 value,
+ uint32_t value,
Error *error);
virtual bool SetUint64Property(const std::string &name,
- uint64 value,
+ uint64_t value,
Error *error);
virtual bool SetRpcIdentifierProperty(const std::string &name,
@@ -141,8 +141,8 @@
// Accessors for iterators over property maps. Useful for dumping all
// properties.
ReadablePropertyConstIterator<bool> GetBoolPropertiesIter() const;
- ReadablePropertyConstIterator<int16> GetInt16PropertiesIter() const;
- ReadablePropertyConstIterator<int32> GetInt32PropertiesIter() const;
+ ReadablePropertyConstIterator<int16_t> GetInt16PropertiesIter() const;
+ ReadablePropertyConstIterator<int32_t> GetInt32PropertiesIter() const;
ReadablePropertyConstIterator<KeyValueStore>
GetKeyValueStorePropertiesIter() const;
ReadablePropertyConstIterator<RpcIdentifier>
@@ -153,11 +153,11 @@
ReadablePropertyConstIterator<Stringmap> GetStringmapPropertiesIter() const;
ReadablePropertyConstIterator<Stringmaps> GetStringmapsPropertiesIter() const;
ReadablePropertyConstIterator<Strings> GetStringsPropertiesIter() const;
- ReadablePropertyConstIterator<uint8> GetUint8PropertiesIter() const;
- ReadablePropertyConstIterator<uint16> GetUint16PropertiesIter() const;
+ ReadablePropertyConstIterator<uint8_t> GetUint8PropertiesIter() const;
+ ReadablePropertyConstIterator<uint16_t> GetUint16PropertiesIter() const;
ReadablePropertyConstIterator<Uint16s> GetUint16sPropertiesIter() const;
- ReadablePropertyConstIterator<uint32> GetUint32PropertiesIter() const;
- ReadablePropertyConstIterator<uint64> GetUint64PropertiesIter() const;
+ ReadablePropertyConstIterator<uint32_t> GetUint32PropertiesIter() const;
+ ReadablePropertyConstIterator<uint64_t> GetUint64PropertiesIter() const;
// Methods for registering a property.
//
@@ -175,13 +175,13 @@
void RegisterBool(const std::string &name, bool *prop);
void RegisterConstBool(const std::string &name, const bool *prop);
void RegisterWriteOnlyBool(const std::string &name, bool *prop);
- void RegisterInt16(const std::string &name, int16 *prop);
- void RegisterConstInt16(const std::string &name, const int16 *prop);
- void RegisterWriteOnlyInt16(const std::string &name, int16 *prop);
- void RegisterInt32(const std::string &name, int32 *prop);
- void RegisterConstInt32(const std::string &name, const int32 *prop);
- void RegisterWriteOnlyInt32(const std::string &name, int32 *prop);
- void RegisterUint32(const std::string &name, uint32 *prop);
+ void RegisterInt16(const std::string &name, int16_t *prop);
+ void RegisterConstInt16(const std::string &name, const int16_t *prop);
+ void RegisterWriteOnlyInt16(const std::string &name, int16_t *prop);
+ void RegisterInt32(const std::string &name, int32_t *prop);
+ void RegisterConstInt32(const std::string &name, const int32_t *prop);
+ void RegisterWriteOnlyInt32(const std::string &name, int32_t *prop);
+ void RegisterUint32(const std::string &name, uint32_t *prop);
void RegisterString(const std::string &name, std::string *prop);
void RegisterConstString(const std::string &name, const std::string *prop);
void RegisterWriteOnlyString(const std::string &name, std::string *prop);
@@ -194,14 +194,14 @@
void RegisterStrings(const std::string &name, Strings *prop);
void RegisterConstStrings(const std::string &name, const Strings *prop);
void RegisterWriteOnlyStrings(const std::string &name, Strings *prop);
- void RegisterUint8(const std::string &name, uint8 *prop);
- void RegisterConstUint8(const std::string &name, const uint8 *prop);
- void RegisterWriteOnlyUint8(const std::string &name, uint8 *prop);
- void RegisterUint16(const std::string &name, uint16 *prop);
+ void RegisterUint8(const std::string &name, uint8_t *prop);
+ void RegisterConstUint8(const std::string &name, const uint8_t *prop);
+ void RegisterWriteOnlyUint8(const std::string &name, uint8_t *prop);
+ void RegisterUint16(const std::string &name, uint16_t *prop);
void RegisterUint16s(const std::string &name, Uint16s *prop);
- void RegisterConstUint16(const std::string &name, const uint16 *prop);
+ void RegisterConstUint16(const std::string &name, const uint16_t *prop);
void RegisterConstUint16s(const std::string &name, const Uint16s *prop);
- void RegisterWriteOnlyUint16(const std::string &name, uint16 *prop);
+ void RegisterWriteOnlyUint16(const std::string &name, uint16_t *prop);
void RegisterDerivedBool(const std::string &name,
const BoolAccessor &accessor);
diff --git a/property_store_unittest.cc b/property_store_unittest.cc
index e43280d..250a3d8 100644
--- a/property_store_unittest.cc
+++ b/property_store_unittest.cc
@@ -182,15 +182,15 @@
return store.SetBoolProperty(name, new_value, error);
}
-template<> bool PropertyStoreTypedTest<int16>::SetProperty(
+template<> bool PropertyStoreTypedTest<int16_t>::SetProperty(
PropertyStore &store, const string &name, Error *error) {
- int16 new_value = 1;
+ int16_t new_value = 1;
return store.SetInt16Property(name, new_value, error);
}
-template<> bool PropertyStoreTypedTest<int32>::SetProperty(
+template<> bool PropertyStoreTypedTest<int32_t>::SetProperty(
PropertyStore &store, const string &name, Error *error) {
- int32 new_value = 1;
+ int32_t new_value = 1;
return store.SetInt32Property(name, new_value, error);
}
@@ -221,15 +221,15 @@
return store.SetStringsProperty(name, new_value, error);
}
-template<> bool PropertyStoreTypedTest<uint8>::SetProperty(
+template<> bool PropertyStoreTypedTest<uint8_t>::SetProperty(
PropertyStore &store, const string &name, Error *error) {
- uint8 new_value = 1;
+ uint8_t new_value = 1;
return store.SetUint8Property(name, new_value, error);
}
-template<> bool PropertyStoreTypedTest<uint16>::SetProperty(
+template<> bool PropertyStoreTypedTest<uint16_t>::SetProperty(
PropertyStore &store, const string &name, Error *error) {
- uint16 new_value = 1;
+ uint16_t new_value = 1;
return store.SetUint16Property(name, new_value, error);
}
@@ -239,9 +239,9 @@
return store.SetUint16sProperty(name, new_value, error);
}
-template<> bool PropertyStoreTypedTest<uint32>::SetProperty(
+template<> bool PropertyStoreTypedTest<uint32_t>::SetProperty(
PropertyStore &store, const string &name, Error *error) {
- uint32 new_value = 1;
+ uint32_t new_value = 1;
return store.SetUint32Property(name, new_value, error);
}
@@ -325,11 +325,11 @@
}
{
const string keys[] = {"int16p1", "int16p2"};
- int16 values[] = {127, 128};
+ int16_t values[] = {127, 128};
store.RegisterWriteOnlyInt16(keys[0], &values[0]);
store.RegisterInt16(keys[1], &values[1]);
- ReadablePropertyConstIterator<int16> it = store.GetInt16PropertiesIter();
+ ReadablePropertyConstIterator<int16_t> it = store.GetInt16PropertiesIter();
EXPECT_FALSE(it.AtEnd());
EXPECT_EQ(keys[1], it.Key());
EXPECT_EQ(values[1], it.value());
@@ -339,18 +339,18 @@
Error errors[2];
EXPECT_FALSE(store.GetInt16Property(keys[0], NULL, &errors[0]));
EXPECT_EQ(Error::kPermissionDenied, errors[0].type());
- int16 test_value;
+ int16_t test_value;
EXPECT_TRUE(store.GetInt16Property(keys[1], &test_value, &errors[1]));
EXPECT_TRUE(errors[1].IsSuccess());
EXPECT_EQ(values[1], test_value);
}
{
const string keys[] = {"int32p1", "int32p2"};
- int32 values[] = {127, 128};
+ int32_t values[] = {127, 128};
store.RegisterWriteOnlyInt32(keys[0], &values[0]);
store.RegisterInt32(keys[1], &values[1]);
- ReadablePropertyConstIterator<int32> it = store.GetInt32PropertiesIter();
+ ReadablePropertyConstIterator<int32_t> it = store.GetInt32PropertiesIter();
EXPECT_FALSE(it.AtEnd());
EXPECT_EQ(keys[1], it.Key());
EXPECT_EQ(values[1], it.value());
@@ -360,7 +360,7 @@
Error errors[2];
EXPECT_FALSE(store.GetInt32Property(keys[0], NULL, &errors[0]));
EXPECT_EQ(Error::kPermissionDenied, errors[0].type());
- int32 test_value;
+ int32_t test_value;
EXPECT_TRUE(store.GetInt32Property(keys[1], &test_value, &errors[1]));
EXPECT_TRUE(errors[1].IsSuccess());
EXPECT_EQ(values[1], test_value);
@@ -467,11 +467,11 @@
}
{
const string keys[] = {"uint8p1", "uint8p2"};
- uint8 values[] = {127, 128};
+ uint8_t values[] = {127, 128};
store.RegisterWriteOnlyUint8(keys[0], &values[0]);
store.RegisterUint8(keys[1], &values[1]);
- ReadablePropertyConstIterator<uint8> it = store.GetUint8PropertiesIter();
+ ReadablePropertyConstIterator<uint8_t> it = store.GetUint8PropertiesIter();
EXPECT_FALSE(it.AtEnd());
EXPECT_EQ(keys[1], it.Key());
EXPECT_EQ(values[1], it.value());
@@ -481,18 +481,19 @@
Error errors[2];
EXPECT_FALSE(store.GetUint8Property(keys[0], NULL, &errors[0]));
EXPECT_EQ(Error::kPermissionDenied, errors[0].type());
- uint8 test_value;
+ uint8_t test_value;
EXPECT_TRUE(store.GetUint8Property(keys[1], &test_value, &errors[1]));
EXPECT_TRUE(errors[1].IsSuccess());
EXPECT_EQ(values[1], test_value);
}
{
const string keys[] = {"uint16p", "uint16p1"};
- uint16 values[] = {127, 128};
+ uint16_t values[] = {127, 128};
store.RegisterWriteOnlyUint16(keys[0], &values[0]);
store.RegisterUint16(keys[1], &values[1]);
- ReadablePropertyConstIterator<uint16> it = store.GetUint16PropertiesIter();
+ ReadablePropertyConstIterator<uint16_t> it =
+ store.GetUint16PropertiesIter();
EXPECT_FALSE(it.AtEnd());
EXPECT_EQ(keys[1], it.Key());
EXPECT_EQ(values[1], it.value());
@@ -502,7 +503,7 @@
Error errors[2];
EXPECT_FALSE(store.GetUint16Property(keys[0], NULL, &errors[0]));
EXPECT_EQ(Error::kPermissionDenied, errors[0].type());
- uint16 test_value;
+ uint16_t test_value;
EXPECT_TRUE(store.GetUint16Property(keys[1], &test_value, &errors[1]));
EXPECT_TRUE(errors[1].IsSuccess());
EXPECT_EQ(values[1], test_value);
diff --git a/property_store_unittest.h b/property_store_unittest.h
index c8ee5a1..1e9ef6c 100644
--- a/property_store_unittest.h
+++ b/property_store_unittest.h
@@ -28,9 +28,9 @@
class PropertyStoreTest : public testing::TestWithParam< ::DBus::Variant > {
public:
- typedef ::testing::Types<bool, int16, int32, std::string, Stringmap,
- Stringmaps, Strings, uint8, uint16, Uint16s, uint32>
- PropertyTypes;
+ typedef ::testing::Types<bool, int16_t, int32_t, std::string, Stringmap,
+ Stringmaps, Strings, uint8_t, uint16_t, Uint16s,
+ uint32_t> PropertyTypes;
// In real code, it's frowned upon to have non-POD static members, as there
// can be ordering issues if your constructors have side effects.
@@ -65,12 +65,12 @@
}
static bool GetProperty(const PropertyStore &store, const std::string &name,
- int16 *storage, Error *error) {
+ int16_t *storage, Error *error) {
return store.GetInt16Property(name, storage, error);
}
static bool GetProperty(const PropertyStore &store, const std::string &name,
- int32 *storage, Error *error) {
+ int32_t *storage, Error *error) {
return store.GetInt32Property(name, storage, error);
}
@@ -95,12 +95,12 @@
}
static bool GetProperty(const PropertyStore &store, const std::string &name,
- uint8 *storage, Error *error) {
+ uint8_t *storage, Error *error) {
return store.GetUint8Property(name, storage, error);
}
static bool GetProperty(const PropertyStore &store, const std::string &name,
- uint16 *storage, Error *error) {
+ uint16_t *storage, Error *error) {
return store.GetUint16Property(name, storage, error);
}
@@ -110,7 +110,7 @@
}
static bool GetProperty(const PropertyStore &store, const std::string &name,
- uint32 *storage, Error *error) {
+ uint32_t *storage, Error *error) {
return store.GetUint32Property(name, storage, error);
}
@@ -122,12 +122,12 @@
}
static void RegisterProperty(
- PropertyStore *store, const std::string &name, int16 *storage) {
+ PropertyStore *store, const std::string &name, int16_t *storage) {
store->RegisterInt16(name, storage);
}
static void RegisterProperty(
- PropertyStore *store, const std::string &name, int32 *storage) {
+ PropertyStore *store, const std::string &name, int32_t *storage) {
store->RegisterInt32(name, storage);
}
@@ -152,12 +152,12 @@
}
static void RegisterProperty(
- PropertyStore *store, const std::string &name, uint8 *storage) {
+ PropertyStore *store, const std::string &name, uint8_t *storage) {
store->RegisterUint8(name, storage);
}
static void RegisterProperty(
- PropertyStore *store, const std::string &name, uint16 *storage) {
+ PropertyStore *store, const std::string &name, uint16_t *storage) {
store->RegisterUint16(name, storage);
}
@@ -167,7 +167,7 @@
}
static void RegisterProperty(
- PropertyStore *store, const std::string &name, uint32 *storage) {
+ PropertyStore *store, const std::string &name, uint32_t *storage) {
store->RegisterUint32(name, storage);
}
diff --git a/routing_table.cc b/routing_table.cc
index 4568adb..003f586 100644
--- a/routing_table.cc
+++ b/routing_table.cc
@@ -134,7 +134,7 @@
bool RoutingTable::SetDefaultRoute(int interface_index,
const IPAddress &gateway_address,
- uint32 metric) {
+ uint32_t metric) {
SLOG(Route, 2) << __func__ << " index " << interface_index
<< " metric " << metric;
@@ -171,7 +171,7 @@
bool RoutingTable::ConfigureRoutes(int interface_index,
const IPConfigRefPtr &ipconfig,
- uint32 metric) {
+ uint32_t metric) {
bool ret = true;
IPAddress::Family address_family = ipconfig->properties().address_family;
@@ -245,7 +245,7 @@
tables_.erase(interface_index);
}
-void RoutingTable::SetDefaultMetric(int interface_index, uint32 metric) {
+void RoutingTable::SetDefaultMetric(int interface_index, uint32_t metric) {
SLOG(Route, 2) << __func__ << " index " << interface_index
<< " metric " << metric;
@@ -280,13 +280,13 @@
return false;
}
- uint32 interface_index_u32 = 0;
+ uint32_t interface_index_u32 = 0;
if (!message.GetAttribute(RTA_OIF).ConvertToCPUUInt32(&interface_index_u32)) {
return false;
}
*interface_index = interface_index_u32;
- uint32 metric = 0;
+ uint32_t metric = 0;
if (message.HasAttribute(RTA_PRIORITY)) {
message.GetAttribute(RTA_PRIORITY).ConvertToCPUUInt32(&metric);
}
@@ -398,7 +398,7 @@
}
}
-bool RoutingTable::ApplyRoute(uint32 interface_index,
+bool RoutingTable::ApplyRoute(uint32_t interface_index,
const RoutingTableEntry &entry,
RTNLMessage::Mode mode,
unsigned int flags) {
@@ -447,9 +447,9 @@
// NLM_F_REPLACE flag by itself. We have to explicitly remove the old route.
// We do so after creating the route at a new metric so there is no traffic
// disruption to existing network streams.
-void RoutingTable::ReplaceMetric(uint32 interface_index,
+void RoutingTable::ReplaceMetric(uint32_t interface_index,
RoutingTableEntry *entry,
- uint32 metric) {
+ uint32_t metric) {
SLOG(Route, 2) << __func__ << " index " << interface_index
<< " metric " << metric;
RoutingTableEntry new_entry = *entry;
@@ -519,7 +519,7 @@
bool RoutingTable::CreateBlackholeRoute(int interface_index,
IPAddress::Family family,
- uint32 metric) {
+ uint32_t metric) {
SLOG(Route, 2) << base::StringPrintf(
"%s: index %d family %s metric %d",
__func__, interface_index,
diff --git a/routing_table.h b/routing_table.h
index 81949a6..78b5ce3 100644
--- a/routing_table.h
+++ b/routing_table.h
@@ -39,14 +39,14 @@
typedef base::Callback<void(int, const RoutingTableEntry &)> Callback;
Query() : sequence(0), tag(0) {}
- Query(uint32 sequence_in,
+ Query(uint32_t sequence_in,
int tag_in,
Callback callback_in)
: sequence(sequence_in),
tag(tag_in),
callback(callback_in) {}
- uint32 sequence;
+ uint32_t sequence;
int tag;
Callback callback;
};
@@ -72,19 +72,19 @@
// |metric|.
virtual bool SetDefaultRoute(int interface_index,
const IPAddress &gateway_address,
- uint32 metric);
+ uint32_t metric);
// Configure routing table entries from the "routes" portion of |ipconfig|.
// Returns true if all routes were installed successfully, false otherwise.
virtual bool ConfigureRoutes(int interface_index,
const IPConfigRefPtr &ipconfig,
- uint32 metric);
+ uint32_t metric);
// Create a blackhole route for a given IP family. Returns true
// on successfully sending the route request, false otherwise.
virtual bool CreateBlackholeRoute(int interface_index,
IPAddress::Family family,
- uint32 metric);
+ uint32_t metric);
// Create a route to a link-attached remote host. |remote_address|
// must be directly reachable from |local_address|. Returns true
@@ -108,7 +108,7 @@
virtual void ResetTable(int interface_index);
// Set the metric (priority) on existing default routes for an interface.
- virtual void SetDefaultMetric(int interface_index, uint32 metric);
+ virtual void SetDefaultMetric(int interface_index, uint32_t metric);
// Get the default route to |destination| through |interface_index| and create
// a host route to that destination. When creating the route, tag our local
@@ -133,7 +133,7 @@
int *interface_index,
RoutingTableEntry *entry);
void RouteMsgHandler(const RTNLMessage &msg);
- bool ApplyRoute(uint32 interface_index,
+ bool ApplyRoute(uint32_t interface_index,
const RoutingTableEntry &entry,
RTNLMessage::Mode mode,
unsigned int flags);
@@ -143,9 +143,9 @@
IPAddress::Family family,
RoutingTableEntry **entry);
- void ReplaceMetric(uint32 interface_index,
+ void ReplaceMetric(uint32_t interface_index,
RoutingTableEntry *entry,
- uint32 metric);
+ uint32_t metric);
static const char kRouteFlushPath4[];
static const char kRouteFlushPath6[];
diff --git a/routing_table_entry.h b/routing_table_entry.h
index a0e8c23..c34d98d 100644
--- a/routing_table_entry.h
+++ b/routing_table_entry.h
@@ -30,7 +30,7 @@
RoutingTableEntry(const IPAddress &dst_in,
const IPAddress &src_in,
const IPAddress &gateway_in,
- uint32 metric_in,
+ uint32_t metric_in,
unsigned char scope_in,
bool from_rtnl_in)
: dst(dst_in),
@@ -44,7 +44,7 @@
RoutingTableEntry(const IPAddress &dst_in,
const IPAddress &src_in,
const IPAddress &gateway_in,
- uint32 metric_in,
+ uint32_t metric_in,
unsigned char scope_in,
bool from_rtnl_in,
int tag_in)
@@ -92,7 +92,7 @@
IPAddress dst;
IPAddress src;
IPAddress gateway;
- uint32 metric;
+ uint32_t metric;
unsigned char scope;
bool from_rtnl;
int tag;
diff --git a/routing_table_unittest.cc b/routing_table_unittest.cc
index 950dd34..81b063c 100644
--- a/routing_table_unittest.cc
+++ b/routing_table_unittest.cc
@@ -67,13 +67,13 @@
}
void SendRouteEntry(RTNLMessage::Mode mode,
- uint32 interface_index,
+ uint32_t interface_index,
const RoutingTableEntry &entry);
void SendRouteEntryWithSeqAndProto(RTNLMessage::Mode mode,
- uint32 interface_index,
+ uint32_t interface_index,
const RoutingTableEntry &entry,
- uint32 seq,
+ uint32_t seq,
unsigned char proto);
void SendRouteMessage(const RTNLMessage &msg);
@@ -84,8 +84,8 @@
}
protected:
- static const uint32 kTestDeviceIndex0;
- static const uint32 kTestDeviceIndex1;
+ static const uint32_t kTestDeviceIndex0;
+ static const uint32_t kTestDeviceIndex1;
static const char kTestDeviceName0[];
static const char kTestDeviceNetAddress4[];
static const char kTestForeignNetAddress4[];
@@ -99,7 +99,7 @@
static const char kTestRemoteNetmask4[];
static const char kTestRemoteNetwork4[];
static const int kTestRemotePrefix4;
- static const uint32 kTestRequestSeq;
+ static const uint32_t kTestRequestSeq;
static const int kTestRouteTag;
class QueryCallbackTarget {
@@ -137,8 +137,8 @@
StrictMock<MockRTNLHandler> rtnl_handler_;
};
-const uint32 RoutingTableTest::kTestDeviceIndex0 = 12345;
-const uint32 RoutingTableTest::kTestDeviceIndex1 = 67890;
+const uint32_t RoutingTableTest::kTestDeviceIndex0 = 12345;
+const uint32_t RoutingTableTest::kTestDeviceIndex1 = 67890;
const char RoutingTableTest::kTestDeviceName0[] = "test-device0";
const char RoutingTableTest::kTestDeviceNetAddress4[] = "192.168.2.0/24";
const char RoutingTableTest::kTestForeignNetAddress4[] = "192.168.2.2";
@@ -152,7 +152,7 @@
const char RoutingTableTest::kTestRemoteNetmask4[] = "255.255.255.0";
const char RoutingTableTest::kTestRemoteNetwork4[] = "192.168.100.0";
const int RoutingTableTest::kTestRemotePrefix4 = 24;
-const uint32 RoutingTableTest::kTestRequestSeq = 456;
+const uint32_t RoutingTableTest::kTestRequestSeq = 456;
const int RoutingTableTest::kTestRouteTag = 789;
namespace {
@@ -160,8 +160,8 @@
MATCHER_P3(IsBlackholeRoutingPacket, index, family, metric, "") {
const RTNLMessage::RouteStatus &status = arg->route_status();
- uint32 oif;
- uint32 priority;
+ uint32_t oif;
+ uint32_t priority;
return
arg->type() == RTNLMessage::kTypeRoute &&
@@ -183,8 +183,8 @@
MATCHER_P4(IsRoutingPacket, mode, index, entry, flags, "") {
const RTNLMessage::RouteStatus &status = arg->route_status();
- uint32 oif;
- uint32 priority;
+ uint32_t oif;
+ uint32_t priority;
return
arg->type() == RTNLMessage::kTypeRoute &&
@@ -214,16 +214,16 @@
} // namespace
void RoutingTableTest::SendRouteEntry(RTNLMessage::Mode mode,
- uint32 interface_index,
+ uint32_t interface_index,
const RoutingTableEntry &entry) {
SendRouteEntryWithSeqAndProto(mode, interface_index, entry, 0, RTPROT_BOOT);
}
void RoutingTableTest::SendRouteEntryWithSeqAndProto(
RTNLMessage::Mode mode,
- uint32 interface_index,
+ uint32_t interface_index,
const RoutingTableEntry &entry,
- uint32 seq,
+ uint32_t seq,
unsigned char proto) {
RTNLMessage msg(
RTNLMessage::kTypeRoute,
@@ -541,7 +541,7 @@
MATCHER_P2(IsRoutingQuery, destination, index, "") {
const RTNLMessage::RouteStatus &status = arg->route_status();
- uint32 oif;
+ uint32_t oif;
return
arg->type() == RTNLMessage::kTypeRoute &&
@@ -798,7 +798,7 @@
}
TEST_F(RoutingTableTest, CreateBlackholeRoute) {
- const uint32 kMetric = 2;
+ const uint32_t kMetric = 2;
EXPECT_CALL(rtnl_handler_,
SendMessage(IsBlackholeRoutingPacket(kTestDeviceIndex0,
IPAddress::kFamilyIPv6,
diff --git a/rtnl_handler.cc b/rtnl_handler.cc
index 389582b..e59120c 100644
--- a/rtnl_handler.cc
+++ b/rtnl_handler.cc
@@ -183,7 +183,7 @@
}
}
-void RTNLHandler::NextRequest(uint32 seq) {
+void RTNLHandler::NextRequest(uint32_t seq) {
int flag = 0;
RTNLMessage::Type type;
diff --git a/rtnl_handler.h b/rtnl_handler.h
index fec5d24..995c8b7 100644
--- a/rtnl_handler.h
+++ b/rtnl_handler.h
@@ -124,7 +124,7 @@
// Dispatches an rtnl message to all listeners
void DispatchEvent(int type, const RTNLMessage &msg);
// Send the next table-dump request to the kernel
- void NextRequest(uint32 seq);
+ void NextRequest(uint32_t seq);
// Parse an incoming rtnl message from the kernel
void ParseRTNL(InputData *data);
@@ -142,9 +142,9 @@
bool in_request_;
int rtnl_socket_;
- uint32 request_flags_;
- uint32 request_sequence_;
- uint32 last_dump_sequence_;
+ uint32_t request_flags_;
+ uint32_t request_sequence_;
+ uint32_t last_dump_sequence_;
std::vector<RTNLListener *> listeners_;
base::Callback<void(InputData *)> rtnl_callback_;
diff --git a/rtnl_handler_unittest.cc b/rtnl_handler_unittest.cc
index 5a23456..2d5b1f8 100644
--- a/rtnl_handler_unittest.cc
+++ b/rtnl_handler_unittest.cc
@@ -121,7 +121,7 @@
0,
kTestDeviceIndex,
IPAddress::kFamilyIPv4);
- message.SetAttribute(static_cast<uint16>(IFLA_IFNAME),
+ message.SetAttribute(static_cast<uint16_t>(IFLA_IFNAME),
ByteString(string(kTestDeviceName), true));
ByteString b(message.Encode());
InputData data(b.GetData(), b.GetLength());
diff --git a/rtnl_message.cc b/rtnl_message.cc
index 2f3f81a..36142ee 100644
--- a/rtnl_message.cc
+++ b/rtnl_message.cc
@@ -40,8 +40,8 @@
RTNLMessage::RTNLMessage(Type type,
Mode mode,
unsigned int flags,
- uint32 seq,
- uint32 pid,
+ uint32_t seq,
+ uint32_t pid,
int interface_index,
IPAddress::Family family)
: type_(type),
@@ -227,9 +227,9 @@
// Parse the option header.
const NDUserOptionHeader *nd_user_option_header =
reinterpret_cast<const NDUserOptionHeader *>(
- reinterpret_cast<const uint8 *>(&hdr->nd_user_opt) +
+ reinterpret_cast<const uint8_t *>(&hdr->nd_user_opt) +
sizeof(struct nduseroptmsg));
- uint32 lifetime = ntohl(nd_user_option_header->lifetime);
+ uint32_t lifetime = ntohl(nd_user_option_header->lifetime);
// Verify option length.
// The length field in the header is in units of 8 octets.
@@ -239,8 +239,8 @@
}
// Determine option data pointer and data length.
- const uint8 *option_data =
- reinterpret_cast<const uint8 *>(nd_user_option_header + 1);
+ const uint8_t *option_data =
+ reinterpret_cast<const uint8_t *>(nd_user_option_header + 1);
int data_len = opt_len - sizeof(NDUserOptionHeader);
if (nd_user_option_header->type == ND_OPT_DNSSL) {
@@ -256,9 +256,9 @@
return false;
}
-bool RTNLMessage::ParseRdnssOption(const uint8 *data,
+bool RTNLMessage::ParseRdnssOption(const uint8_t *data,
int length,
- uint32 lifetime) {
+ uint32_t lifetime) {
const int addr_length = IPAddress::GetAddressLength(IPAddress::kFamilyIPv6);
// Verify data size are multiple of individual address size.
diff --git a/rtnl_message.h b/rtnl_message.h
index 1d7ca57..6dcca98 100644
--- a/rtnl_message.h
+++ b/rtnl_message.h
@@ -106,11 +106,11 @@
struct RdnssOption {
RdnssOption()
: lifetime(0) {}
- RdnssOption(uint32 lifetime_in,
+ RdnssOption(uint32_t lifetime_in,
std::vector<IPAddress> addresses_in)
: lifetime(lifetime_in),
addresses(addresses_in) {}
- uint32 lifetime;
+ uint32_t lifetime;
std::vector<IPAddress> addresses;
};
@@ -120,8 +120,8 @@
RTNLMessage(Type type,
Mode mode,
unsigned int flags,
- uint32 seq,
- uint32 pid,
+ uint32_t seq,
+ uint32_t pid,
int interface_index,
IPAddress::Family family);
@@ -135,11 +135,11 @@
// Getters and setters
Type type() const { return type_; }
Mode mode() const { return mode_; }
- uint16 flags() const { return flags_; }
- uint32 seq() const { return seq_; }
- void set_seq(uint32 seq) { seq_ = seq; }
- uint32 pid() const { return pid_; }
- uint32 interface_index() const { return interface_index_; }
+ uint16_t flags() const { return flags_; }
+ uint32_t seq() const { return seq_; }
+ void set_seq(uint32_t seq) { seq_ = seq; }
+ uint32_t pid() const { return pid_; }
+ uint32_t interface_index() const { return interface_index_; }
IPAddress::Family family() const { return family_; }
const LinkStatus &link_status() const { return link_status_; }
@@ -159,16 +159,16 @@
rdnss_option_ = rdnss_option;
}
// GLint hates "unsigned short", and I don't blame it, but that's the
- // type that's used in the system headers. Use uint16 instead and hope
+ // type that's used in the system headers. Use uint16_t instead and hope
// that the conversion never ends up truncating on some strange platform.
- bool HasAttribute(uint16 attr) const {
+ bool HasAttribute(uint16_t attr) const {
return ContainsKey(attributes_, attr);
}
- const ByteString GetAttribute(uint16 attr) const {
+ const ByteString GetAttribute(uint16_t attr) const {
return HasAttribute(attr) ?
attributes_.find(attr)->second : ByteString(0);
}
- void SetAttribute(uint16 attr, const ByteString &val) {
+ void SetAttribute(uint16_t attr, const ByteString &val) {
attributes_[attr] = val;
}
@@ -190,25 +190,25 @@
Mode mode,
rtattr **attr_data,
int *attr_length);
- bool ParseRdnssOption(const uint8 *data,
+ bool ParseRdnssOption(const uint8_t *data,
int length,
- uint32 lifetime);
+ uint32_t lifetime);
bool EncodeLink(RTNLHeader *hdr) const;
bool EncodeAddress(RTNLHeader *hdr) const;
bool EncodeRoute(RTNLHeader *hdr) const;
Type type_;
Mode mode_;
- uint16 flags_;
- uint32 seq_;
- uint32 pid_;
+ uint16_t flags_;
+ uint32_t seq_;
+ uint32_t pid_;
unsigned int interface_index_;
IPAddress::Family family_;
LinkStatus link_status_;
AddressStatus address_status_;
RouteStatus route_status_;
RdnssOption rdnss_option_;
- std::unordered_map<uint16, ByteString> attributes_;
+ std::unordered_map<uint16_t, ByteString> attributes_;
DISALLOW_COPY_AND_ASSIGN(RTNLMessage);
};
diff --git a/rtnl_message_unittest.cc b/rtnl_message_unittest.cc
index ab043bd..fc12147 100644
--- a/rtnl_message_unittest.cc
+++ b/rtnl_message_unittest.cc
@@ -36,7 +36,7 @@
const unsigned int kNewLinkMessageWlan0InterfaceFlags =
IFF_BROADCAST | IFF_MULTICAST | IFF_UP | IFF_LOWER_UP | IFF_RUNNING;
const unsigned int kNewLinkMessageWlan0InterfaceFlagsChange = 0;
-const uint32 kNewLinkMessageWlan0MTU = 1500;
+const uint32_t kNewLinkMessageWlan0MTU = 1500;
const char kNewLinkMessageWlan0MACAddress[] = "\xc0\xf8\xda\x05\x03\x0b";
const char kNewLinkMessageWlan0InterfaceName[] = "wlan0";
const char kNewLinkMessageWlan0Qdisc[] = "mq";
@@ -177,7 +177,7 @@
const unsigned int kDelLinkMessageEth0InterfaceFlags =
IFF_BROADCAST | IFF_MULTICAST;
const unsigned int kDelLinkMessageEth0InterfaceFlagsChange = 0xffffffff;
-const uint32 kDelLinkMessageEth0MTU = 1500;
+const uint32_t kDelLinkMessageEth0MTU = 1500;
const char kDelLinkMessageEth0MACAddress[] = "\x68\x7f\x74\xba\xef\xc7";
const char kDelLinkMessageEth0InterfacName[] = "eth0";
const char kDelLinkMessageEth0Qdisc[] = "noop";
@@ -378,7 +378,7 @@
unsigned int change,
ByteString address,
ByteString name,
- uint32 mtu,
+ uint32_t mtu,
ByteString qdisc,
int oper_state) {
RTNLMessage msg;
@@ -401,7 +401,7 @@
EXPECT_TRUE(msg.GetAttribute(IFLA_IFNAME).Equals(name));
EXPECT_TRUE(msg.HasAttribute(IFLA_MTU));
- uint32 mtu_val;
+ uint32_t mtu_val;
EXPECT_TRUE(msg.GetAttribute(IFLA_MTU).ConvertToCPUUInt32(&mtu_val));
EXPECT_EQ(mtu, mtu_val);
@@ -484,7 +484,7 @@
if (interface_index >= 0) {
EXPECT_TRUE(msg.HasAttribute(RTA_OIF));
- uint32 int_val;
+ uint32_t int_val;
EXPECT_TRUE(msg.GetAttribute(RTA_OIF).ConvertToCPUUInt32(&int_val));
EXPECT_EQ(interface_index, int_val);
} else {
@@ -492,7 +492,7 @@
}
if (metric >= 0) {
EXPECT_TRUE(msg.HasAttribute(RTA_PRIORITY));
- uint32 metric_val;
+ uint32_t metric_val;
EXPECT_TRUE(
msg.GetAttribute(RTA_PRIORITY).ConvertToCPUUInt32(&metric_val));
EXPECT_EQ(metric, metric_val);
@@ -504,7 +504,7 @@
void TestParseRdnss(const ByteString &packet,
RTNLMessage::Mode mode,
int interface_index,
- uint32 lifetime,
+ uint32_t lifetime,
const std::string &dns_server_addresses) {
RTNLMessage msg;
@@ -632,7 +632,7 @@
TEST_F(RTNLMessageTest, NewRdnssOption) {
int interface_index = 1;
- uint32 lifetime = 0xffffffff;
+ uint32_t lifetime = 0xffffffff;
std::string dns_server_addresses =
"2001:db8:100:f101::1, 2001:db8:100:f101::2";
diff --git a/service.cc b/service.cc
index 85dcf65..10932be 100644
--- a/service.cc
+++ b/service.cc
@@ -90,12 +90,13 @@
const char Service::kStorageUIData[] = "UIData";
const char Service::kStorageConnectionId[] = "ConnectionId";
-const uint8 Service::kStrengthMax = 100;
-const uint8 Service::kStrengthMin = 0;
+const uint8_t Service::kStrengthMax = 100;
+const uint8_t Service::kStrengthMin = 0;
-const uint64 Service::kMaxAutoConnectCooldownTimeMilliseconds = 30 * 60 * 1000;
-const uint64 Service::kMinAutoConnectCooldownTimeMilliseconds = 1000;
-const uint64 Service::kAutoConnectCooldownBackoffFactor = 2;
+const uint64_t Service::kMaxAutoConnectCooldownTimeMilliseconds =
+ 30 * 60 * 1000;
+const uint64_t Service::kMinAutoConnectCooldownTimeMilliseconds = 1000;
+const uint64_t Service::kAutoConnectCooldownBackoffFactor = 2;
const int Service::kDisconnectsMonitorSeconds = 5 * 60;
const int Service::kMisconnectsMonitorSeconds = 5 * 60;
@@ -590,7 +591,7 @@
error->CopyFrom(set_error);
}
}
- SLOG(Service, 5) << "Configuring int32 properties:";
+ SLOG(Service, 5) << "Configuring int32_t properties:";
for (const auto &int_it : args.int_properties()) {
if (ContainsKey(parameters_ignored_for_configure_, int_it.first)) {
continue;
@@ -652,11 +653,11 @@
return false;
}
}
- SLOG(Service, 5) << "Checking int32 properties:";
+ SLOG(Service, 5) << "Checking int32_t properties:";
for (const auto &int_it : args.int_properties()) {
SLOG(Service, 5) << " " << int_it.first;
Error get_error;
- int32 value;
+ int32_t value;
if (!store_.GetInt32Property(int_it.first, &value, &get_error) ||
value != int_it.second) {
return false;
@@ -973,7 +974,7 @@
return true;
}
-uint16 Service::SecurityLevel() {
+uint16_t Service::SecurityLevel() {
return (crypto_algorithm_ << 2) | (key_rotation_ << 1) | endpoint_auth_;
}
@@ -1242,11 +1243,11 @@
void Service::HelpRegisterDerivedInt32(
const string &name,
- int32(Service::*get)(Error *error),
- bool(Service::*set)(const int32&, Error *)) {
+ int32_t(Service::*get)(Error *error),
+ bool(Service::*set)(const int32_t&, Error *)) {
store_.RegisterDerivedInt32(
name,
- Int32Accessor(new CustomAccessor<Service, int32>(this, get, set)));
+ Int32Accessor(new CustomAccessor<Service, int32_t>(this, get, set)));
}
void Service::HelpRegisterDerivedString(
@@ -1269,10 +1270,10 @@
void Service::HelpRegisterConstDerivedUint16(
const string &name,
- uint16(Service::*get)(Error *) const) {
+ uint16_t(Service::*get)(Error *) const) {
store_.RegisterDerivedUint16(
name,
- Uint16Accessor(new CustomReadOnlyAccessor<Service, uint16>(this, get)));
+ Uint16Accessor(new CustomReadOnlyAccessor<Service, uint16_t>(this, get)));
}
void Service::HelpRegisterConstDerivedStrings(
@@ -1448,11 +1449,11 @@
SaveToProfile();
}
-int32 Service::GetPriority(Error *error) {
+int32_t Service::GetPriority(Error *error) {
return priority_;
}
-bool Service::SetPriority(const int32 &priority, Error *error) {
+bool Service::SetPriority(const int32_t &priority, Error *error) {
if (priority_ == priority) {
return false;
}
@@ -1483,9 +1484,9 @@
return (profile_ != old_profile);
}
-uint16 Service::GetHTTPProxyPort(Error */*error*/) const {
+uint16_t Service::GetHTTPProxyPort(Error */*error*/) const {
if (http_proxy_.get()) {
- return static_cast<uint16>(http_proxy_->proxy_port());
+ return static_cast<uint16_t>(http_proxy_->proxy_port());
}
return 0;
}
@@ -1551,7 +1552,7 @@
adaptor()->EmitStringChanged(kNameProperty, friendly_name_);
}
-void Service::SetStrength(uint8 strength) {
+void Service::SetStrength(uint8_t strength) {
if (strength == strength_) {
return;
}
diff --git a/service.h b/service.h
index e4f9aca..a667c22 100644
--- a/service.h
+++ b/service.h
@@ -82,8 +82,8 @@
static const char kStorageUIData[];
static const char kStorageConnectionId[];
- static const uint8 kStrengthMax;
- static const uint8 kStrengthMin;
+ static const uint8_t kStrengthMax;
+ static const uint8_t kStrengthMin;
enum ConnectFailure {
kFailureUnknown,
@@ -330,7 +330,7 @@
// connected state. This value is non-zero for the first service transition
// to the connected state after a resume.
virtual void SendPostReadyStateMetrics(
- int64 /*time_resume_to_ready_milliseconds*/) const {}
+ int64_t /*time_resume_to_ready_milliseconds*/) const {}
bool auto_connect() const { return auto_connect_; }
void SetAutoConnect(bool connect);
@@ -364,18 +364,18 @@
// and broadcasts the new value
void SetHasEverConnected(bool has_ever_connected);
- int32 priority() const { return priority_; }
- bool SetPriority(const int32 &priority, Error *error);
+ int32_t priority() const { return priority_; }
+ bool SetPriority(const int32_t &priority, Error *error);
size_t crypto_algorithm() const { return crypto_algorithm_; }
bool key_rotation() const { return key_rotation_; }
bool endpoint_auth() const { return endpoint_auth_; }
- void SetStrength(uint8 strength);
+ void SetStrength(uint8_t strength);
- // uint8 streams out as a char. Coerce to a larger type, so that
+ // uint8_t streams out as a char. Coerce to a larger type, so that
// it prints as a number.
- uint16 strength() const { return strength_; }
+ uint16_t strength() const { return strength_; }
virtual Technology::Identifier technology() const { return technology_; }
std::string GetTechnologyString() const;
@@ -522,15 +522,15 @@
void(Service::*clear)(Error *error));
void HelpRegisterDerivedInt32(
const std::string &name,
- int32(Service::*get)(Error *error),
- bool(Service::*set)(const int32 &value, Error *error));
+ int32_t(Service::*get)(Error *error),
+ bool(Service::*set)(const int32_t &value, Error *error));
void HelpRegisterDerivedString(
const std::string &name,
std::string(Service::*get)(Error *error),
bool(Service::*set)(const std::string &value, Error *error));
void HelpRegisterConstDerivedUint16(
const std::string &name,
- uint16(Service::*get)(Error *error) const);
+ uint16_t(Service::*get)(Error *error) const);
void HelpRegisterConstDerivedRpcIdentifier(
const std::string &name,
std::string(Service::*get)(Error *) const);
@@ -680,9 +680,9 @@
static const char kServiceSortSerialNumber[];
static const char kServiceSortTechnology[];
- static const uint64 kMaxAutoConnectCooldownTimeMilliseconds;
- static const uint64 kMinAutoConnectCooldownTimeMilliseconds;
- static const uint64 kAutoConnectCooldownBackoffFactor;
+ static const uint64_t kMaxAutoConnectCooldownTimeMilliseconds;
+ static const uint64_t kMinAutoConnectCooldownTimeMilliseconds;
+ static const uint64_t kAutoConnectCooldownBackoffFactor;
static const int kDisconnectsMonitorSeconds;
static const int kMisconnectsMonitorSeconds;
@@ -706,13 +706,13 @@
// property value.
virtual bool SetNameProperty(const std::string &name, Error *error);
- int32 GetPriority(Error *error);
+ int32_t GetPriority(Error *error);
std::string GetProfileRpcId(Error *error);
bool SetProfileRpcId(const std::string &profile, Error *error);
// Returns TCP port of service's HTTP proxy in host order.
- uint16 GetHTTPProxyPort(Error *error) const;
+ uint16_t GetHTTPProxyPort(Error *error) const;
std::string GetProxyConfig(Error *error);
bool SetProxyConfig(const std::string &proxy_config, Error *error);
@@ -754,7 +754,7 @@
// Linearize security parameters (crypto algorithm, key rotation, endpoint
// authentication) for comparison.
- uint16 SecurityLevel();
+ uint16_t SecurityLevel();
// WeakPtrFactory comes first, so that other fields can use it.
base::WeakPtrFactory<Service> weak_ptr_factory_;
@@ -774,15 +774,15 @@
std::string error_;
std::string error_details_;
std::string previous_error_;
- int32 previous_error_serial_number_;
+ int32_t previous_error_serial_number_;
bool explicitly_disconnected_;
bool is_in_user_connect_;
- int32 priority_;
- uint8 crypto_algorithm_;
+ int32_t priority_;
+ uint8_t crypto_algorithm_;
bool key_rotation_;
bool endpoint_auth_;
- uint8 strength_;
+ uint8_t strength_;
std::string proxy_config_;
std::string ui_data_;
std::string guid_;
@@ -799,7 +799,7 @@
std::deque<Timestamp> misconnects_; // Failures to connect.
base::CancelableClosure reenable_auto_connect_task_;
- uint64 auto_connect_cooldown_milliseconds_;
+ uint64_t auto_connect_cooldown_milliseconds_;
ProfileRefPtr profile_;
PropertyStore store_;
diff --git a/service_dbus_adaptor.cc b/service_dbus_adaptor.cc
index 78f7478..d126068 100644
--- a/service_dbus_adaptor.cc
+++ b/service_dbus_adaptor.cc
@@ -36,13 +36,13 @@
PropertyChanged(name, DBusAdaptor::BoolToVariant(value));
}
-void ServiceDBusAdaptor::EmitUint8Changed(const string &name, uint8 value) {
+void ServiceDBusAdaptor::EmitUint8Changed(const string &name, uint8_t value) {
SLOG(DBus, 2) << __func__ << ": Service " << service_->unique_name()
<< " " << name;
PropertyChanged(name, DBusAdaptor::ByteToVariant(value));
}
-void ServiceDBusAdaptor::EmitUint16Changed(const string &name, uint16 value) {
+void ServiceDBusAdaptor::EmitUint16Changed(const string &name, uint16_t value) {
SLOG(DBus, 2) << __func__ << ": Service " << service_->unique_name()
<< " " << name;
PropertyChanged(name, DBusAdaptor::Uint16ToVariant(value));
@@ -55,7 +55,7 @@
PropertyChanged(name, DBusAdaptor::Uint16sToVariant(value));
}
-void ServiceDBusAdaptor::EmitUintChanged(const string &name, uint32 value) {
+void ServiceDBusAdaptor::EmitUintChanged(const string &name, uint32_t value) {
SLOG(DBus, 2) << __func__ << ": Service " << service_->unique_name()
<< " " << name;
PropertyChanged(name, DBusAdaptor::Uint32ToVariant(value));
diff --git a/service_dbus_adaptor.h b/service_dbus_adaptor.h
index e3d5767..638bdb9 100644
--- a/service_dbus_adaptor.h
+++ b/service_dbus_adaptor.h
@@ -37,11 +37,11 @@
virtual const std::string &GetRpcIdentifier() { return path(); }
virtual void UpdateConnected();
virtual void EmitBoolChanged(const std::string &name, bool value);
- virtual void EmitUint8Changed(const std::string &name, uint8 value);
- virtual void EmitUint16Changed(const std::string &name, uint16 value);
+ virtual void EmitUint8Changed(const std::string &name, uint8_t value);
+ virtual void EmitUint16Changed(const std::string &name, uint16_t value);
virtual void EmitUint16sChanged(const std::string &name,
const Uint16s &value);
- virtual void EmitUintChanged(const std::string &name, uint32 value);
+ virtual void EmitUintChanged(const std::string &name, uint32_t value);
virtual void EmitIntChanged(const std::string &name, int value);
virtual void EmitRpcIdentifierChanged(
const std::string &name, const std::string &value);
diff --git a/service_property_change_notifier.cc b/service_property_change_notifier.cc
index 80d8e3e..1339ea8 100644
--- a/service_property_change_notifier.cc
+++ b/service_property_change_notifier.cc
@@ -34,7 +34,7 @@
void ServicePropertyChangeNotifier::AddUint8PropertyObserver(
const string &name, Uint8Accessor accessor) {
property_observers_.emplace_back(
- new PropertyObserver<uint8>(
+ new PropertyObserver<uint8_t>(
accessor,
Bind(&ServicePropertyChangeNotifier::Uint8PropertyUpdater,
base::Unretained(this),
@@ -44,7 +44,7 @@
void ServicePropertyChangeNotifier::AddUint16PropertyObserver(
const string &name, Uint16Accessor accessor) {
property_observers_.emplace_back(
- new PropertyObserver<uint16>(
+ new PropertyObserver<uint16_t>(
accessor,
Bind(&ServicePropertyChangeNotifier::Uint16PropertyUpdater,
base::Unretained(this),
@@ -64,7 +64,7 @@
void ServicePropertyChangeNotifier::AddUintPropertyObserver(
const string &name, Uint32Accessor accessor) {
property_observers_.emplace_back(
- new PropertyObserver<uint32>(
+ new PropertyObserver<uint32_t>(
accessor,
Bind(&ServicePropertyChangeNotifier::Uint32PropertyUpdater,
base::Unretained(this),
@@ -74,7 +74,7 @@
void ServicePropertyChangeNotifier::AddIntPropertyObserver(
const string &name, Int32Accessor accessor) {
property_observers_.emplace_back(
- new PropertyObserver<int32>(
+ new PropertyObserver<int32_t>(
accessor,
Bind(&ServicePropertyChangeNotifier::Int32PropertyUpdater,
base::Unretained(this),
@@ -123,22 +123,22 @@
}
void ServicePropertyChangeNotifier::Uint8PropertyUpdater(const string &name,
- const uint8 &value) {
+ const uint8_t &value) {
rpc_adaptor_->EmitUint8Changed(name, value);
}
-void ServicePropertyChangeNotifier::Uint16PropertyUpdater(const string &name,
- const uint16 &value) {
+void ServicePropertyChangeNotifier::Uint16PropertyUpdater(
+ const string &name, const uint16_t &value) {
rpc_adaptor_->EmitUint16Changed(name, value);
}
-void ServicePropertyChangeNotifier::Uint32PropertyUpdater(const string &name,
- const uint32 &value) {
+void ServicePropertyChangeNotifier::Uint32PropertyUpdater(
+ const string &name, const uint32_t &value) {
rpc_adaptor_->EmitUintChanged(name, value);
}
void ServicePropertyChangeNotifier::Int32PropertyUpdater(const string &name,
- const int32 &value) {
+ const int32_t &value) {
rpc_adaptor_->EmitIntChanged(name, value);
}
diff --git a/service_property_change_notifier.h b/service_property_change_notifier.h
index b0b10cc..8307e7b 100644
--- a/service_property_change_notifier.h
+++ b/service_property_change_notifier.h
@@ -52,10 +52,10 @@
private:
// Redirects templated calls to a value reference to a by-copy version.
void BoolPropertyUpdater(const std::string &name, const bool &value);
- void Uint8PropertyUpdater(const std::string &name, const uint8 &value);
- void Uint16PropertyUpdater(const std::string &name, const uint16 &value);
- void Uint32PropertyUpdater(const std::string &name, const uint32 &value);
- void Int32PropertyUpdater(const std::string &name, const int32 &value);
+ void Uint8PropertyUpdater(const std::string &name, const uint8_t &value);
+ void Uint16PropertyUpdater(const std::string &name, const uint16_t &value);
+ void Uint32PropertyUpdater(const std::string &name, const uint32_t &value);
+ void Int32PropertyUpdater(const std::string &name, const int32_t &value);
ServiceAdaptorInterface *rpc_adaptor_;
std::vector<scoped_ptr<PropertyObserverInterface>> property_observers_;
diff --git a/service_property_change_test.cc b/service_property_change_test.cc
index 6dbdc92..42d2b2a 100644
--- a/service_property_change_test.cc
+++ b/service_property_change_test.cc
@@ -68,7 +68,7 @@
service->SetProxyConfig("some garbage", &error);
Mock::VerifyAndClearExpectations(adaptor);
- uint8 strength = service->strength();
+ uint8_t strength = service->strength();
EXPECT_CALL(*adaptor,
EmitUint8Changed(kSignalStrengthProperty, _));
service->SetStrength(strength+1);
diff --git a/service_unittest.cc b/service_unittest.cc
index 32b06dd..9d8bfd3 100644
--- a/service_unittest.cc
+++ b/service_unittest.cc
@@ -269,7 +269,7 @@
}
{
::DBus::Error dbus_error;
- int32 expected = 127;
+ int32_t expected = 127;
service_->mutable_store()->SetInt32Property(kPriorityProperty,
expected,
&error);
@@ -1012,7 +1012,7 @@
EXPECT_TRUE(service_->IsAutoConnectable(&reason));
// Timeouts increase exponentially.
- uint64 next_cooldown_time = service_->auto_connect_cooldown_milliseconds_;
+ uint64_t next_cooldown_time = service_->auto_connect_cooldown_milliseconds_;
EXPECT_EQ(next_cooldown_time,
Service::kAutoConnectCooldownBackoffFactor *
Service::kMinAutoConnectCooldownTimeMilliseconds);
@@ -1028,7 +1028,7 @@
}
// Once we hit our cap, future timeouts are the same.
- for (int32 i = 0; i < 2; i++) {
+ for (int32_t i = 0; i < 2; i++) {
EXPECT_CALL(dispatcher_, PostDelayedTask(_,
Service::kMaxAutoConnectCooldownTimeMilliseconds));
service_->AutoConnect();
@@ -1168,8 +1168,8 @@
const string kGUID0 = "guid_zero";
const string kGUID1 = "guid_one";
service_->SetGuid(kGUID0, NULL);
- const uint32 kPriority0 = 100;
- const uint32 kPriority1 = 200;
+ const uint32_t kPriority0 = 100;
+ const uint32_t kPriority1 = 200;
service_->SetPriority(kPriority0, NULL);
const vector<string> kStrings0{ "string0", "string1" };
const vector<string> kStrings1{ "string2", "string3" };
diff --git a/socket_info.cc b/socket_info.cc
index 1a3674f..e8d19c8 100644
--- a/socket_info.cc
+++ b/socket_info.cc
@@ -8,11 +8,11 @@
SocketInfo::SocketInfo(ConnectionState connection_state,
const IPAddress &local_ip_address,
- uint16 local_port,
+ uint16_t local_port,
const IPAddress &remote_ip_address,
- uint16 remote_port,
- uint64 transmit_queue_value,
- uint64 receive_queue_value,
+ uint16_t remote_port,
+ uint64_t transmit_queue_value,
+ uint64_t receive_queue_value,
TimerState timer_state)
: connection_state_(connection_state),
local_ip_address_(local_ip_address),
diff --git a/socket_info.h b/socket_info.h
index 7e1b263..c8312e4 100644
--- a/socket_info.h
+++ b/socket_info.h
@@ -48,11 +48,11 @@
SocketInfo();
SocketInfo(ConnectionState connection_state,
const IPAddress &local_ip_address,
- uint16 local_port,
+ uint16_t local_port,
const IPAddress &remote_ip_address,
- uint16 remote_port,
- uint64 transmit_queue_value,
- uint64 receive_queue_value,
+ uint16_t remote_port,
+ uint64_t transmit_queue_value,
+ uint64_t receive_queue_value,
TimerState timer_state);
SocketInfo(const SocketInfo &socket_info);
~SocketInfo();
@@ -74,24 +74,24 @@
local_ip_address_ = local_ip_address;
}
- uint16 local_port() const { return local_port_; }
- void set_local_port(uint16 local_port) { local_port_ = local_port; }
+ uint16_t local_port() const { return local_port_; }
+ void set_local_port(uint16_t local_port) { local_port_ = local_port; }
const IPAddress &remote_ip_address() const { return remote_ip_address_; }
void set_remote_ip_address(const IPAddress &remote_ip_address) {
remote_ip_address_ = remote_ip_address;
}
- uint16 remote_port() const { return remote_port_; }
- void set_remote_port(uint16 remote_port) { remote_port_ = remote_port; }
+ uint16_t remote_port() const { return remote_port_; }
+ void set_remote_port(uint16_t remote_port) { remote_port_ = remote_port; }
- uint64 transmit_queue_value() const { return transmit_queue_value_; }
- void set_transmit_queue_value(uint64 transmit_queue_value) {
+ uint64_t transmit_queue_value() const { return transmit_queue_value_; }
+ void set_transmit_queue_value(uint64_t transmit_queue_value) {
transmit_queue_value_ = transmit_queue_value;
}
- uint64 receive_queue_value() const { return receive_queue_value_; }
- void set_receive_queue_value(uint64 receive_queue_value) {
+ uint64_t receive_queue_value() const { return receive_queue_value_; }
+ void set_receive_queue_value(uint64_t receive_queue_value) {
receive_queue_value_ = receive_queue_value;
}
@@ -101,11 +101,11 @@
private:
ConnectionState connection_state_;
IPAddress local_ip_address_;
- uint16 local_port_;
+ uint16_t local_port_;
IPAddress remote_ip_address_;
- uint16 remote_port_;
- uint64 transmit_queue_value_;
- uint64 receive_queue_value_;
+ uint16_t remote_port_;
+ uint64_t transmit_queue_value_;
+ uint64_t receive_queue_value_;
TimerState timer_state_;
// No DISALLOW_COPY_AND_ASSIGN(SocketInfo) as SocketInfo needs to be kept in
diff --git a/socket_info_reader.cc b/socket_info_reader.cc
index af9c75c..155bf2b 100644
--- a/socket_info_reader.cc
+++ b/socket_info_reader.cc
@@ -74,7 +74,7 @@
}
IPAddress ip_address(IPAddress::kFamilyUnknown);
- uint16 port = 0;
+ uint16_t port = 0;
if (!ParseIPAddressAndPort(tokens[1], &ip_address, &port)) {
return false;
@@ -95,7 +95,7 @@
}
socket_info->set_connection_state(connection_state);
- uint64 transmit_queue_value = 0, receive_queue_value = 0;
+ uint64_t transmit_queue_value = 0, receive_queue_value = 0;
if (!ParseTransimitAndReceiveQueueValues(
tokens[4], &transmit_queue_value, &receive_queue_value)) {
return false;
@@ -113,7 +113,7 @@
}
bool SocketInfoReader::ParseIPAddressAndPort(
- const string &input, IPAddress *ip_address, uint16 *port) {
+ const string &input, IPAddress *ip_address, uint16_t *port) {
vector<string> tokens;
base::SplitString(input, ':', &tokens);
@@ -151,11 +151,11 @@
return true;
}
-bool SocketInfoReader::ParsePort(const string &input, uint16 *port) {
+bool SocketInfoReader::ParsePort(const string &input, uint16_t *port) {
int result = 0;
if (input.size() != 4 || !base::HexStringToInt(input, &result) ||
- result < 0 || result > std::numeric_limits<uint16>::max()) {
+ result < 0 || result > std::numeric_limits<uint16_t>::max()) {
return false;
}
@@ -165,9 +165,9 @@
bool SocketInfoReader::ParseTransimitAndReceiveQueueValues(
const string &input,
- uint64 *transmit_queue_value, uint64 *receive_queue_value) {
+ uint64_t *transmit_queue_value, uint64_t *receive_queue_value) {
vector<string> tokens;
- int64 signed_transmit_queue_value = 0, signed_receive_queue_value = 0;
+ int64_t signed_transmit_queue_value = 0, signed_receive_queue_value = 0;
base::SplitString(input, ':', &tokens);
if (tokens.size() != 2 ||
@@ -176,8 +176,8 @@
return false;
}
- *transmit_queue_value = static_cast<uint64>(signed_transmit_queue_value);
- *receive_queue_value = static_cast<uint64>(signed_receive_queue_value);
+ *transmit_queue_value = static_cast<uint64_t>(signed_transmit_queue_value);
+ *receive_queue_value = static_cast<uint64_t>(signed_receive_queue_value);
return true;
}
diff --git a/socket_info_reader.h b/socket_info_reader.h
index fadf481..0f5dc9c 100644
--- a/socket_info_reader.h
+++ b/socket_info_reader.h
@@ -50,12 +50,12 @@
std::vector<SocketInfo> *info_list);
bool ParseSocketInfo(const std::string &input, SocketInfo *socket_info);
bool ParseIPAddressAndPort(
- const std::string &input, IPAddress *ip_address, uint16 *port);
+ const std::string &input, IPAddress *ip_address, uint16_t *port);
bool ParseIPAddress(const std::string &input, IPAddress *ip_address);
- bool ParsePort(const std::string &input, uint16 *port);
+ bool ParsePort(const std::string &input, uint16_t *port);
bool ParseTransimitAndReceiveQueueValues(
const std::string &input,
- uint64 *transmit_queue_value, uint64 *receive_queue_value);
+ uint64_t *transmit_queue_value, uint64_t *receive_queue_value);
bool ParseConnectionState(const std::string &input,
SocketInfo::ConnectionState *connection_state);
bool ParseTimerState(const std::string &input,
diff --git a/socket_info_reader_unittest.cc b/socket_info_reader_unittest.cc
index 6fb59b8..ef7302f 100644
--- a/socket_info_reader_unittest.cc
+++ b/socket_info_reader_unittest.cc
@@ -241,7 +241,7 @@
TEST_F(SocketInfoReaderTest, ParseIPAddressAndPort) {
IPAddress ip_address(IPAddress::kFamilyUnknown);
- uint16 port = 0;
+ uint16_t port = 0;
EXPECT_FALSE(reader_.ParseIPAddressAndPort("", &ip_address, &port));
EXPECT_FALSE(reader_.ParseIPAddressAndPort("00000000", &ip_address, &port));
@@ -311,7 +311,7 @@
}
TEST_F(SocketInfoReaderTest, ParsePort) {
- uint16 port = 0;
+ uint16_t port = 0;
EXPECT_FALSE(reader_.ParsePort("", &port));
EXPECT_FALSE(reader_.ParsePort("0", &port));
@@ -333,7 +333,7 @@
}
TEST_F(SocketInfoReaderTest, ParseTransimitAndReceiveQueueValues) {
- uint64 transmit_queue_value = 0, receive_queue_value = 0;
+ uint64_t transmit_queue_value = 0, receive_queue_value = 0;
EXPECT_FALSE(reader_.ParseTransimitAndReceiveQueueValues(
"", &transmit_queue_value, &receive_queue_value));
diff --git a/socket_info_unittest.cc b/socket_info_unittest.cc
index 5e9c33d..69dc513 100644
--- a/socket_info_unittest.cc
+++ b/socket_info_unittest.cc
@@ -13,9 +13,9 @@
const unsigned char kIPAddress1[] = { 192, 168, 1, 1 };
const unsigned char kIPAddress2[] = { 192, 168, 1, 2 };
const unsigned char kIPAddress3[] = { 192, 168, 1, 3 };
-const uint16 kPort1 = 1000;
-const uint16 kPort2 = 2000;
-const uint16 kPort3 = 3000;
+const uint16_t kPort1 = 1000;
+const uint16_t kPort2 = 2000;
+const uint16_t kPort3 = 3000;
} // namespace
diff --git a/static_ip_parameters.cc b/static_ip_parameters.cc
index 1cc9fbf..e3374e6 100644
--- a/static_ip_parameters.cc
+++ b/static_ip_parameters.cc
@@ -50,7 +50,7 @@
store->RegisterDerivedInt32(
name,
Int32Accessor(
- new CustomMappedAccessor<StaticIPParameters, int32, size_t>(
+ new CustomMappedAccessor<StaticIPParameters, int32_t, size_t>(
this,
&StaticIPParameters::ClearMappedProperty,
&StaticIPParameters::GetMappedInt32Property,
@@ -59,7 +59,7 @@
store->RegisterDerivedInt32(
saved_name,
Int32Accessor(
- new CustomMappedAccessor<StaticIPParameters, int32, size_t>(
+ new CustomMappedAccessor<StaticIPParameters, int32_t, size_t>(
this,
&StaticIPParameters::ClearMappedSavedProperty,
&StaticIPParameters::GetMappedSavedInt32Property,
@@ -102,7 +102,7 @@
switch (property.type) {
case Property::kTypeInt32:
{
- int32 value;
+ int32_t value;
if (storage->GetInt(storage_id, name, &value)) {
args_.SetInt(property.name, value);
} else {
@@ -159,7 +159,7 @@
}
void StaticIPParameters::ApplyInt(
- const string &property, int32 *value_out) {
+ const string &property, int32_t *value_out) {
saved_args_.SetInt(property, *value_out);
if (args_.ContainsInt(property)) {
*value_out = args_.GetInt(property);
@@ -259,7 +259,7 @@
error->Populate(Error::kInvalidArguments, "Property is read-only");
}
-int32 StaticIPParameters::GetMappedInt32Property(
+int32_t StaticIPParameters::GetMappedInt32Property(
const size_t &index, Error *error) {
CHECK(index < arraysize(kProperties));
@@ -271,7 +271,7 @@
return args_.GetInt(key);
}
-int32 StaticIPParameters::GetMappedSavedInt32Property(
+int32_t StaticIPParameters::GetMappedSavedInt32Property(
const size_t &index, Error *error) {
CHECK(index < arraysize(kProperties));
@@ -308,7 +308,7 @@
}
bool StaticIPParameters::SetMappedInt32Property(
- const size_t &index, const int32 &value, Error *error) {
+ const size_t &index, const int32_t &value, Error *error) {
CHECK(index < arraysize(kProperties));
if (args_.ContainsInt(kProperties[index].name) &&
args_.GetInt(kProperties[index].name) == value) {
@@ -319,7 +319,7 @@
}
bool StaticIPParameters::SetMappedSavedInt32Property(
- const size_t &index, const int32 &value, Error *error) {
+ const size_t &index, const int32_t &value, Error *error) {
error->Populate(Error::kInvalidArguments, "Property is read-only");
return false;
}
diff --git a/static_ip_parameters.h b/static_ip_parameters.h
index e3013ad..3bdef30 100644
--- a/static_ip_parameters.h
+++ b/static_ip_parameters.h
@@ -76,21 +76,21 @@
// These functions try to retrieve the argument |property| out of the
// KeyValueStore in |args_|. If that value exists, overwrite |value_out|
// with its contents, and save the previous value into |saved_args_|.
- void ApplyInt(const std::string &property, int32 *value_out);
+ void ApplyInt(const std::string &property, int32_t *value_out);
void ApplyString(const std::string &property, std::string *value_out);
void ApplyStrings(const std::string &property,
std::vector<std::string> *value_out);
void ClearMappedProperty(const size_t &index, Error *error);
void ClearMappedSavedProperty(const size_t &index, Error *error);
- int32 GetMappedInt32Property(const size_t &index, Error *error);
- int32 GetMappedSavedInt32Property(const size_t &index, Error *error);
+ int32_t GetMappedInt32Property(const size_t &index, Error *error);
+ int32_t GetMappedSavedInt32Property(const size_t &index, Error *error);
std::string GetMappedStringProperty(const size_t &index, Error *error);
std::string GetMappedSavedStringProperty(const size_t &index, Error *error);
bool SetMappedInt32Property(
- const size_t &index, const int32 &value, Error *error);
+ const size_t &index, const int32_t &value, Error *error);
bool SetMappedSavedInt32Property(
- const size_t &index, const int32 &value, Error *error);
+ const size_t &index, const int32_t &value, Error *error);
bool SetMappedStringProperty(
const size_t &index, const std::string &value, Error *error);
bool SetMappedSavedStringProperty(
diff --git a/static_ip_parameters_unittest.cc b/static_ip_parameters_unittest.cc
index 502a0a3..2be89c8 100644
--- a/static_ip_parameters_unittest.cc
+++ b/static_ip_parameters_unittest.cc
@@ -28,12 +28,12 @@
namespace {
static const char kAddress[] = "10.0.0.1";
static const char kGateway[] = "10.0.0.254";
-static const int32 kMtu = 512;
+static const int32_t kMtu = 512;
static const char kNameServer0[] = "10.0.1.253";
static const char kNameServer1[] = "10.0.1.252";
static const char kNameServers[] = "10.0.1.253,10.0.1.252";
static const char kPeerAddress[] = "10.0.0.2";
-static const int32 kPrefixLen = 24;
+static const int32_t kPrefixLen = 24;
} // namespace
class StaticIpParametersTest : public Test {
@@ -83,7 +83,7 @@
&string_value,
&unused_error));
EXPECT_EQ(VersionedAddress(kGateway, version), string_value);
- int32 int_value;
+ int32_t int_value;
EXPECT_TRUE(store->GetInt32Property(property_prefix + ".Mtu", &int_value,
&unused_error));
EXPECT_EQ(kMtu + version, int_value);
@@ -172,7 +172,7 @@
IPConfig::Properties props;
const string kTestAddress("test_address");
props.address = kTestAddress;
- const int32 kTestMtu = 256;
+ const int32_t kTestMtu = 256;
props.mtu = kTestMtu;
static_params_.ApplyTo(&props);
EXPECT_EQ(kTestAddress, props.address);
@@ -198,7 +198,7 @@
EXPECT_TRUE(store.GetStringProperty("StaticIP.PeerAddress", &string_value,
&unused_error));
EXPECT_EQ(kPeerAddress, string_value);
- int32 int_value;
+ int32_t int_value;
EXPECT_TRUE(store.GetInt32Property("StaticIP.Prefixlen", &int_value,
&unused_error));
EXPECT_EQ(kPrefixLen, int_value);
diff --git a/store_interface.h b/store_interface.h
index 55ef6b3..8315aa3 100644
--- a/store_interface.h
+++ b/store_interface.h
@@ -94,13 +94,13 @@
// pass NULL as |value| to simply test for the presence of this value.
virtual bool GetUint64(const std::string &group,
const std::string &key,
- uint64 *value) const = 0;
+ uint64_t *value) const = 0;
// Associates |group|:|key| with a 64-bit unsigned integer |value|. Returns
// true on success, false otherwise.
virtual bool SetUint64(const std::string &group,
const std::string &key,
- uint64 value) = 0;
+ uint64_t value) = 0;
// Gets a string list |value| associated with |group|:|key|. Returns true on
// success and false on failure (including when |group|:|key| is not present
diff --git a/stub_storage.h b/stub_storage.h
index 790a9ae..a7d8619 100644
--- a/stub_storage.h
+++ b/stub_storage.h
@@ -69,12 +69,12 @@
}
virtual bool GetUint64(const std::string &group,
const std::string &key,
- uint64 *value) const override {
+ uint64_t *value) const override {
return false;
}
virtual bool SetUint64(const std::string &group,
const std::string &key,
- uint64 value) override {
+ uint64_t value) override {
return false;
}
virtual bool GetStringList(const std::string &group,
diff --git a/subscription_state_out_of_credits_detector.cc b/subscription_state_out_of_credits_detector.cc
index a74c77a..5ee3419 100644
--- a/subscription_state_out_of_credits_detector.cc
+++ b/subscription_state_out_of_credits_detector.cc
@@ -23,7 +23,7 @@
}
void SubscriptionStateOutOfCreditsDetector::NotifySubscriptionStateChanged(
- uint32 subscription_state) {
+ uint32_t subscription_state) {
bool ooc = (static_cast<MMModem3gppSubscriptionState>(subscription_state) ==
MM_MODEM_3GPP_SUBSCRIPTION_STATE_OUT_OF_DATA);
if (ooc != out_of_credits()) {
diff --git a/subscription_state_out_of_credits_detector.h b/subscription_state_out_of_credits_detector.h
index cee6838..2da3e19 100644
--- a/subscription_state_out_of_credits_detector.h
+++ b/subscription_state_out_of_credits_detector.h
@@ -24,7 +24,7 @@
Service::ConnectState old_state,
Service::ConnectState new_state) override {}
virtual void NotifySubscriptionStateChanged(
- uint32 subscription_state) override;
+ uint32_t subscription_state) override;
private:
friend class SubscriptionStateOutOfCreditsDetectorTest;
diff --git a/supplicant_interface_proxy.cc b/supplicant_interface_proxy.cc
index ffd939d..b78002f 100644
--- a/supplicant_interface_proxy.cc
+++ b/supplicant_interface_proxy.cc
@@ -170,7 +170,7 @@
}
}
-void SupplicantInterfaceProxy::SetRoamThreshold(uint16 threshold) {
+void SupplicantInterfaceProxy::SetRoamThreshold(uint16_t threshold) {
SLOG(DBus, 2) << __func__;
try {
proxy_.RoamThreshold(threshold);
@@ -182,7 +182,7 @@
}
}
-void SupplicantInterfaceProxy::SetScanInterval(int32 scan_interval) {
+void SupplicantInterfaceProxy::SetScanInterval(int32_t scan_interval) {
SLOG(DBus, 2) << __func__;
try {
return proxy_.ScanInterval(scan_interval);
diff --git a/supplicant_interface_proxy.h b/supplicant_interface_proxy.h
index b34174e..9e41143 100644
--- a/supplicant_interface_proxy.h
+++ b/supplicant_interface_proxy.h
@@ -50,7 +50,7 @@
const std::map<std::string, ::DBus::Variant> &args);
virtual void SelectNetwork(const ::DBus::Path &network);
virtual void SetFastReauth(bool enabled);
- virtual void SetRoamThreshold(uint16 threshold);
+ virtual void SetRoamThreshold(uint16_t threshold);
virtual void SetScanInterval(int seconds);
virtual void SetDisableHighBitrates(bool disable_high_bitrates);
virtual void TDLSDiscover(const std::string &peer);
diff --git a/supplicant_interface_proxy_interface.h b/supplicant_interface_proxy_interface.h
index 76b1095..1332b33 100644
--- a/supplicant_interface_proxy_interface.h
+++ b/supplicant_interface_proxy_interface.h
@@ -36,7 +36,7 @@
const std::map<std::string, ::DBus::Variant> &args) = 0;
virtual void SelectNetwork(const ::DBus::Path &network) = 0;
virtual void SetFastReauth(bool enabled) = 0;
- virtual void SetRoamThreshold(uint16 seconds) = 0;
+ virtual void SetRoamThreshold(uint16_t seconds) = 0;
virtual void SetScanInterval(int seconds) = 0;
virtual void SetDisableHighBitrates(bool disable_high_bitrates) = 0;
virtual void TDLSDiscover(const std::string &peer) = 0;
diff --git a/traffic_monitor.cc b/traffic_monitor.cc
index 1b623a3..1969362 100644
--- a/traffic_monitor.cc
+++ b/traffic_monitor.cc
@@ -21,10 +21,10 @@
namespace shill {
// static
-const uint16 TrafficMonitor::kDnsPort = 53;
-const int64 TrafficMonitor::kDnsTimedOutThresholdSeconds = 15;
+const uint16_t TrafficMonitor::kDnsPort = 53;
+const int64_t TrafficMonitor::kDnsTimedOutThresholdSeconds = 15;
const int TrafficMonitor::kMinimumFailedSamplesToTrigger = 2;
-const int64 TrafficMonitor::kSamplingIntervalMilliseconds = 5000;
+const int64_t TrafficMonitor::kSamplingIntervalMilliseconds = 5000;
TrafficMonitor::TrafficMonitor(const DeviceRefPtr &device,
EventDispatcher *dispatcher)
@@ -164,7 +164,7 @@
// |kDnsTimedOutThresholdSeconds|. To ensure that we only count an
// entry once, we look for entries in this time window between
// |kDnsTimedOutThresholdSeconds| and |kDnsTimedOutLowerThresholdSeconds|.
- const int64 kDnsTimedOutLowerThresholdSeconds =
+ const int64_t kDnsTimedOutLowerThresholdSeconds =
kDnsTimedOutThresholdSeconds - kSamplingIntervalMilliseconds / 1000;
string device_ip_address = device_->ipconfig()->properties().address;
for (const auto &info : connection_infos) {
diff --git a/traffic_monitor.h b/traffic_monitor.h
index adf7c9e..03adcba 100644
--- a/traffic_monitor.h
+++ b/traffic_monitor.h
@@ -81,18 +81,18 @@
FRIEND_TEST(TrafficMonitorTest, SampleTrafficUnstuckTxQueueZeroQueueLength);
FRIEND_TEST(TrafficMonitorTest, StartAndStop);
- typedef std::map<std::string, uint64> IPPortToTxQueueLengthMap;
+ typedef std::map<std::string, uint64_t> IPPortToTxQueueLengthMap;
// The minimum number of samples that indicate an abnormal scenario
// required to trigger the callback.
static const int kMinimumFailedSamplesToTrigger;
// The frequency at which to sample the TCP connections.
- static const int64 kSamplingIntervalMilliseconds;
+ static const int64_t kSamplingIntervalMilliseconds;
// DNS port.
- static const uint16 kDnsPort;
+ static const uint16_t kDnsPort;
// If a DNS "connection" time-to-expire falls below this threshold, then
// it's considered a timed out DNS request.
- static const int64 kDnsTimedOutThresholdSeconds;
+ static const int64_t kDnsTimedOutThresholdSeconds;
// Resets congested tx-queues tracking statistics.
void ResetCongestedTxQueuesStats();
diff --git a/traffic_monitor_unittest.cc b/traffic_monitor_unittest.cc
index d5397b5..476f002 100644
--- a/traffic_monitor_unittest.cc
+++ b/traffic_monitor_unittest.cc
@@ -36,17 +36,17 @@
class TrafficMonitorTest : public Test {
public:
static const char kLocalIpAddr[];
- static const uint16 kLocalPort1;
- static const uint16 kLocalPort2;
- static const uint16 kLocalPort3;
- static const uint16 kLocalPort4;
- static const uint16 kLocalPort5;
+ static const uint16_t kLocalPort1;
+ static const uint16_t kLocalPort2;
+ static const uint16_t kLocalPort3;
+ static const uint16_t kLocalPort4;
+ static const uint16_t kLocalPort5;
static const char kRemoteIpAddr[];
- static const uint16 kRemotePort;
- static const uint64 kTxQueueLength1;
- static const uint64 kTxQueueLength2;
- static const uint64 kTxQueueLength3;
- static const uint64 kTxQueueLength4;
+ static const uint16_t kRemotePort;
+ static const uint64_t kTxQueueLength1;
+ static const uint64_t kTxQueueLength2;
+ static const uint64_t kTxQueueLength3;
+ static const uint64_t kTxQueueLength4;
TrafficMonitorTest()
: device_(new MockDevice(&control_,
@@ -115,7 +115,7 @@
return true;
}
- string FormatIPPort(const IPAddress &ip, const uint16 port) {
+ string FormatIPPort(const IPAddress &ip, const uint16_t port) {
return StringPrintf("%s:%d", ip.ToString().c_str(), port);
}
@@ -135,17 +135,17 @@
// static
const char TrafficMonitorTest::kLocalIpAddr[] = "127.0.0.1";
-const uint16 TrafficMonitorTest::kLocalPort1 = 1234;
-const uint16 TrafficMonitorTest::kLocalPort2 = 2345;
-const uint16 TrafficMonitorTest::kLocalPort3 = 3456;
-const uint16 TrafficMonitorTest::kLocalPort4 = 4567;
-const uint16 TrafficMonitorTest::kLocalPort5 = 4567;
+const uint16_t TrafficMonitorTest::kLocalPort1 = 1234;
+const uint16_t TrafficMonitorTest::kLocalPort2 = 2345;
+const uint16_t TrafficMonitorTest::kLocalPort3 = 3456;
+const uint16_t TrafficMonitorTest::kLocalPort4 = 4567;
+const uint16_t TrafficMonitorTest::kLocalPort5 = 4567;
const char TrafficMonitorTest::kRemoteIpAddr[] = "192.168.1.1";
-const uint16 TrafficMonitorTest::kRemotePort = 5678;
-const uint64 TrafficMonitorTest::kTxQueueLength1 = 111;
-const uint64 TrafficMonitorTest::kTxQueueLength2 = 222;
-const uint64 TrafficMonitorTest::kTxQueueLength3 = 333;
-const uint64 TrafficMonitorTest::kTxQueueLength4 = 444;
+const uint16_t TrafficMonitorTest::kRemotePort = 5678;
+const uint64_t TrafficMonitorTest::kTxQueueLength1 = 111;
+const uint64_t TrafficMonitorTest::kTxQueueLength2 = 222;
+const uint64_t TrafficMonitorTest::kTxQueueLength3 = 333;
+const uint64_t TrafficMonitorTest::kTxQueueLength4 = 444;
TEST_F(TrafficMonitorTest, StartAndStop) {
// Stop without start
@@ -667,7 +667,7 @@
}
TEST_F(TrafficMonitorTest, SampleTrafficNonDnsTimedOut) {
- const uint16 kNonDnsPort = 54;
+ const uint16_t kNonDnsPort = 54;
vector<ConnectionInfo> connection_infos;
connection_infos.push_back(
ConnectionInfo(IPPROTO_UDP,
diff --git a/wifi.cc b/wifi.cc
index 911afb2..ce5e6c9 100644
--- a/wifi.cc
+++ b/wifi.cc
@@ -70,12 +70,12 @@
// statics
const char *WiFi::kDefaultBgscanMethod =
WPASupplicant::kNetworkBgscanMethodSimple;
-const uint16 WiFi::kDefaultBgscanShortIntervalSeconds = 30;
-const int32 WiFi::kDefaultBgscanSignalThresholdDbm = -50;
-const uint16 WiFi::kDefaultScanIntervalSeconds = 60;
-const uint16 WiFi::kDefaultRoamThresholdDb = 18; // Supplicant's default.
+const uint16_t WiFi::kDefaultBgscanShortIntervalSeconds = 30;
+const int32_t WiFi::kDefaultBgscanSignalThresholdDbm = -50;
+const uint16_t WiFi::kDefaultScanIntervalSeconds = 60;
+const uint16_t WiFi::kDefaultRoamThresholdDb = 18; // Supplicant's default.
// Scan interval while connected.
-const uint16 WiFi::kBackgroundScanIntervalSeconds = 3601;
+const uint16_t WiFi::kBackgroundScanIntervalSeconds = 3601;
// Age (in seconds) beyond which a BSS cache entry will not be preserved,
// across a suspend/resume.
const time_t WiFi::kMaxBSSResumeAgeSeconds = 10;
@@ -711,7 +711,7 @@
return true;
}
-bool WiFi::SetBgscanShortInterval(const uint16 &seconds, Error */*error*/) {
+bool WiFi::SetBgscanShortInterval(const uint16_t &seconds, Error */*error*/) {
if (bgscan_short_interval_seconds_ == seconds) {
return false;
}
@@ -722,7 +722,7 @@
return true;
}
-bool WiFi::SetBgscanSignalThreshold(const int32 &dbm, Error */*error*/) {
+bool WiFi::SetBgscanSignalThreshold(const int32_t &dbm, Error */*error*/) {
if (bgscan_signal_threshold_dbm_ == dbm) {
return false;
}
@@ -733,13 +733,13 @@
return true;
}
-bool WiFi::SetRoamThreshold(const uint16 &threshold, Error */*error*/) {
+bool WiFi::SetRoamThreshold(const uint16_t &threshold, Error */*error*/) {
roam_threshold_db_ = threshold;
supplicant_interface_proxy_->SetRoamThreshold(threshold);
return true;
}
-bool WiFi::SetScanInterval(const uint16 &seconds, Error */*error*/) {
+bool WiFi::SetScanInterval(const uint16_t &seconds, Error */*error*/) {
if (scan_interval_seconds_ == seconds) {
return false;
}
@@ -1194,7 +1194,7 @@
}
string subject;
- uint32 depth;
+ uint32_t depth;
if (WPASupplicant::ExtractRemoteCertification(properties, &subject, &depth)) {
current_service_->AddEAPCertification(subject, depth);
}
@@ -1622,21 +1622,21 @@
void WiFi::HelpRegisterDerivedInt32(
PropertyStore *store,
const string &name,
- int32(WiFi::*get)(Error *error),
- bool(WiFi::*set)(const int32 &value, Error *error)) {
+ int32_t(WiFi::*get)(Error *error),
+ bool(WiFi::*set)(const int32_t &value, Error *error)) {
store->RegisterDerivedInt32(
name,
- Int32Accessor(new CustomAccessor<WiFi, int32>(this, get, set)));
+ Int32Accessor(new CustomAccessor<WiFi, int32_t>(this, get, set)));
}
void WiFi::HelpRegisterDerivedUint16(
PropertyStore *store,
const string &name,
- uint16(WiFi::*get)(Error *error),
- bool(WiFi::*set)(const uint16 &value, Error *error)) {
+ uint16_t(WiFi::*get)(Error *error),
+ bool(WiFi::*set)(const uint16_t &value, Error *error)) {
store->RegisterDerivedUint16(
name,
- Uint16Accessor(new CustomAccessor<WiFi, uint16>(this, get, set)));
+ Uint16Accessor(new CustomAccessor<WiFi, uint16_t>(this, get, set)));
}
void WiFi::HelpRegisterConstDerivedBool(
@@ -2440,7 +2440,7 @@
};
for (const auto &kv : u32_property_map) {
- uint32 value;
+ uint32_t value;
if (station_info->GetU32AttributeValue(kv.first, &value)) {
link_statistics_.SetUint(kv.second, value);
}
@@ -2452,7 +2452,7 @@
};
for (const auto &kv : s8_property_map) {
- uint8 value;
+ uint8_t value;
if (station_info->GetU8AttributeValue(kv.first, &value)) {
// Despite these values being reported as a U8 by the kernel, these
// should be interpreted as signed char.
@@ -2463,10 +2463,10 @@
AttributeListConstRefPtr transmit_info;
if (station_info->ConstGetNestedAttributeList(
NL80211_STA_INFO_TX_BITRATE, &transmit_info)) {
- uint32 rate = 0; // In 100Kbps.
- uint16 u16_rate = 0; // In 100Kbps.
- uint8 mcs = 0;
- uint8 nss = 0;
+ uint32_t rate = 0; // In 100Kbps.
+ uint16_t u16_rate = 0; // In 100Kbps.
+ uint8_t mcs = 0;
+ uint8_t nss = 0;
bool band_flag = false;
bool is_short_gi = false;
string mcs_info;
@@ -2475,7 +2475,7 @@
if (transmit_info->GetU16AttributeValue(
NL80211_RATE_INFO_BITRATE, &u16_rate)) {
- rate = static_cast<uint32>(u16_rate);
+ rate = static_cast<uint32_t>(u16_rate);
} else {
transmit_info->GetU32AttributeValue(NL80211_RATE_INFO_BITRATE32, &rate);
}
diff --git a/wifi.h b/wifi.h
index 440e61d..23c976e 100644
--- a/wifi.h
+++ b/wifi.h
@@ -279,11 +279,11 @@
typedef std::map<const WiFiService *, std::string> ReverseServiceMap;
static const char *kDefaultBgscanMethod;
- static const uint16 kDefaultBgscanShortIntervalSeconds;
- static const int32 kDefaultBgscanSignalThresholdDbm;
- static const uint16 kDefaultRoamThresholdDb;
- static const uint16 kDefaultScanIntervalSeconds;
- static const uint16 kBackgroundScanIntervalSeconds;
+ static const uint16_t kDefaultBgscanShortIntervalSeconds;
+ static const int32_t kDefaultBgscanSignalThresholdDbm;
+ static const uint16_t kDefaultRoamThresholdDb;
+ static const uint16_t kDefaultScanIntervalSeconds;
+ static const uint16_t kBackgroundScanIntervalSeconds;
static const time_t kMaxBSSResumeAgeSeconds;
static const char kInterfaceStateUnknown[];
// Delay between scans when supplicant finds "No suitable network".
@@ -306,18 +306,18 @@
void AppendBgscan(WiFiService *service,
std::map<std::string, DBus::Variant> *service_params) const;
std::string GetBgscanMethod(const int &argument, Error *error);
- uint16 GetBgscanShortInterval(Error */* error */) {
+ uint16_t GetBgscanShortInterval(Error */* error */) {
return bgscan_short_interval_seconds_;
}
- int32 GetBgscanSignalThreshold(Error */* error */) {
+ int32_t GetBgscanSignalThreshold(Error */* error */) {
return bgscan_signal_threshold_dbm_;
}
// These methods can't be 'const' because they are passed to
// HelpRegisterDerivedUint16 which don't take const methods.
- uint16 GetRoamThreshold(Error */* error */) /*const*/ {
+ uint16_t GetRoamThreshold(Error */* error */) /*const*/ {
return roam_threshold_db_;
}
- uint16 GetScanInterval(Error */* error */) /*const*/ {
+ uint16_t GetScanInterval(Error */* error */) /*const*/ {
return scan_interval_seconds_;
}
@@ -327,10 +327,10 @@
bool GetScanPending(Error */* error */);
bool SetBgscanMethod(
const int &argument, const std::string &method, Error *error);
- bool SetBgscanShortInterval(const uint16 &seconds, Error *error);
- bool SetBgscanSignalThreshold(const int32 &dbm, Error *error);
- bool SetRoamThreshold(const uint16 &threshold, Error */*error*/);
- bool SetScanInterval(const uint16 &seconds, Error *error);
+ bool SetBgscanShortInterval(const uint16_t &seconds, Error *error);
+ bool SetBgscanSignalThreshold(const int32_t &dbm, Error *error);
+ bool SetRoamThreshold(const uint16_t &threshold, Error */*error*/);
+ bool SetScanInterval(const uint16_t &seconds, Error *error);
void ClearBgscanMethod(const int &argument, Error *error);
void CurrentBSSChanged(const ::DBus::Path &new_bss);
@@ -378,13 +378,13 @@
void HelpRegisterDerivedInt32(
PropertyStore *store,
const std::string &name,
- int32(WiFi::*get)(Error *error),
- bool(WiFi::*set)(const int32 &value, Error *error));
+ int32_t(WiFi::*get)(Error *error),
+ bool(WiFi::*set)(const int32_t &value, Error *error));
void HelpRegisterDerivedUint16(
PropertyStore *store,
const std::string &name,
- uint16(WiFi::*get)(Error *error),
- bool(WiFi::*set)(const uint16 &value, Error *error));
+ uint16_t(WiFi::*get)(Error *error),
+ bool(WiFi::*set)(const uint16_t &value, Error *error));
void HelpRegisterConstDerivedBool(
PropertyStore *store,
const std::string &name,
@@ -549,10 +549,10 @@
// Properties
std::string bgscan_method_;
- uint16 bgscan_short_interval_seconds_;
- int32 bgscan_signal_threshold_dbm_;
- uint16 roam_threshold_db_;
- uint16 scan_interval_seconds_;
+ uint16_t bgscan_short_interval_seconds_;
+ int32_t bgscan_signal_threshold_dbm_;
+ uint16_t roam_threshold_db_;
+ uint16_t scan_interval_seconds_;
bool progressive_scan_enabled_;
std::string scan_configuration_;
@@ -574,7 +574,7 @@
chromeos_metrics::Timer scan_timer_;
// Used to compute the number of bytes received since the link went up.
- uint64 receive_byte_count_at_connect_;
+ uint64_t receive_byte_count_at_connect_;
// Used to report the current state of our wireless link.
KeyValueStore link_statistics_;
diff --git a/wifi_endpoint.cc b/wifi_endpoint.cc
index d6a13f0..6ab70fa 100644
--- a/wifi_endpoint.cc
+++ b/wifi_endpoint.cc
@@ -128,7 +128,7 @@
}
}
-void WiFiEndpoint::UpdateSignalStrength(int16 strength) {
+void WiFiEndpoint::UpdateSignalStrength(int16_t strength) {
if (signal_strength_ == strength) {
return;
}
@@ -214,11 +214,11 @@
return signal_strength_;
}
-uint16 WiFiEndpoint::frequency() const {
+uint16_t WiFiEndpoint::frequency() const {
return frequency_;
}
-uint16 WiFiEndpoint::physical_mode() const {
+uint16_t WiFiEndpoint::physical_mode() const {
return physical_mode_;
}
@@ -252,8 +252,8 @@
const string &ssid,
const string &bssid,
const string &network_mode,
- uint16 frequency,
- int16 signal_dbm) {
+ uint16_t frequency,
+ int16_t signal_dbm) {
return MakeEndpoint(proxy_factory, wifi, ssid, bssid, network_mode,
frequency, signal_dbm, false, false);
}
@@ -265,8 +265,8 @@
const string &ssid,
const string &bssid,
const string &network_mode,
- uint16 frequency,
- int16 signal_dbm,
+ uint16_t frequency,
+ int16_t signal_dbm,
bool has_wpa_property,
bool has_rsn_property) {
map <string, ::DBus::Variant> args;
@@ -385,7 +385,7 @@
// static
Metrics::WiFiNetworkPhyMode WiFiEndpoint::DeterminePhyModeFromFrequency(
- const map<string, ::DBus::Variant> &properties, uint16 frequency) {
+ const map<string, ::DBus::Variant> &properties, uint16_t frequency) {
uint32_t max_rate = 0;
map<string, ::DBus::Variant>::const_iterator it =
properties.find(WPASupplicant::kBSSPropertyRates);
@@ -516,7 +516,7 @@
if (std::distance(ie, end) < IEEE_80211::kRSNIECipherCountLen) {
return;
}
- uint16 cipher_count = *ie | (*(ie + 1) << 8);
+ uint16_t cipher_count = *ie | (*(ie + 1) << 8);
// Skip over the cipher selectors.
int skip_length = IEEE_80211::kRSNIECipherCountLen +
@@ -532,7 +532,7 @@
}
// Retrieve a little-endian capabilities bitfield.
- uint16 capabilities = *ie | (*(ie + 1) << 8);
+ uint16_t capabilities = *ie | (*(ie + 1) << 8);
if (capabilities & IEEE_80211::kRSNCapabilityFrameProtectionRequired &&
ieee80211w_required) {
diff --git a/wifi_endpoint.h b/wifi_endpoint.h
index 2055939..7ace14d 100644
--- a/wifi_endpoint.h
+++ b/wifi_endpoint.h
@@ -63,7 +63,7 @@
const std::map<std::string, ::DBus::Variant> &properties);
// Called by WiFi when it polls for signal strength from the kernel.
- void UpdateSignalStrength(int16 strength);
+ void UpdateSignalStrength(int16_t strength);
// Maps mode strings from flimflam's nomenclature, as defined
// in chromeos/dbus/service_constants.h, to uints used by supplicant
@@ -89,8 +89,8 @@
const std::string &country_code() const;
const WiFiRefPtr &device() const;
int16_t signal_strength() const;
- uint16 frequency() const;
- uint16 physical_mode() const;
+ uint16_t frequency() const;
+ uint16_t physical_mode() const;
const std::string &network_mode() const;
const std::string &security_mode() const;
bool ieee80211w_required() const;
@@ -131,8 +131,8 @@
const std::string &ssid,
const std::string &bssid,
const std::string &network_mode,
- uint16 frequency,
- int16 signal_dbm,
+ uint16_t frequency,
+ int16_t signal_dbm,
bool has_wpa_property,
bool has_rsn_property);
// As above, but with the last two parameters false.
@@ -141,8 +141,8 @@
const std::string &ssid,
const std::string &bssid,
const std::string &network_mode,
- uint16 frequency,
- int16 signal_dbm);
+ uint16_t frequency,
+ int16_t signal_dbm);
// Maps mode strings from supplicant into flimflam's nomenclature, as defined
// in chromeos/dbus/service_constants.h.
static const char *ParseMode(const std::string &mode_string);
@@ -164,7 +164,7 @@
// elements and data rates live in |properties|.
static Metrics::WiFiNetworkPhyMode DeterminePhyModeFromFrequency(
const std::map<std::string, ::DBus::Variant> &properties,
- uint16 frequency);
+ uint16_t frequency);
// Parse information elements to determine the physical mode, vendor
// information and IEEE 802.11w requirement information associated
// with the AP. Returns true if a physical mode was determined from
@@ -199,9 +199,9 @@
std::string bssid_string_;
std::string bssid_hex_;
std::string country_code_;
- int16 signal_strength_;
- uint16 frequency_;
- uint16 physical_mode_;
+ int16_t signal_strength_;
+ uint16_t frequency_;
+ uint16_t physical_mode_;
// network_mode_ and security_mode_ are represented as flimflam names
// (not necessarily the same as wpa_supplicant names)
std::string network_mode_;
diff --git a/wifi_endpoint_unittest.cc b/wifi_endpoint_unittest.cc
index 27fadf1..2727ed8 100644
--- a/wifi_endpoint_unittest.cc
+++ b/wifi_endpoint_unittest.cc
@@ -139,9 +139,9 @@
// Creates the RSN properties string (which still requires an information
// element prefix).
- vector<uint8_t> MakeRSNProperties(uint16 pairwise_count,
- uint16 authkey_count,
- uint16 capabilities) {
+ vector<uint8_t> MakeRSNProperties(uint16_t pairwise_count,
+ uint16_t authkey_count,
+ uint16_t capabilities) {
vector<uint8_t> rsn(IEEE_80211::kRSNIECipherCountOffset +
IEEE_80211::kRSNIECipherCountLen * 2 +
IEEE_80211::kRSNIESelectorLen *
diff --git a/wifi_provider.cc b/wifi_provider.cc
index ca71ffd..47bd1b0 100644
--- a/wifi_provider.cc
+++ b/wifi_provider.cc
@@ -583,8 +583,8 @@
<< "'. Expected 1.";
return;
}
- uint16 freq = atoi(freq_count[0].c_str());
- uint64 connections = atoll(freq_count[1].c_str());
+ uint16_t freq = atoi(freq_count[0].c_str());
+ uint64_t connections = atoll(freq_count[1].c_str());
(*numbers)[freq] = connections;
}
@@ -610,7 +610,7 @@
}
}
-void WiFiProvider::IncrementConnectCount(uint16 frequency_mhz) {
+void WiFiProvider::IncrementConnectCount(uint16_t frequency_mhz) {
CHECK(total_frequency_connections_ < std::numeric_limits<int64_t>::max());
++connect_count_by_frequency_[frequency_mhz];
diff --git a/wifi_provider.h b/wifi_provider.h
index 7b5973e..dd42c13 100644
--- a/wifi_provider.h
+++ b/wifi_provider.h
@@ -38,15 +38,15 @@
public:
static const char kStorageFrequencies[];
static const int kMaxStorageFrequencies;
- typedef std::map<uint16, int64> ConnectFrequencyMap;
+ typedef std::map<uint16_t, int64_t> ConnectFrequencyMap;
// The key to |ConnectFrequencyMapDated| is the number of days since the
// Epoch.
typedef std::map<time_t, ConnectFrequencyMap> ConnectFrequencyMapDated;
struct FrequencyCount {
FrequencyCount() : frequency(0), connection_count(0) {}
- FrequencyCount(uint16 freq, size_t conn)
+ FrequencyCount(uint16_t freq, size_t conn)
: frequency(freq), connection_count(conn) {}
- uint16 frequency;
+ uint16_t frequency;
size_t connection_count; // Number of successful connections at this
// frequency.
};
@@ -107,7 +107,7 @@
// Save configuration for wifi_provider to |storage|.
virtual bool Save(StoreInterface *storage) const;
- virtual void IncrementConnectCount(uint16 frequency_mhz);
+ virtual void IncrementConnectCount(uint16_t frequency_mhz);
// Returns a list of all of the frequencies on which this device has
// connected. This data is accumulated across multiple shill runs.
diff --git a/wifi_provider_unittest.cc b/wifi_provider_unittest.cc
index 6ffd97d..2104312 100644
--- a/wifi_provider_unittest.cc
+++ b/wifi_provider_unittest.cc
@@ -254,7 +254,7 @@
return provider_.FindService(ssid, mode, security);
}
WiFiEndpointRefPtr MakeEndpoint(const string &ssid, const string &bssid,
- uint16 frequency, int16 signal_dbm) {
+ uint16_t frequency, int16_t signal_dbm) {
return WiFiEndpoint::MakeOpenEndpoint(
NULL, NULL, ssid, bssid, WPASupplicant::kNetworkModeInfrastructure,
frequency, signal_dbm);
@@ -300,8 +300,8 @@
void BuildFreqCountMap(WiFiProvider::ConnectFrequencyMap *frequencies) {
// NOTE: These structures match the strings in |BuildFreqCountStrings|.
static const struct FreqCount {
- uint16 freq;
- int64 count;
+ uint16_t freq;
+ int64_t count;
} kConnectFreq[] = {
{5180, 14},
{5240, 16},
diff --git a/wifi_service.cc b/wifi_service.cc
index ed4ea0a..a1ee023 100644
--- a/wifi_service.cc
+++ b/wifi_service.cc
@@ -407,7 +407,7 @@
}
void WiFiService::SendPostReadyStateMetrics(
- int64 time_resume_to_ready_milliseconds) const {
+ int64_t time_resume_to_ready_milliseconds) const {
metrics()->SendEnumToUMA(
metrics()->GetFullMetricName(Metrics::kMetricNetworkChannelSuffix,
technology()),
@@ -592,7 +592,7 @@
append_string(WPASupplicant::kSecurityAuthAlg);
Error unused_error;
int key_index;
- std::vector<uint8> password_bytes;
+ std::vector<uint8_t> password_bytes;
ParseWEPPassphrase(passphrase_, &key_index, &password_bytes, &unused_error);
writer = params[WPASupplicant::kPropertyWEPKey +
base::IntToString(key_index)].writer();
@@ -674,7 +674,7 @@
if (current_endpoint_) {
representative_endpoint = current_endpoint_;
} else {
- int16 best_signal = std::numeric_limits<int16>::min();
+ int16_t best_signal = std::numeric_limits<int16_t>::min();
for (const auto &endpoint : endpoints_) {
if (endpoint->signal_strength() >= best_signal) {
best_signal = endpoint->signal_strength();
@@ -701,7 +701,7 @@
}
}
- set<uint16> frequency_set;
+ set<uint16_t> frequency_set;
for (const auto &endpoint : endpoints_) {
frequency_set.insert(endpoint->frequency());
}
@@ -710,12 +710,12 @@
if (Is8021x())
cipher_8021x_ = ComputeCipher8021x(endpoints_);
- uint16 frequency = 0;
- int16 signal = std::numeric_limits<int16>::min();
+ uint16_t frequency = 0;
+ int16_t signal = std::numeric_limits<int16_t>::min();
string bssid;
string country_code;
Stringmap vendor_information;
- uint16 physical_mode = Metrics::kWiFiNetworkPhyModeUndef;
+ uint16_t physical_mode = Metrics::kWiFiNetworkPhyModeUndef;
// Represent "unknown raw signal strength" as 0.
raw_signal_strength_ = 0;
if (representative_endpoint) {
@@ -819,7 +819,7 @@
void WiFiService::ValidateWPAPassphrase(const std::string &passphrase,
Error *error) {
unsigned int length = passphrase.length();
- vector<uint8> passphrase_bytes;
+ vector<uint8_t> passphrase_bytes;
if (base::HexStringToBytes(passphrase, &passphrase_bytes)) {
if (length != IEEE_80211::kWPAHexLen &&
@@ -838,7 +838,7 @@
// static
void WiFiService::ParseWEPPassphrase(const string &passphrase,
int *key_index,
- std::vector<uint8> *password_bytes,
+ std::vector<uint8_t> *password_bytes,
Error *error) {
unsigned int length = passphrase.length();
int key_index_local;
@@ -911,7 +911,7 @@
// static
bool WiFiService::CheckWEPIsHex(const string &passphrase, Error *error) {
- vector<uint8> passphrase_bytes;
+ vector<uint8_t> passphrase_bytes;
if (base::HexStringToBytes(passphrase, &passphrase_bytes)) {
return true;
} else {
@@ -954,9 +954,9 @@
}
-int16 WiFiService::SignalLevel() const {
+int16_t WiFiService::SignalLevel() const {
return current_endpoint_ ? current_endpoint_->signal_strength() :
- std::numeric_limits<int16>::min();
+ std::numeric_limits<int16_t>::min();
}
// static
@@ -1027,8 +1027,8 @@
}
// static
-uint8 WiFiService::SignalToStrength(int16 signal_dbm) {
- int16 strength;
+uint8_t WiFiService::SignalToStrength(int16_t signal_dbm) {
+ int16_t strength;
if (signal_dbm > 0) {
if (!logged_signal_warning) {
LOG(WARNING) << "Signal strength is suspiciously high. "
diff --git a/wifi_service.h b/wifi_service.h
index 3200ae4..74236be 100644
--- a/wifi_service.h
+++ b/wifi_service.h
@@ -89,9 +89,11 @@
const std::string &key_management() const { return GetEAPKeyManagement(); }
const std::vector<uint8_t> &ssid() const { return ssid_; }
const std::string &bssid() const { return bssid_; }
- const std::vector<uint16> &frequency_list() const { return frequency_list_; }
- uint16 physical_mode() const { return physical_mode_; }
- uint16 frequency() const { return frequency_; }
+ const std::vector<uint16_t> &frequency_list() const {
+ return frequency_list_;
+ }
+ uint16_t physical_mode() const { return physical_mode_; }
+ uint16_t frequency() const { return frequency_; }
// WiFi services can load from profile entries other than their current
// storage identifier. Override the methods from the parent Service
@@ -129,7 +131,7 @@
void InitializeCustomMetrics() const;
virtual void SendPostReadyStateMetrics(
- int64 time_resume_to_ready_milliseconds) const;
+ int64_t time_resume_to_ready_milliseconds) const;
// Clear any cached credentials stored in wpa_supplicant related to |this|.
// This will disconnect this service if it is currently connected.
@@ -161,7 +163,7 @@
// Signal level in dBm. If no current endpoint, returns
// std::numeric_limits<int>::min().
- int16 SignalLevel() const;
+ int16_t SignalLevel() const;
void set_expecting_disconnect(bool val) { expecting_disconnect_ = val; }
bool expecting_disconnect() const { return expecting_disconnect_; }
@@ -234,7 +236,7 @@
Error *error);
static void ParseWEPPassphrase(const std::string &passphrase,
int *key_index,
- std::vector<uint8> *password_bytes,
+ std::vector<uint8_t> *password_bytes,
Error *error);
static bool CheckWEPIsHex(const std::string &passphrase, Error *error);
static bool CheckWEPKeyIndex(const std::string &passphrase, Error *error);
@@ -242,7 +244,7 @@
// Maps a signal value, in dBm, to a "strength" value, from
// |Service::kStrengthMin| to |Service:kStrengthMax|.
- static uint8 SignalToStrength(int16 signal_dbm);
+ static uint8_t SignalToStrength(int16_t signal_dbm);
// Create a default group name for this WiFi service.
std::string GetDefaultStorageIdentifier() const;
@@ -276,11 +278,11 @@
const std::string mode_;
std::string auth_mode_;
bool hidden_ssid_;
- uint16 frequency_;
- std::vector<uint16> frequency_list_;
- uint16 physical_mode_;
+ uint16_t frequency_;
+ std::vector<uint16_t> frequency_list_;
+ uint16_t physical_mode_;
// The raw dBm signal strength from the associated endpoint.
- int16 raw_signal_strength_;
+ int16_t raw_signal_strength_;
std::string hex_ssid_;
std::string storage_identifier_;
std::string bssid_;
diff --git a/wifi_service_unittest.cc b/wifi_service_unittest.cc
index 60f8590..60b163d 100644
--- a/wifi_service_unittest.cc
+++ b/wifi_service_unittest.cc
@@ -103,14 +103,14 @@
return service->connectable();
}
WiFiEndpoint *MakeEndpoint(const string &ssid, const string &bssid,
- uint16 frequency, int16 signal_dbm,
+ uint16_t frequency, int16_t signal_dbm,
bool has_wpa_property, bool has_rsn_property) {
return WiFiEndpoint::MakeEndpoint(
NULL, wifi(), ssid, bssid, WPASupplicant::kNetworkModeInfrastructure,
frequency, signal_dbm, has_wpa_property, has_rsn_property);
}
WiFiEndpoint *MakeOpenEndpoint(const string &ssid, const string &bssid,
- uint16 frequency, int16 signal_dbm) {
+ uint16_t frequency, int16_t signal_dbm) {
return WiFiEndpoint::MakeOpenEndpoint(
NULL, wifi(), ssid, bssid, WPASupplicant::kNetworkModeInfrastructure,
frequency, signal_dbm);
@@ -288,20 +288,20 @@
}
protected:
- static const uint16 kOkEndpointFrequency = 2422;
- static const uint16 kBadEndpointFrequency = 2417;
- static const uint16 kGoodEndpointFrequency = 2412;
- static const int16 kOkEndpointSignal = -50;
- static const int16 kBadEndpointSignal = -75;
- static const int16 kGoodEndpointSignal = -25;
+ static const uint16_t kOkEndpointFrequency = 2422;
+ static const uint16_t kBadEndpointFrequency = 2417;
+ static const uint16_t kGoodEndpointFrequency = 2412;
+ static const int16_t kOkEndpointSignal = -50;
+ static const int16_t kBadEndpointSignal = -75;
+ static const int16_t kGoodEndpointSignal = -25;
static const char *kOkEndpointBssId;
static const char *kGoodEndpointBssId;
static const char *kBadEndpointBssId;
// Can't be both static and const (because initialization requires a
// function call). So choose to be just const.
- const uint8 kOkEndpointStrength;
- const uint8 kBadEndpointStrength;
- const uint8 kGoodEndpointStrength;
+ const uint8_t kOkEndpointStrength;
+ const uint8_t kBadEndpointStrength;
+ const uint8_t kGoodEndpointStrength;
WiFiEndpointRefPtr ok_endpoint;
WiFiEndpointRefPtr bad_endpoint;
WiFiEndpointRefPtr good_endpoint;
@@ -631,7 +631,7 @@
}
MATCHER_P(WEPSecurityArgsKeyIndex, index, "") {
- uint32 index_u32 = index;
+ uint32_t index_u32 = index;
return ContainsKey(arg, WPASupplicant::kPropertyAuthAlg) &&
ContainsKey(arg,
WPASupplicant::kPropertyWEPKey + base::IntToString(index)) &&
@@ -1308,17 +1308,17 @@
// Verify that our mapping is sane, in the sense that it preserves ordering.
// We break the test into two domains, because we assume that positive
// values aren't actually in dBm.
- for (int16 i = std::numeric_limits<int16>::min(); i < 0; ++i) {
- int16 current_mapped = WiFiService::SignalToStrength(i);
- int16 next_mapped = WiFiService::SignalToStrength(i+1);
+ for (int16_t i = std::numeric_limits<int16_t>::min(); i < 0; ++i) {
+ int16_t current_mapped = WiFiService::SignalToStrength(i);
+ int16_t next_mapped = WiFiService::SignalToStrength(i+1);
EXPECT_LE(current_mapped, next_mapped)
<< "(original values " << i << " " << i+1 << ")";
EXPECT_GE(current_mapped, Service::kStrengthMin);
EXPECT_LE(current_mapped, Service::kStrengthMax);
}
- for (int16 i = 1; i < std::numeric_limits<int16>::max(); ++i) {
- int16 current_mapped = WiFiService::SignalToStrength(i);
- int16 next_mapped = WiFiService::SignalToStrength(i+1);
+ for (int16_t i = 1; i < std::numeric_limits<int16_t>::max(); ++i) {
+ int16_t current_mapped = WiFiService::SignalToStrength(i);
+ int16_t next_mapped = WiFiService::SignalToStrength(i+1);
EXPECT_LE(current_mapped, next_mapped)
<< "(original values " << i << " " << i+1 << ")";
EXPECT_GE(current_mapped, Service::kStrengthMin);
@@ -1550,7 +1550,7 @@
}
MATCHER_P(IsSetwiseEqual, expected_set, "") {
- set<uint16> arg_set(arg.begin(), arg.end());
+ set<uint16_t> arg_set(arg.begin(), arg.end());
return arg_set == expected_set;
}
@@ -1561,17 +1561,17 @@
EXPECT_CALL(adaptor, EmitBoolChanged(_, _)).Times(AnyNumber());
// No endpoints -> empty list.
- EXPECT_EQ(vector<uint16>(), service->frequency_list());
+ EXPECT_EQ(vector<uint16_t>(), service->frequency_list());
// Add endpoint -> endpoint's frequency in list.
EXPECT_CALL(adaptor, EmitUint16sChanged(
- kWifiFrequencyListProperty, vector<uint16>{kGoodEndpointFrequency}));
+ kWifiFrequencyListProperty, vector<uint16_t>{kGoodEndpointFrequency}));
service->AddEndpoint(good_endpoint);
Mock::VerifyAndClearExpectations(&adaptor);
// Add another endpoint -> both frequencies in list.
// Order doesn't matter.
- set<uint16> expected_frequencies{kGoodEndpointFrequency,
+ set<uint16_t> expected_frequencies{kGoodEndpointFrequency,
kOkEndpointFrequency};
EXPECT_CALL(adaptor, EmitUint16sChanged(
kWifiFrequencyListProperty, IsSetwiseEqual(expected_frequencies)));
@@ -1580,7 +1580,7 @@
// Remove endpoint -> other endpoint's frequency remains.
EXPECT_CALL(adaptor, EmitUint16sChanged(
- kWifiFrequencyListProperty, vector<uint16>{kOkEndpointFrequency}));
+ kWifiFrequencyListProperty, vector<uint16_t>{kOkEndpointFrequency}));
service->RemoveEndpoint(good_endpoint);
Mock::VerifyAndClearExpectations(&adaptor);
@@ -1591,19 +1591,19 @@
simple_ssid_string(), "aa:bb:cc:dd:ee:ff", ok_endpoint->frequency(), 0);
service->AddEndpoint(same_freq_as_ok_endpoint);
EXPECT_THAT(service->frequency_list(),
- IsSetwiseEqual(set<uint16>{kOkEndpointFrequency}));
+ IsSetwiseEqual(set<uint16_t>{kOkEndpointFrequency}));
Mock::VerifyAndClearExpectations(&adaptor);
// Remove endpoint with same frequency -> frequency remains.
// Notification may or may not occur -- don't care.
service->RemoveEndpoint(ok_endpoint);
- EXPECT_EQ(vector<uint16>{same_freq_as_ok_endpoint->frequency()},
+ EXPECT_EQ(vector<uint16_t>{same_freq_as_ok_endpoint->frequency()},
service->frequency_list());
Mock::VerifyAndClearExpectations(&adaptor);
// Remove last endpoint. Frequency list goes empty.
EXPECT_CALL(adaptor, EmitUint16sChanged(
- kWifiFrequencyListProperty, vector<uint16>{}));
+ kWifiFrequencyListProperty, vector<uint16_t>{}));
service->RemoveEndpoint(same_freq_as_ok_endpoint);
Mock::VerifyAndClearExpectations(&adaptor);
}
diff --git a/wifi_unittest.cc b/wifi_unittest.cc
index 15746c1..58e1232 100644
--- a/wifi_unittest.cc
+++ b/wifi_unittest.cc
@@ -380,15 +380,15 @@
EXPECT_EQ(method, wifi_->scan_method_);
}
- void SetRoamThresholdMember(uint16 threshold) {
+ void SetRoamThresholdMember(uint16_t threshold) {
wifi_->roam_threshold_db_ = threshold;
}
- bool SetRoamThreshold(uint16 threshold) {
+ bool SetRoamThreshold(uint16_t threshold) {
return wifi_->SetRoamThreshold(threshold, nullptr);
}
- uint16 GetRoamThreshold() const {
+ uint16_t GetRoamThreshold() const {
return wifi_->GetRoamThreshold(nullptr);
}
@@ -466,7 +466,7 @@
return MakeMockServiceWithSSID(vector<uint8_t>(1, 'a'), security);
}
::DBus::Path MakeNewEndpointAndService(int16_t signal_strength,
- uint16 frequency,
+ uint16_t frequency,
const char *mode,
WiFiEndpointRefPtr *endpoint_ptr,
MockWiFiServiceRefPtr *service_ptr) {
@@ -492,7 +492,7 @@
::DBus::Path AddEndpointToService(
WiFiServiceRefPtr service,
int16_t signal_strength,
- uint16 frequency,
+ uint16_t frequency,
const char *mode,
WiFiEndpointRefPtr *endpoint_ptr) {
string ssid(service->ssid().begin(), service->ssid().end());
@@ -646,7 +646,7 @@
const string &ssid,
const string &bssid,
int16_t signal_strength,
- uint16 frequency,
+ uint16_t frequency,
const char *mode);
void ReportIPConfigComplete() {
wifi_->OnIPConfigUpdated(dhcp_config_);
@@ -794,11 +794,11 @@
wifi_->OnLinkMonitorFailure();
}
- bool SetBgscanShortInterval(const uint16 &interval, Error *error) {
+ bool SetBgscanShortInterval(const uint16_t &interval, Error *error) {
return wifi_->SetBgscanShortInterval(interval, error);
}
- bool SetBgscanSignalThreshold(const int32 &threshold, Error *error) {
+ bool SetBgscanSignalThreshold(const int32_t &threshold, Error *error) {
return wifi_->SetBgscanSignalThreshold(threshold, error);
}
@@ -884,7 +884,7 @@
static const char kNetworkModeInfrastructure[];
static const char kBSSName[];
static const char kSSIDName[];
- static const uint16 kRoamThreshold;
+ static const uint16_t kRoamThreshold;
scoped_ptr<MockDBusServiceProxy> dbus_service_proxy_;
scoped_ptr<MockSupplicantProcessProxy> supplicant_process_proxy_;
@@ -910,7 +910,7 @@
const char WiFiObjectTest::kNetworkModeInfrastructure[] = "infrastructure";
const char WiFiObjectTest::kBSSName[] = "bss0";
const char WiFiObjectTest::kSSIDName[] = "ssid0";
-const uint16 WiFiObjectTest::kRoamThreshold = 32; // Arbitrary value.
+const uint16_t WiFiObjectTest::kRoamThreshold = 32; // Arbitrary value.
void WiFiObjectTest::RemoveBSS(const ::DBus::Path &bss_path) {
wifi_->BSSRemovedTask(bss_path);
@@ -920,7 +920,7 @@
const string &ssid,
const string &bssid,
int16_t signal_strength,
- uint16 frequency,
+ uint16_t frequency,
const char *mode) {
map<string, ::DBus::Variant> bss_properties;
@@ -1500,7 +1500,7 @@
"bss2", "ssid2", "00:00:00:00:00:02", 2, 0, kNetworkModeInfrastructure);
ReportBSS(
"bss3", "ssid3", "00:00:00:00:00:03", 3, 0, kNetworkModeInfrastructure);
- const uint16 frequency = 2412;
+ const uint16_t frequency = 2412;
ReportBSS("bss4", "ssid4", "00:00:00:00:00:04", 4, frequency,
kNetworkModeAdHoc);
@@ -3042,7 +3042,7 @@
ReportCertification(args);
Mock::VerifyAndClearExpectations(&log);
- const uint32 kDepth = 123;
+ const uint32_t kDepth = 123;
args[WPASupplicant::kInterfacePropertyDepth].writer().append_uint32(kDepth);
EXPECT_CALL(log,
@@ -3130,7 +3130,7 @@
string ssid;
string bssid;
int16_t signal_strength;
- uint16 frequency;
+ uint16_t frequency;
const char* mode;
};
@@ -3249,7 +3249,7 @@
// SetBgscanShortInterval
{
Error error;
- static const uint16 kKnownScanInterval = 4;
+ static const uint16_t kKnownScanInterval = 4;
// Set to known value.
EXPECT_TRUE(SetBgscanShortInterval(kKnownScanInterval, &error));
EXPECT_TRUE(error.IsSuccess());
@@ -3261,7 +3261,7 @@
// SetBgscanSignalThreshold
{
Error error;
- static const int32 kKnownSignalThreshold = 4;
+ static const int32_t kKnownSignalThreshold = 4;
// Set to known value.
EXPECT_TRUE(SetBgscanSignalThreshold(kKnownSignalThreshold, &error));
EXPECT_TRUE(error.IsSuccess());
diff --git a/wimax_device_proxy.cc b/wimax_device_proxy.cc
index 8a954f5..a5687af 100644
--- a/wimax_device_proxy.cc
+++ b/wimax_device_proxy.cc
@@ -76,7 +76,7 @@
proxy_.set_status_changed_callback(callback);
}
-uint8 WiMaxDeviceProxy::Index(Error *error) {
+uint8_t WiMaxDeviceProxy::Index(Error *error) {
SLOG(DBus, 2) << __func__;
try {
return proxy_.Index();
@@ -151,7 +151,7 @@
networks_changed_callback_.Run(rpc_networks);
}
-void WiMaxDeviceProxy::Proxy::StatusChanged(const int32 &status) {
+void WiMaxDeviceProxy::Proxy::StatusChanged(const int32_t &status) {
SLOG(DBus, 2) << __func__ << "(" << status << ")";
if (status_changed_callback_.is_null()) {
return;
diff --git a/wimax_device_proxy.h b/wimax_device_proxy.h
index 08eb685..e96fde8 100644
--- a/wimax_device_proxy.h
+++ b/wimax_device_proxy.h
@@ -44,7 +44,7 @@
const NetworksChangedCallback &callback);
virtual void set_status_changed_callback(
const StatusChangedCallback &callback);
- virtual uint8 Index(Error *error);
+ virtual uint8_t Index(Error *error);
virtual std::string Name(Error *error);
virtual RpcIdentifiers Networks(Error *error);
@@ -61,7 +61,7 @@
private:
// Signal callbacks inherited from WiMaxManager::Device_proxy.
virtual void NetworksChanged(const std::vector<DBus::Path> &networks);
- virtual void StatusChanged(const int32 &status);
+ virtual void StatusChanged(const int32_t &status);
// Method callbacks inherited from WiMaxManager::Device_proxy.
virtual void EnableCallback(const DBus::Error &error, void *data);
diff --git a/wimax_device_proxy_interface.h b/wimax_device_proxy_interface.h
index f15fa9c..f12b895 100644
--- a/wimax_device_proxy_interface.h
+++ b/wimax_device_proxy_interface.h
@@ -51,7 +51,7 @@
const StatusChangedCallback &callback) = 0;
// Properties.
- virtual uint8 Index(Error *error) = 0;
+ virtual uint8_t Index(Error *error) = 0;
virtual std::string Name(Error *error) = 0;
virtual RpcIdentifiers Networks(Error *error) = 0;
};
diff --git a/wimax_network_proxy.cc b/wimax_network_proxy.cc
index 2d3c04e..32242a2 100644
--- a/wimax_network_proxy.cc
+++ b/wimax_network_proxy.cc
@@ -28,7 +28,7 @@
proxy_.set_signal_strength_changed_callback(callback);
}
-uint32 WiMaxNetworkProxy::Identifier(Error *error) {
+uint32_t WiMaxNetworkProxy::Identifier(Error *error) {
SLOG(DBus, 2) << __func__;
try {
return proxy_.Identifier();
@@ -114,7 +114,7 @@
}
void WiMaxNetworkProxy::Proxy::SignalStrengthChanged(
- const int32 &signal_strength) {
+ const int32_t &signal_strength) {
SLOG(DBus, 2) << __func__ << "(" << signal_strength << ")";
if (!signal_strength_changed_callback_.is_null()) {
signal_strength_changed_callback_.Run(signal_strength);
diff --git a/wimax_network_proxy.h b/wimax_network_proxy.h
index ccd1750..30cd4a6 100644
--- a/wimax_network_proxy.h
+++ b/wimax_network_proxy.h
@@ -25,7 +25,7 @@
virtual RpcIdentifier path() const;
virtual void set_signal_strength_changed_callback(
const SignalStrengthChangedCallback &callback);
- virtual uint32 Identifier(Error *error);
+ virtual uint32_t Identifier(Error *error);
virtual std::string Name(Error *error);
virtual int Type(Error *error);
virtual int CINR(Error *error);
@@ -44,7 +44,7 @@
private:
// Signal callbacks inherited from WiMaxManager::Network_proxy.
- virtual void SignalStrengthChanged(const int32 &signal_strength);
+ virtual void SignalStrengthChanged(const int32_t &signal_strength);
// Method callbacks inherited from WiMaxManager::Network_proxy.
// [None]
diff --git a/wimax_network_proxy_interface.h b/wimax_network_proxy_interface.h
index c62469d..0f99cd9 100644
--- a/wimax_network_proxy_interface.h
+++ b/wimax_network_proxy_interface.h
@@ -35,7 +35,7 @@
const SignalStrengthChangedCallback &callback) = 0;
// Properties.
- virtual uint32 Identifier(Error *error) = 0;
+ virtual uint32_t Identifier(Error *error) = 0;
virtual std::string Name(Error *error) = 0;
virtual int Type(Error *error) = 0;
virtual int CINR(Error *error) = 0;
diff --git a/wimax_provider.cc b/wimax_provider.cc
index b2b0eac..d321fbe 100644
--- a/wimax_provider.cc
+++ b/wimax_provider.cc
@@ -357,7 +357,7 @@
if (error.IsFailure()) {
return;
}
- uint32 identifier = proxy->Identifier(&error);
+ uint32_t identifier = proxy->Identifier(&error);
if (error.IsFailure()) {
return;
}
diff --git a/wimax_provider_unittest.cc b/wimax_provider_unittest.cc
index 2b4b643..4a958dd 100644
--- a/wimax_provider_unittest.cc
+++ b/wimax_provider_unittest.cc
@@ -49,7 +49,7 @@
return wimax_manager::kDeviceObjectPathPrefix + GetTestLinkName(index);
}
-string GetTestNetworkPath(uint32 identifier) {
+string GetTestNetworkPath(uint32_t identifier) {
return base::StringPrintf("%s%08x",
wimax_manager::kNetworkObjectPathPrefix,
identifier);
@@ -237,7 +237,7 @@
TEST_F(WiMaxProviderTest, RetrieveNetworkInfo) {
static const char kName[] = "Default Network";
- const uint32 kIdentifier = 0xabcdef;
+ const uint32_t kIdentifier = 0xabcdef;
static const char kNetworkId[] = "00abcdef";
string network_path = GetTestNetworkPath(kIdentifier);
EXPECT_CALL(proxy_factory_, CreateWiMaxNetworkProxy(network_path))
@@ -271,7 +271,7 @@
}
TEST_F(WiMaxProviderTest, StartLiveServices) {
- const uint32 kIdentifier = 0x1234567;
+ const uint32_t kIdentifier = 0x1234567;
static const char kNetworkId[] = "01234567";
static const char kName[] = "Some WiMAX Provider";
vector<scoped_refptr<MockWiMaxService> > services(4);
@@ -354,7 +354,7 @@
TEST_F(WiMaxProviderTest, OnNetworksChanged) {
static const char kName[] = "Default Network";
- const uint32 kIdentifier = 0xabcdef;
+ const uint32_t kIdentifier = 0xabcdef;
static const char kNetworkId[] = "00abcdef";
// Started service to be stopped.
diff --git a/wimax_service.cc b/wimax_service.cc
index a9eaff9..9eaac8f 100644
--- a/wimax_service.cc
+++ b/wimax_service.cc
@@ -99,7 +99,7 @@
if (error.IsFailure()) {
return false;
}
- uint32 identifier = proxy->Identifier(&error);
+ uint32_t identifier = proxy->Identifier(&error);
if (error.IsFailure()) {
return false;
}
@@ -265,7 +265,7 @@
}
// static
-WiMaxNetworkId WiMaxService::ConvertIdentifierToNetworkId(uint32 identifier) {
+WiMaxNetworkId WiMaxService::ConvertIdentifierToNetworkId(uint32_t identifier) {
return base::StringPrintf("%08x", identifier);
}
diff --git a/wimax_service.h b/wimax_service.h
index 2d8c725..583b7f4 100644
--- a/wimax_service.h
+++ b/wimax_service.h
@@ -57,7 +57,7 @@
bool is_default() const { return is_default_; }
void set_is_default(bool is_default) { is_default_ = is_default; }
- static WiMaxNetworkId ConvertIdentifierToNetworkId(uint32 identifier);
+ static WiMaxNetworkId ConvertIdentifierToNetworkId(uint32_t identifier);
// Initializes the storage identifier. Note that the friendly service name and
// the |network_id_| must already be initialized.
diff --git a/wimax_service_unittest.cc b/wimax_service_unittest.cc
index 1617f6f..13e939b 100644
--- a/wimax_service_unittest.cc
+++ b/wimax_service_unittest.cc
@@ -119,7 +119,7 @@
TEST_F(WiMaxServiceTest, StartStop) {
static const char kName[] = "My WiMAX Network";
- const uint32 kIdentifier = 0x1234abcd;
+ const uint32_t kIdentifier = 0x1234abcd;
const int kStrength = 66;
EXPECT_FALSE(service_->connectable());
EXPECT_FALSE(service_->IsStarted());
diff --git a/wpa_supplicant.cc b/wpa_supplicant.cc
index 30a117d..37dd751 100644
--- a/wpa_supplicant.cc
+++ b/wpa_supplicant.cc
@@ -146,7 +146,7 @@
// static
bool WPASupplicant::ExtractRemoteCertification(
const map<string, DBus::Variant> &properties,
- string *subject, uint32 *depth) {
+ string *subject, uint32_t *depth) {
map<string, ::DBus::Variant>::const_iterator depth_it =
properties.find(WPASupplicant::kInterfacePropertyDepth);
if (depth_it == properties.end()) {
diff --git a/wpa_supplicant.h b/wpa_supplicant.h
index 3521fb9..1bc6aea 100644
--- a/wpa_supplicant.h
+++ b/wpa_supplicant.h
@@ -145,7 +145,7 @@
// extracted successfully, false otherwise.
static bool ExtractRemoteCertification(
const std::map<std::string, DBus::Variant> &properties,
- std::string *subject, uint32 *depth);
+ std::string *subject, uint32_t *depth);
};
} // namespace shill
diff --git a/wpa_supplicant_unittest.cc b/wpa_supplicant_unittest.cc
index d0b0cb5..cd44862 100644
--- a/wpa_supplicant_unittest.cc
+++ b/wpa_supplicant_unittest.cc
@@ -28,7 +28,7 @@
TEST_F(WPASupplicantTest, ExtractRemoteCertificationEmpty) {
string subject;
- uint32 depth = 0;
+ uint32_t depth = 0;
ScopedMockLog log;
EXPECT_CALL(log, Log(logging::LOG_ERROR, _, EndsWith("no depth parameter.")));
EXPECT_FALSE(WPASupplicant::ExtractRemoteCertification(
@@ -39,8 +39,8 @@
TEST_F(WPASupplicantTest, ExtractRemoteCertificationDepthOnly) {
string subject;
- const uint32 kDepthValue = 100;
- uint32 depth = kDepthValue - 1;
+ const uint32_t kDepthValue = 100;
+ uint32_t depth = kDepthValue - 1;
property_map_[WPASupplicant::kInterfacePropertyDepth]
.writer().append_uint32(kDepthValue);
ScopedMockLog log;
@@ -55,7 +55,7 @@
TEST_F(WPASupplicantTest, ExtractRemoteCertificationSubjectOnly) {
const char kSubjectName[] = "subject-name";
string subject;
- uint32 depth = 0;
+ uint32_t depth = 0;
property_map_[WPASupplicant::kInterfacePropertySubject]
.writer().append_string(kSubjectName);
ScopedMockLog log;
@@ -69,8 +69,8 @@
TEST_F(WPASupplicantTest, ExtractRemoteCertificationSubjectAndDepth) {
const char kSubjectName[] = "subject-name";
string subject;
- const uint32 kDepthValue = 100;
- uint32 depth = 0;
+ const uint32_t kDepthValue = 100;
+ uint32_t depth = 0;
property_map_[WPASupplicant::kInterfacePropertySubject]
.writer().append_string(kSubjectName);
property_map_[WPASupplicant::kInterfacePropertyDepth]