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

Side by Side Diff: net/base/net_util.cc

Issue 13145003: Rewrite std::string("") to std::string(), Linux edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ugh Created 7 years, 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/base/mime_util_unittest.cc ('k') | net/base/net_util_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/base/net_util.h" 5 #include "net/base/net_util.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 10
(...skipping 1415 matching lines...) Expand 10 before | Expand all | Expand 10 after
1426 return base::StringPrintf("%s:%d", address_str.c_str(), port); 1426 return base::StringPrintf("%s:%d", address_str.c_str(), port);
1427 } 1427 }
1428 1428
1429 std::string NetAddressToString(const struct sockaddr* sa, 1429 std::string NetAddressToString(const struct sockaddr* sa,
1430 socklen_t sock_addr_len) { 1430 socklen_t sock_addr_len) {
1431 const uint8* address; 1431 const uint8* address;
1432 size_t address_len; 1432 size_t address_len;
1433 if (!GetIPAddressFromSockAddr(sa, sock_addr_len, &address, 1433 if (!GetIPAddressFromSockAddr(sa, sock_addr_len, &address,
1434 &address_len, NULL)) { 1434 &address_len, NULL)) {
1435 NOTREACHED(); 1435 NOTREACHED();
1436 return ""; 1436 return std::string();
1437 } 1437 }
1438 return IPAddressToString(address, address_len); 1438 return IPAddressToString(address, address_len);
1439 } 1439 }
1440 1440
1441 std::string NetAddressToStringWithPort(const struct sockaddr* sa, 1441 std::string NetAddressToStringWithPort(const struct sockaddr* sa,
1442 socklen_t sock_addr_len) { 1442 socklen_t sock_addr_len) {
1443 const uint8* address; 1443 const uint8* address;
1444 size_t address_len; 1444 size_t address_len;
1445 uint16 port; 1445 uint16 port;
1446 if (!GetIPAddressFromSockAddr(sa, sock_addr_len, &address, 1446 if (!GetIPAddressFromSockAddr(sa, sock_addr_len, &address,
1447 &address_len, &port)) { 1447 &address_len, &port)) {
1448 NOTREACHED(); 1448 NOTREACHED();
1449 return ""; 1449 return std::string();
1450 } 1450 }
1451 return IPAddressToStringWithPort(address, address_len, port); 1451 return IPAddressToStringWithPort(address, address_len, port);
1452 } 1452 }
1453 1453
1454 std::string IPAddressToString(const IPAddressNumber& addr) { 1454 std::string IPAddressToString(const IPAddressNumber& addr) {
1455 return IPAddressToString(&addr.front(), addr.size()); 1455 return IPAddressToString(&addr.front(), addr.size());
1456 } 1456 }
1457 1457
1458 std::string IPAddressToStringWithPort(const IPAddressNumber& addr, 1458 std::string IPAddressToStringWithPort(const IPAddressNumber& addr,
1459 uint16 port) { 1459 uint16 port) {
(...skipping 722 matching lines...) Expand 10 before | Expand all | Expand 10 after
2182 2182
2183 NetworkInterface::NetworkInterface(const std::string& name, 2183 NetworkInterface::NetworkInterface(const std::string& name,
2184 const IPAddressNumber& address) 2184 const IPAddressNumber& address)
2185 : name(name), address(address) { 2185 : name(name), address(address) {
2186 } 2186 }
2187 2187
2188 NetworkInterface::~NetworkInterface() { 2188 NetworkInterface::~NetworkInterface() {
2189 } 2189 }
2190 2190
2191 } // namespace net 2191 } // namespace net
OLDNEW
« no previous file with comments | « net/base/mime_util_unittest.cc ('k') | net/base/net_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698