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

Unified Diff: net/server/http_server.cc

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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/server/http_server.cc
diff --git a/net/server/http_server.cc b/net/server/http_server.cc
index df77c3672daa423fe54127495aa18b7a4262a104..a83a88146bedf9e562c636adc4246665c128c74d 100644
--- a/net/server/http_server.cc
+++ b/net/server/http_server.cc
@@ -23,13 +23,11 @@ namespace net {
HttpServer::HttpServer(const StreamListenSocketFactory& factory,
HttpServer::Delegate* delegate)
- : delegate_(delegate),
- server_(factory.CreateAndListen(this)) {
+ : delegate_(delegate), server_(factory.CreateAndListen(this)) {
}
-void HttpServer::AcceptWebSocket(
- int connection_id,
- const HttpServerRequestInfo& request) {
+void HttpServer::AcceptWebSocket(int connection_id,
+ const HttpServerRequestInfo& request) {
HttpConnection* connection = FindConnection(connection_id);
if (connection == NULL)
return;
@@ -38,8 +36,7 @@ void HttpServer::AcceptWebSocket(
connection->web_socket_->Accept(request);
}
-void HttpServer::SendOverWebSocket(int connection_id,
- const std::string& data) {
+void HttpServer::SendOverWebSocket(int connection_id, const std::string& data) {
HttpConnection* connection = FindConnection(connection_id);
if (connection == NULL)
return;
@@ -144,9 +141,8 @@ void HttpServer::DidRead(StreamListenSocket* socket,
std::string connection_header = request.GetHeaderValue("connection");
if (connection_header == "Upgrade") {
- connection->web_socket_.reset(WebSocket::CreateWebSocket(connection,
- request,
- &pos));
+ connection->web_socket_.reset(
+ WebSocket::CreateWebSocket(connection, request, &pos));
if (!connection->web_socket_.get()) // Not enough data was received.
break;
@@ -189,8 +185,8 @@ void HttpServer::DidClose(StreamListenSocket* socket) {
}
HttpServer::~HttpServer() {
- STLDeleteContainerPairSecondPointers(
- id_to_connection_.begin(), id_to_connection_.end());
+ STLDeleteContainerPairSecondPointers(id_to_connection_.begin(),
+ id_to_connection_.end());
}
//
@@ -229,20 +225,19 @@ enum header_parse_states {
// State transition table
int parser_state[MAX_STATES][MAX_INPUTS] = {
-/* METHOD */ { ST_URL, ST_ERR, ST_ERR, ST_ERR, ST_METHOD },
-/* URL */ { ST_PROTO, ST_ERR, ST_ERR, ST_URL, ST_URL },
-/* PROTOCOL */ { ST_ERR, ST_HEADER, ST_NAME, ST_ERR, ST_PROTO },
-/* HEADER */ { ST_ERR, ST_ERR, ST_NAME, ST_ERR, ST_ERR },
-/* NAME */ { ST_SEPARATOR, ST_DONE, ST_ERR, ST_VALUE, ST_NAME },
-/* SEPARATOR */ { ST_SEPARATOR, ST_ERR, ST_ERR, ST_VALUE, ST_ERR },
-/* VALUE */ { ST_VALUE, ST_HEADER, ST_NAME, ST_VALUE, ST_VALUE },
-/* DONE */ { ST_DONE, ST_DONE, ST_DONE, ST_DONE, ST_DONE },
-/* ERR */ { ST_ERR, ST_ERR, ST_ERR, ST_ERR, ST_ERR }
-};
+ /* METHOD */ {ST_URL, ST_ERR, ST_ERR, ST_ERR, ST_METHOD},
+ /* URL */ {ST_PROTO, ST_ERR, ST_ERR, ST_URL, ST_URL},
+ /* PROTOCOL */ {ST_ERR, ST_HEADER, ST_NAME, ST_ERR, ST_PROTO},
+ /* HEADER */ {ST_ERR, ST_ERR, ST_NAME, ST_ERR, ST_ERR},
+ /* NAME */ {ST_SEPARATOR, ST_DONE, ST_ERR, ST_VALUE, ST_NAME},
+ /* SEPARATOR */ {ST_SEPARATOR, ST_ERR, ST_ERR, ST_VALUE, ST_ERR},
+ /* VALUE */ {ST_VALUE, ST_HEADER, ST_NAME, ST_VALUE, ST_VALUE},
+ /* DONE */ {ST_DONE, ST_DONE, ST_DONE, ST_DONE, ST_DONE},
+ /* ERR */ {ST_ERR, ST_ERR, ST_ERR, ST_ERR, ST_ERR}};
// Convert an input character to the parser's input token.
int charToInput(char ch) {
- switch(ch) {
+ switch (ch) {
case ' ':
return INPUT_SPACE;
case '\r':

Powered by Google App Engine
This is Rietveld 408576698