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/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;