| Index: net/websockets/websocket_extension_parser.cc
|
| diff --git a/net/websockets/websocket_extension_parser.cc b/net/websockets/websocket_extension_parser.cc
|
| index 28a2db16f2775e3410a47e35d51ea12792f63682..286fde5c7d9ad0db22e97e233298b09145dda09a 100644
|
| --- a/net/websockets/websocket_extension_parser.cc
|
| +++ b/net/websockets/websocket_extension_parser.cc
|
| @@ -8,9 +8,11 @@
|
|
|
| namespace net {
|
|
|
| -WebSocketExtensionParser::WebSocketExtensionParser() {}
|
| +WebSocketExtensionParser::WebSocketExtensionParser() {
|
| +}
|
|
|
| -WebSocketExtensionParser::~WebSocketExtensionParser() {}
|
| +WebSocketExtensionParser::~WebSocketExtensionParser() {
|
| +}
|
|
|
| void WebSocketExtensionParser::Parse(const char* data, size_t size) {
|
| current_ = data;
|
| @@ -18,7 +20,8 @@ void WebSocketExtensionParser::Parse(const char* data, size_t size) {
|
| has_error_ = false;
|
|
|
| ConsumeExtension(&extension_);
|
| - if (has_error_) return;
|
| + if (has_error_)
|
| + return;
|
| ConsumeSpaces();
|
| has_error_ = has_error_ || (current_ != end_);
|
| }
|
| @@ -38,13 +41,15 @@ void WebSocketExtensionParser::ConsumeExtension(WebSocketExtension* extension) {
|
| DCHECK(!has_error_);
|
| base::StringPiece name;
|
| ConsumeToken(&name);
|
| - if (has_error_) return;
|
| + if (has_error_)
|
| + return;
|
| *extension = WebSocketExtension(name.as_string());
|
|
|
| while (ConsumeIfMatch(';')) {
|
| WebSocketExtension::Parameter parameter((std::string()));
|
| ConsumeExtensionParameter(¶meter);
|
| - if (has_error_) return;
|
| + if (has_error_)
|
| + return;
|
| extension->Add(parameter);
|
| }
|
| }
|
| @@ -56,7 +61,8 @@ void WebSocketExtensionParser::ConsumeExtensionParameter(
|
| std::string value_string;
|
|
|
| ConsumeToken(&name);
|
| - if (has_error_) return;
|
| + if (has_error_)
|
| + return;
|
| if (!ConsumeIfMatch('=')) {
|
| *parameter = WebSocketExtension::Parameter(name.as_string());
|
| return;
|
| @@ -68,7 +74,8 @@ void WebSocketExtensionParser::ConsumeExtensionParameter(
|
| ConsumeToken(&value);
|
| value_string = value.as_string();
|
| }
|
| - if (has_error_) return;
|
| + if (has_error_)
|
| + return;
|
| *parameter = WebSocketExtension::Parameter(name.as_string(), value_string);
|
| }
|
|
|
| @@ -77,8 +84,8 @@ void WebSocketExtensionParser::ConsumeToken(base::StringPiece* token) {
|
| ConsumeSpaces();
|
| DCHECK(!has_error_);
|
| const char* head = current_;
|
| - while (current_ < end_ &&
|
| - !IsControl(current_[0]) && !IsSeparator(current_[0]))
|
| + while (current_ < end_ && !IsControl(current_[0]) &&
|
| + !IsSeparator(current_[0]))
|
| ++current_;
|
| if (current_ == head) {
|
| has_error_ = true;
|
| @@ -90,12 +97,14 @@ void WebSocketExtensionParser::ConsumeToken(base::StringPiece* token) {
|
| void WebSocketExtensionParser::ConsumeQuotedToken(std::string* token) {
|
| DCHECK(!has_error_);
|
| Consume('"');
|
| - if (has_error_) return;
|
| + if (has_error_)
|
| + return;
|
| *token = "";
|
| while (current_ < end_ && !IsControl(current_[0])) {
|
| if (UnconsumedBytes() >= 2 && current_[0] == '\\') {
|
| char next = current_[1];
|
| - if (IsControl(next) || IsSeparator(next)) break;
|
| + if (IsControl(next) || IsSeparator(next))
|
| + break;
|
| *token += next;
|
| current_ += 2;
|
| } else if (IsSeparator(current_[0])) {
|
|
|