aboutsummaryrefslogtreecommitdiffstats
path: root/chromeos/url_utils.cc
diff options
context:
space:
mode:
authorAlex Vakulenko <avakulenko@chromium.org>2015-01-13 09:39:25 -0800
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-01-14 04:55:56 +0000
commit05d29044d14a60775ed6c51c75a414eb0cb50347 (patch)
treed4936bb058c2c5c85e4687ce0febf2f52c9c9847 /chromeos/url_utils.cc
parentf5effe9e46e479e6fdc4f6928da545d48dcd3997 (diff)
downloadplatform_external_libbrillo-05d29044d14a60775ed6c51c75a414eb0cb50347.tar.gz
platform_external_libbrillo-05d29044d14a60775ed6c51c75a414eb0cb50347.tar.bz2
platform_external_libbrillo-05d29044d14a60775ed6c51c75a414eb0cb50347.zip
libchromeos: Cleaned up code with clang-format
Ran clang-format to bring the source code formatting in libchromeos closer to the official Chromium coding style. BUG=None TEST=FEATURES=test emerge-link libchromeos Change-Id: I68cfcdd517711050e30ebfff7d848054df42d125 Reviewed-on: https://chromium-review.googlesource.com/240430 Trybot-Ready: Alex Vakulenko <avakulenko@chromium.org> Tested-by: Alex Vakulenko <avakulenko@chromium.org> Reviewed-by: Vitaly Buka <vitalybuka@chromium.org> Reviewed-by: Christopher Wiley <wiley@chromium.org> Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
Diffstat (limited to 'chromeos/url_utils.cc')
-rw-r--r--chromeos/url_utils.cc29
1 files changed, 15 insertions, 14 deletions
diff --git a/chromeos/url_utils.cc b/chromeos/url_utils.cc
index 07cbc9a..3a2e166 100644
--- a/chromeos/url_utils.cc
+++ b/chromeos/url_utils.cc
@@ -21,8 +21,10 @@ namespace {
// If |exclude_fragment| is true, the function returns the start character and
// the length of the query string alone. If it is false, the query string length
// will include both the query string and the fragment.
-bool GetQueryStringPos(const std::string& url, bool exclude_fragment,
- size_t* query_pos, size_t* query_len) {
+bool GetQueryStringPos(const std::string& url,
+ bool exclude_fragment,
+ size_t* query_pos,
+ size_t* query_len) {
size_t query_start = url.find_first_of("?#");
if (query_start == std::string::npos) {
*query_pos = url.size();
@@ -61,13 +63,12 @@ std::string url::TrimOffQueryString(std::string* url) {
return query_string;
}
-std::string url::Combine(
- const std::string& url, const std::string& subpath) {
+std::string url::Combine(const std::string& url, const std::string& subpath) {
return CombineMultiple(url, {subpath});
}
-std::string url::CombineMultiple(
- const std::string& url, const std::vector<std::string>& parts) {
+std::string url::CombineMultiple(const std::string& url,
+ const std::vector<std::string>& parts) {
std::string result = url;
if (!parts.empty()) {
std::string query_string = TrimOffQueryString(&result);
@@ -85,8 +86,7 @@ std::string url::CombineMultiple(
return result;
}
-std::string url::GetQueryString(
- const std::string& url, bool remove_fragment) {
+std::string url::GetQueryString(const std::string& url, bool remove_fragment) {
std::string query_string;
size_t query_pos, query_len;
if (GetQueryStringPos(url, remove_fragment, &query_pos, &query_len)) {
@@ -104,8 +104,8 @@ data_encoding::WebParamList url::GetQueryStringParameters(
return data_encoding::WebParamsDecode(query_string);
}
-std::string url::GetQueryStringValue(
- const std::string& url, const std::string& name) {
+std::string url::GetQueryStringValue(const std::string& url,
+ const std::string& name) {
return GetQueryStringValue(GetQueryStringParameters(url), name);
}
@@ -118,8 +118,8 @@ std::string url::GetQueryStringValue(const data_encoding::WebParamList& params,
return std::string();
}
-std::string url::RemoveQueryString(
- const std::string& url, bool remove_fragment_too) {
+std::string url::RemoveQueryString(const std::string& url,
+ bool remove_fragment_too) {
size_t query_pos, query_len;
if (!GetQueryStringPos(url, !remove_fragment_too, &query_pos, &query_len))
return url;
@@ -131,8 +131,9 @@ std::string url::RemoveQueryString(
return result;
}
-std::string url::AppendQueryParam(
- const std::string& url, const std::string& name, const std::string& value) {
+std::string url::AppendQueryParam(const std::string& url,
+ const std::string& name,
+ const std::string& value) {
return AppendQueryParams(url, {{name, value}});
}