diff options
| author | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-22 00:09:23 +0000 |
|---|---|---|
| committer | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-22 00:09:23 +0000 |
| commit | 0318f92ba7c54fc5ef6397c6d58250fea95c7196 (patch) | |
| tree | 5bcef0db3fb7334c5a4fd6d25444a2b86c17ec5e /url/url_canon_ip.h | |
| parent | 7b691d3fee8d10f130007016caefa0c6c6cd0681 (diff) | |
| download | chromium_src-0318f92ba7c54fc5ef6397c6d58250fea95c7196.zip chromium_src-0318f92ba7c54fc5ef6397c6d58250fea95c7196.tar.gz chromium_src-0318f92ba7c54fc5ef6397c6d58250fea95c7196.tar.bz2 | |
Renamed namespaces in src/url.
url_util -> url
url_parse -> url
url_canon -> url
BUG=364747
R=brettw@chromium.org, thestig@chromium.org, willchan@chromium.org
Review URL: https://codereview.chromium.org/242463002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265120 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'url/url_canon_ip.h')
| -rw-r--r-- | url/url_canon_ip.h | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/url/url_canon_ip.h b/url/url_canon_ip.h index b2e4a7e..19ecfdb 100644 --- a/url/url_canon_ip.h +++ b/url/url_canon_ip.h @@ -10,7 +10,7 @@ #include "url/url_export.h" #include "url/url_parse.h" -namespace url_canon { +namespace url { // Writes the given IPv4 address to |output|. URL_EXPORT void AppendIPv4Address(const unsigned char address[4], @@ -39,11 +39,11 @@ URL_EXPORT void AppendIPv6Address(const unsigned char address[16], // notice these spaces and escape them, which will make IP address finding // fail. This seems like better behavior than stripping after a space. URL_EXPORT bool FindIPv4Components(const char* spec, - const url_parse::Component& host, - url_parse::Component components[4]); + const Component& host, + Component components[4]); URL_EXPORT bool FindIPv4Components(const base::char16* spec, - const url_parse::Component& host, - url_parse::Component components[4]); + const Component& host, + Component components[4]); // Converts an IPv4 address to a 32-bit number (network byte order). // @@ -56,16 +56,14 @@ URL_EXPORT bool FindIPv4Components(const base::char16* spec, // // On success, |num_ipv4_components| will be populated with the number of // components in the IPv4 address. -URL_EXPORT CanonHostInfo::Family IPv4AddressToNumber( - const char* spec, - const url_parse::Component& host, - unsigned char address[4], - int* num_ipv4_components); -URL_EXPORT CanonHostInfo::Family IPv4AddressToNumber( - const base::char16* spec, - const url_parse::Component& host, - unsigned char address[4], - int* num_ipv4_components); +URL_EXPORT CanonHostInfo::Family IPv4AddressToNumber(const char* spec, + const Component& host, + unsigned char address[4], + int* num_ipv4_components); +URL_EXPORT CanonHostInfo::Family IPv4AddressToNumber(const base::char16* spec, + const Component& host, + unsigned char address[4], + int* num_ipv4_components); // Converts an IPv6 address to a 128-bit number (network byte order), returning // true on success. False means that the input was not a valid IPv6 address. @@ -73,12 +71,12 @@ URL_EXPORT CanonHostInfo::Family IPv4AddressToNumber( // NOTE that |host| is expected to be surrounded by square brackets. // i.e. "[::1]" rather than "::1". URL_EXPORT bool IPv6AddressToNumber(const char* spec, - const url_parse::Component& host, + const Component& host, unsigned char address[16]); URL_EXPORT bool IPv6AddressToNumber(const base::char16* spec, - const url_parse::Component& host, + const Component& host, unsigned char address[16]); -} // namespace url_canon +} // namespace url #endif // URL_URL_CANON_IP_H_ |