Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(102)

Unified Diff: net/base/net_util_unittest.cc

Issue 1158923005: Use the exact-width integer types defined in <stdint.h> rather than (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Tweak comments. Exclude mime_sniffer*. Rebase. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/base/net_util_unittest.cc
diff --git a/net/base/net_util_unittest.cc b/net/base/net_util_unittest.cc
index 8870f64cfdefb65239d992790e963c18755da578..78911d0bbbcfae278dede1394333ccc5af834eef 100644
--- a/net/base/net_util_unittest.cc
+++ b/net/base/net_util_unittest.cc
@@ -56,7 +56,7 @@ struct HeaderCase {
// Fills in sockaddr for the given 32-bit address (IPv4.)
// |bytes| should be an array of length 4.
-void MakeIPv4Address(const uint8* bytes, int port, SockaddrStorage* storage) {
+void MakeIPv4Address(const uint8_t* bytes, int port, SockaddrStorage* storage) {
memset(&storage->addr_storage, 0, sizeof(storage->addr_storage));
storage->addr_len = sizeof(struct sockaddr_in);
struct sockaddr_in* addr4 = reinterpret_cast<sockaddr_in*>(storage->addr);
@@ -67,7 +67,7 @@ void MakeIPv4Address(const uint8* bytes, int port, SockaddrStorage* storage) {
// Fills in sockaddr for the given 128-bit address (IPv6.)
// |bytes| should be an array of length 16.
-void MakeIPv6Address(const uint8* bytes, int port, SockaddrStorage* storage) {
+void MakeIPv6Address(const uint8_t* bytes, int port, SockaddrStorage* storage) {
memset(&storage->addr_storage, 0, sizeof(storage->addr_storage));
storage->addr_len = sizeof(struct sockaddr_in6);
struct sockaddr_in6* addr6 = reinterpret_cast<sockaddr_in6*>(storage->addr);
@@ -332,7 +332,7 @@ TEST(NetUtilTest, GetHostAndOptionalPort) {
TEST(NetUtilTest, NetAddressToString_IPv4) {
const struct {
- uint8 addr[4];
+ uint8_t addr[4];
const char* const result;
} tests[] = {
{{0, 0, 0, 0}, "0.0.0.0"},
@@ -350,7 +350,7 @@ TEST(NetUtilTest, NetAddressToString_IPv4) {
TEST(NetUtilTest, NetAddressToString_IPv6) {
const struct {
- uint8 addr[16];
+ uint8_t addr[16];
const char* const result;
} tests[] = {
{{0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10, 0xFE, 0xDC, 0xBA,
@@ -367,7 +367,7 @@ TEST(NetUtilTest, NetAddressToString_IPv6) {
}
TEST(NetUtilTest, NetAddressToStringWithPort_IPv4) {
- uint8 addr[] = {127, 0, 0, 1};
+ uint8_t addr[] = {127, 0, 0, 1};
SockaddrStorage storage;
MakeIPv4Address(addr, 166, &storage);
std::string result = NetAddressToStringWithPort(storage.addr,
@@ -376,7 +376,7 @@ TEST(NetUtilTest, NetAddressToStringWithPort_IPv4) {
}
TEST(NetUtilTest, NetAddressToStringWithPort_IPv6) {
- uint8 addr[] = {
+ uint8_t addr[] = {
0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10, 0xFE, 0xDC, 0xBA,
0x98, 0x76, 0x54, 0x32, 0x10
};

Powered by Google App Engine
This is Rietveld 408576698